[packages/xorg-util-util-macros] Revert "remove man3x from from xorg-macros.m4"

[qboosh]

commit 1223ff3f9d61043eeb1076ab52980742b76cc323
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Mon May 20 20:02:31 2013 +0200

    Revert "remove man3x from from xorg-macros.m4"
    
    This reverts commit eb3559ebc2822a2aca0f4916c80956aeaa4359ef.

 xorg-util-util-macros-x.patch | 91 +++++++++++++++++++++++++++++++++++++++++++
 xorg-util-util-macros.spec    |  6 ++-
 2 files changed, 96 insertions(+), 1 deletion(-)
---
diff --git a/xorg-util-util-macros.spec b/xorg-util-util-macros.spec
index 1be2c91..bb70903 100644
--- a/xorg-util-util-macros.spec
+++ b/xorg-util-util-macros.spec
@@ -2,11 +2,12 @@ Summary:	Autoconf macros for xorg
 Summary(pl.UTF-8):	Makra autoconfa dla xorg
 Name:		xorg-util-util-macros
 Version:	1.17
-Release:	2
+Release:	1
 License:	MIT
 Group:		X11/Development/Tools
 Source0:	http://xorg.freedesktop.org/releases/individual/util/util-macros-%{version}.tar.bz2
 # Source0-md5:	4f41667e1bf4938bb2b24fa09d517f77
+Patch0:		%{name}-x.patch
 Patch1:		%{name}-nosilent.patch
 URL:		http://xorg.freedesktop.org/
 BuildRequires:	autoconf >= 2.60
@@ -27,6 +28,7 @@ nowych wersji skryptów configure przy użyciu autoconfa.
 
 %prep
 %setup -q -n util-macros-%{version}
+%patch0 -R -p1
 %patch1 -p1
 
 %build
@@ -34,10 +36,12 @@ nowych wersji skryptów configure przy użyciu autoconfa.
 %{__autoconf}
 %{__automake}
 %configure
+
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
+
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
diff --git a/xorg-util-util-macros-x.patch b/xorg-util-util-macros-x.patch
new file mode 100644
index 0000000..925611c
--- /dev/null
+++ b/xorg-util-util-macros-x.patch
@@ -0,0 +1,91 @@
+Revert this change (except version de-bump), according to FHS 2.3
+
+xorg-macros: remove GNU-userland special case; bump to 1.1.1
+Remove special-casing of man page suffices for GNU-userland systems (Linux,
+Hurd, GNU/kFreeBSD).  Bump to version 1.1.1.
+
+--- a/xorg-macros.m4.in
++++ b/xorg-macros.m4.in
+@@ -114,75 +114,47 @@ AC_DEFUN([XORG_MANPAGE_SECTIONS],[
+ AC_REQUIRE([AC_CANONICAL_HOST])
+ 
+ if test x$APP_MAN_SUFFIX = x    ; then
+-    case $host_os in
+-	linux* | gnu* | k*bsd*-gnu)	APP_MAN_SUFFIX=1x ;;
+-	*)	APP_MAN_SUFFIX=1  ;;
+-    esac
++    APP_MAN_SUFFIX=1
+ fi
+ if test x$APP_MAN_DIR = x    ; then
+-    case $host_os in
+-	linux* | gnu* | k*bsd*-gnu)	APP_MAN_DIR='$(mandir)/man1' ;;
+-	*)	APP_MAN_DIR='$(mandir)/man$(APP_MAN_SUFFIX)' ;;
+-    esac
++    APP_MAN_DIR='$(mandir)/man$(APP_MAN_SUFFIX)'
+ fi
+ 
+ if test x$LIB_MAN_SUFFIX = x    ; then
+-    case $host_os in
+-	linux* | gnu* | k*bsd*-gnu)	LIB_MAN_SUFFIX=3x ;;
+-	*)	LIB_MAN_SUFFIX=3  ;;
+-    esac
++    LIB_MAN_SUFFIX=3
+ fi
+ if test x$LIB_MAN_DIR = x    ; then
+-    case $host_os in
+-	linux* | gnu* | k*bsd*-gnu)	LIB_MAN_DIR='$(mandir)/man3' ;;
+-	*)	LIB_MAN_DIR='$(mandir)/man$(LIB_MAN_SUFFIX)' ;;
+-    esac
++    LIB_MAN_DIR='$(mandir)/man$(LIB_MAN_SUFFIX)'
+ fi
+ 
+ if test x$FILE_MAN_SUFFIX = x    ; then
+     case $host_os in
+-	linux* | gnu* | k*bsd*-gnu)		FILE_MAN_SUFFIX=5x ;;
+ 	solaris*)	FILE_MAN_SUFFIX=4  ;;
+ 	*)		FILE_MAN_SUFFIX=5  ;;
+     esac
+ fi
+ if test x$FILE_MAN_DIR = x    ; then
+-    case $host_os in
+-	linux* | gnu* | k*bsd*-gnu)	FILE_MAN_DIR='$(mandir)/man5' ;;
+-	*)	FILE_MAN_DIR='$(mandir)/man$(FILE_MAN_SUFFIX)' ;;
+-    esac
++    FILE_MAN_DIR='$(mandir)/man$(FILE_MAN_SUFFIX)'
+ fi
+ 
+-# In Imake's linux.cf, the misc man suffix & dir was only changed for 
+-# LinuxDebian, not other Linuxes, so we leave it unchanged here
+ if test x$MISC_MAN_SUFFIX = x    ; then
+     case $host_os in
+-#	linux* | gnu* | k*bsd*-gnu)		MISC_MAN_SUFFIX=7x ;;
+ 	solaris*)	MISC_MAN_SUFFIX=5  ;;
+ 	*)		MISC_MAN_SUFFIX=7  ;;
+     esac
+ fi
+ if test x$MISC_MAN_DIR = x    ; then
+-    case $host_os in
+-#	linux* | gnu* | k*bsd*-gnu)	MISC_MAN_DIR='$(mandir)/man7' ;;
+-	*)	MISC_MAN_DIR='$(mandir)/man$(MISC_MAN_SUFFIX)' ;;
+-    esac
++    MISC_MAN_DIR='$(mandir)/man$(MISC_MAN_SUFFIX)'
+ fi
+ 
+-# In Imake's linux.cf, the driver man suffix & dir was only changed for 
+-# LinuxDebian, not other Linuxes, so we leave it unchanged here
+ if test x$DRIVER_MAN_SUFFIX = x    ; then
+     case $host_os in
+-#	linux* | gnu* | k*bsd*-gnu)		DRIVER_MAN_SUFFIX=4x ;;
+ 	solaris*)	DRIVER_MAN_SUFFIX=7  ;;
+ 	*)		DRIVER_MAN_SUFFIX=4  ;;
+     esac
+ fi
+ if test x$DRIVER_MAN_DIR = x    ; then
+-    case $host_os in
+-#	linux* | gnu* | k*bsd*-gnu)	DRIVER_MAN_DIR='$(mandir)/man4' ;;
+-	*)	DRIVER_MAN_DIR='$(mandir)/man$(DRIVER_MAN_SUFFIX)' ;;
+-    esac
++    DRIVER_MAN_DIR='$(mandir)/man$(DRIVER_MAN_SUFFIX)'
+ fi
+ 
+ if test x$ADMIN_MAN_SUFFIX = x    ; then
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/xorg-util-util-macros.git/commitdiff/6a1ce630735f339fbc0bf36c545b091c97364888