- merged update to 6.6 from DEVEL

[packages/coreutils.git] / coreutils.spec

diff --git a/coreutils.spec b/coreutils.spec
index aaf7600718223f23ecc2074296dbb0cd3342ca88..ab3dc0d4358338d17ced92e685119866d735fe19 100644 (file)
--- a/coreutils.spec
+++ b/coreutils.spec
@@ -5,15 +5,12 @@
 Summary:       GNU Core-utils - basic command line utilities
 Summary(pl):   GNU Core-utils - podstawowe narzêdzia dzia³aj±ce z linii poleceñ
 Name:          coreutils
-Version:       5.2.1
-Release:       0.6
+Version:       6.6
+Release:       0.1
 License:       GPL
 Group:         Applications/System
-# devel versions:
-#Source0:      ftp://alpha.gnu.org/gnu/fetish/%{name}-%{version}.tar.bz2
-# final versions:
 Source0:       ftp://ftp.gnu.org/gnu/coreutils/%{name}-%{version}.tar.bz2
-# Source0-md5: 172ee3c315af93d3385ddfbeb843c53f
+# Source0-md5: 64f1589af7d9a879c9bdc0af41e19ff1
 Source1:       %{name}-non-english-man-pages.tar.bz2
 # Source1-md5: f7c986ebc74ccb8d08ed70141063f14c
 Source2:       DIR_COLORS
@@ -21,7 +18,7 @@ Source3:      fileutils.sh
 Source4:       fileutils.csh
 Source5:       su.pamd
 Patch0:                %{name}-info.patch
-Patch1:                %{name}-pl.po-update.patch
+#Patch1 reserved for %{name}-pl.po-update.patch
 Patch2:                %{name}-pam.patch
 Patch3:                %{name}-getgid.patch
 Patch4:                %{name}-su-paths.patch
@@ -31,18 +28,17 @@ Patch7:             %{name}-mem.patch
 Patch8:                %{name}-install-C.patch
 Patch9:                %{name}-po.patch
 Patch10:       %{name}-no-nb.patch
-# based on patch from Fedora, based on patches from http://acl.bestbits.at/
-Patch11:       %{name}-acl.patch
-Patch12:       %{name}-selinux.patch
+Patch11:       %{name}-selinux.patch
+URL:           http://www.gnu.org/software/coreutils/
 BuildRequires: acl-devel
-BuildRequires: autoconf >= 2.58
-BuildRequires: automake >= 1.8
+BuildRequires: autoconf >= 2.60
+BuildRequires: automake >= 1:1.9.6
 %{?with_selinux:BuildRequires: gcc >= 5:3.2}
-BuildRequires: gettext-devel >= 0.11.5
+BuildRequires: gettext-devel >= 0.16-2
 BuildRequires: help2man
+%{?with_selinux:BuildRequires: libselinux-devel}
 BuildRequires: pam-devel
 BuildRequires: texinfo >= 4.2
-%{?with_selinux:BuildRequires: libselinux-devel}
 Requires:      pam >= 0.77.3
 Requires:      setup >= 2.4.6-2
 Provides:      fileutils
@@ -58,8 +54,8 @@ Conflicts:    tetex < 1:2.0.2
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
-These are the GNU core utilities.  This package is the union of
-the GNU fileutils, sh-utils, and textutils packages.
+These are the GNU core utilities. This package is the union of the GNU
+fileutils, sh-utils, and textutils packages.
 
 Most of these programs have significant advantages over their Unix
 counterparts, such as greater speed, additional options, and fewer
@@ -96,7 +92,6 @@ Programy zawarte w tym pakiecie to:
 %prep
 %setup -q -a1
 %patch0 -p1
-%patch1 -p1
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
@@ -106,8 +101,7 @@ Programy zawarte w tym pakiecie to:
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
-%patch11 -p1
-%{?with_selinux:%patch12 -p1}
+%{?with_selinux:%patch11 -p1}
 
 %{__perl} -pi -e 's@GNU/Linux@PLD Linux@' m4/host-os.m4
 
@@ -117,15 +111,17 @@ rm -f po/no.*
 # allow rebuilding *.gmo
 rm -f po/stamp-po
 
+# missing, added to gettext.m4 by ./bootstrap
+echo 'AC_DEFUN([gl_LOCK_EARLY],[])' > m4/gllock.m4
+
 %build
-# jm's inttypes.m4 and inttypes.m4 from gettext are really different files
-mv -f m4/{inttypes.m4,jm-inttypes.m4}
 %{__gettextize}
 %{__aclocal} -I m4
 %{__autoconf}
 %{__autoheader}
 %{__automake}
 %configure \
+       CFLAGS="%{rpmcflags} -DSYSLOG_SUCCESS -DSYSLOG_FAILURE -DSYSLOG_NON_ROOT" \
        DEFAULT_POSIX2_VERSION=199209 \
        %{?with_selinux:--enable-selinux} \
        --enable-pam
@@ -181,8 +177,8 @@ rm -rf $RPM_BUILD_ROOT
 %attr(4755,root,root) /bin/su
 %attr(755,root,root) %{_bindir}/*
 %attr(755,root,root) %{_sbindir}/*
-%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) /etc/pam.d/su
-%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/DIR_COLORS
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/pam.d/su
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/DIR_COLORS
 /etc/shrc.d/*
 %{_mandir}/man1/*
 %lang(cs) %{_mandir}/cs/man1/*