[packages/xorg-util-util-macros] remove man3x from from xorg-macros.m4
glen
glen at pld-linux.org
Tue Mar 5 00:04:25 CET 2013
commit eb3559ebc2822a2aca0f4916c80956aeaa4359ef
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Tue Mar 5 01:02:46 2013 +0200
remove man3x from from xorg-macros.m4
man3x dir does not exist, and if man pages refer to man3x via man links,
the manual pages can't be retrieved
see:
http://git.pld-linux.org/?p=packages/xorg-lib-libXt.git;a=commitdiff;h=56aa5d5d5b17dd3b891ef00678eff52c9490ec1d
xorg-util-util-macros-x.patch | 91 -------------------------------------------
xorg-util-util-macros.spec | 6 +--
2 files changed, 1 insertion(+), 96 deletions(-)
---
diff --git a/xorg-util-util-macros.spec b/xorg-util-util-macros.spec
index bb70903..1be2c91 100644
--- a/xorg-util-util-macros.spec
+++ b/xorg-util-util-macros.spec
@@ -2,12 +2,11 @@ Summary: Autoconf macros for xorg
Summary(pl.UTF-8): Makra autoconfa dla xorg
Name: xorg-util-util-macros
Version: 1.17
-Release: 1
+Release: 2
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
@@ -28,7 +27,6 @@ nowych wersji skryptów configure przy użyciu autoconfa.
%prep
%setup -q -n util-macros-%{version}
-%patch0 -R -p1
%patch1 -p1
%build
@@ -36,12 +34,10 @@ 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
deleted file mode 100644
index 925611c..0000000
--- a/xorg-util-util-macros-x.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-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/eb3559ebc2822a2aca0f4916c80956aeaa4359ef
More information about the pld-cvs-commit
mailing list