-up to 8.6; really run tests; po pl patch merged upstream

[packages/coreutils.git] / coreutils.spec

diff --git a/coreutils.spec b/coreutils.spec
index ffccee68e71ffcdd1d9ec250046fc45ae347bd39..c61c48978be5ed31315857aa5dad75dfa14298c2 100644 (file)
--- a/coreutils.spec
+++ b/coreutils.spec
@@ -1,12 +1,16 @@
+#
+# Conditional build:
+%bcond_without tests
+#
 Summary:       GNU Core-utils - basic command line utilities
 Summary(pl.UTF-8):     GNU Core-utils - podstawowe narzędzia działające z linii poleceń
 Name:          coreutils
-Version:       6.12
-Release:       2
+Version:       8.6
+Release:       1
 License:       GPL v3+
 Group:         Applications/System
-Source0:       http://ftp.gnu.org/gnu/coreutils/%{name}-%{version}.tar.lzma
-# Source0-md5: c10ccd62490cac4de3bff5022468c9b5
+Source0:       http://ftp.gnu.org/gnu/coreutils/%{name}-%{version}.tar.xz
+# Source0-md5: 17d693d282ac57c62b241a045e7b511c
 Source1:       %{name}-non-english-man-pages.tar.bz2
 # Source1-md5: f7c986ebc74ccb8d08ed70141063f14c
 Source2:       DIR_COLORS
@@ -24,25 +28,31 @@ Patch3:             %{name}-su-paths.patch
 Patch4:                %{name}-uname-cpuinfo.patch
 Patch5:                %{name}-date-man.patch
 Patch6:                %{name}-mem.patch
-Patch7:                %{name}-install-C.patch
-Patch8:                %{name}-po.patch
+Patch7:                %{name}-7.4-sttytcsadrain.patch
+
 Patch9:                %{name}-fmt-wchars.patch
 Patch10:       %{name}-runuser.patch
 Patch11:       %{name}-split-pam.patch
 Patch12:       %{name}-sparc64.patch
 Patch13:       %{name}-pl.po-update.patch
+# from http://www.beatex.org/web/advancedcopy.html, edited by shadzik
+Patch14:       %{name}-advcopy.patch
 URL:           http://www.gnu.org/software/coreutils/
 BuildRequires: acl-devel
-BuildRequires: autoconf >= 2.61
-BuildRequires: automake >= 1:1.10
+BuildRequires: attr-devel
+BuildRequires: autoconf >= 2.62
+BuildRequires: automake >= 1:1.11.1
 BuildRequires: gcc >= 5:3.2
 BuildRequires: gettext-devel >= 0.16-2
+BuildRequires: gmp-devel
 BuildRequires: help2man
+BuildRequires: libcap-devel
 BuildRequires: libselinux-devel
-BuildRequires: lzma >= 1:4.42
 BuildRequires: pam-devel
 BuildRequires: rpmbuild(find_lang) >= 1.24
+BuildRequires: tar >= 1:1.22
 BuildRequires: texinfo >= 4.2
+BuildRequires: xz
 Requires:      pam >= 0.77.3
 Requires:      setup >= 2.4.6-2
 Provides:      coreutils-su
@@ -99,9 +109,8 @@ Programy zawarte w tym pakiecie to:
   unexpand uniq unlink users vdir wc who whoami yes
 
 %prep
-%setup -q -c -T -a1
-lzma -dc %{SOURCE0} | tar xf - -C ..
-%patch13 -p1
+%setup -q -a1
+#%patch13 -p1
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
@@ -110,13 +119,14 @@ lzma -dc %{SOURCE0} | tar xf - -C ..
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
-%patch8 -p1
 %patch9 -p1
 %patch10 -p1
 %patch11 -p1
 %ifarch sparc64
 %patch12 -p1
 %endif
+# progress-bar patch, -g,--progress-bar //if in doubt, comment it out
+%patch14 -p1
 
 %{__perl} -pi -e 's@GNU/Linux@PLD Linux@' m4/host-os.m4
 
@@ -132,12 +142,15 @@ rm -f po/stamp-po
 %configure \
        CFLAGS="%{rpmcflags} -DSYSLOG_SUCCESS -DSYSLOG_FAILURE -DSYSLOG_NON_ROOT" \
        DEFAULT_POSIX2_VERSION=199209 \
+       --disable-silent-rules \
        --enable-install-program=arch \
        --enable-no-install-program=hostname,kill,uptime \
        --enable-pam
 
 %{__make}
 
+%{?with_tests:%{__make} tests check}
+
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{/bin,/sbin,%{_bindir},%{_sbindir},/etc/pam.d,/etc/shrc.d}
@@ -145,9 +158,9 @@ install -d $RPM_BUILD_ROOT{/bin,/sbin,%{_bindir},%{_sbindir},/etc/pam.d,/etc/shr
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
-mv -f $RPM_BUILD_ROOT%{_bindir}/{arch,basename,cat,chgrp,chmod,chown,cp,date,dd,df,\
-echo,false,id,link,ln,ls,mkdir,mknod,mktemp,mv,nice,printf,pwd,rm,rmdir,sleep,sort,\
-stty,sync,touch,true,unlink,uname} $RPM_BUILD_ROOT/bin
+mv -f $RPM_BUILD_ROOT%{_bindir}/{arch,basename,cat,chgrp,chmod,chown,cp,date,dd,\
+df,echo,false,id,link,ln,ls,mkdir,mknod,mktemp,mv,nice,printf,pwd,rm,rmdir,\
+sleep,sort,stat,stty,sync,touch,true,unlink,uname} $RPM_BUILD_ROOT/bin
 
 mv -f $RPM_BUILD_ROOT%{_bindir}/chroot $RPM_BUILD_ROOT%{_sbindir}
 
@@ -196,8 +209,9 @@ rm -rf $RPM_BUILD_ROOT
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/pam.d/su-l
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/pam.d/runuser
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/pam.d/runuser-l
-/etc/shrc.d/fileutils.csh
-/etc/shrc.d/fileutils.sh
+%config(noreplace) /etc/shrc.d/fileutils.*sh
+%dir %{_libdir}/coreutils
+%attr(755,root,root) %{_libdir}/coreutils/libstdbuf.so
 %{_mandir}/man1/*
 %lang(cs) %{_mandir}/cs/man1/*
 %lang(da) %{_mandir}/da/man1/*