- partially update from fedora, fixes test suite

[packages/coreutils.git] / coreutils.spec

diff --git a/coreutils.spec b/coreutils.spec
index be12041e806c289be4eb279fbd56055efbf0fa1b..180b00191edb3a61ef78f793d4c2f6a8fcf15299 100644 (file)
--- a/coreutils.spec
+++ b/coreutils.spec
@@ -1,13 +1,17 @@
-%bcond_without tests
+#
+# Conditional build:
+%bcond_with    advcopy # progress bar in cp (orphaned patch)
+%bcond_without tests   # do not perform "make test check"
+#
 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:       8.2
+Version:       8.10
 Release:       1
 License:       GPL v3+
 Group:         Applications/System
 Source0:       http://ftp.gnu.org/gnu/coreutils/%{name}-%{version}.tar.xz
-# Source0-md5: e037fcb353de2df7762406e0a170b152
+# Source0-md5: 4bb81c051da6e5436fc1ad9a67ae44fe
 Source1:       %{name}-non-english-man-pages.tar.bz2
 # Source1-md5: f7c986ebc74ccb8d08ed70141063f14c
 Source2:       DIR_COLORS
@@ -31,21 +35,24 @@ Patch9:             %{name}-fmt-wchars.patch
 Patch10:       %{name}-runuser.patch
 Patch11:       %{name}-split-pam.patch
 Patch12:       %{name}-sparc64.patch
+# http://translationproject.org/latest/coreutils/pl.po (pass through msgcat to generate shorter diff)
 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: attr-devel
-BuildRequires: autoconf >= 2.61
-BuildRequires: automake >= 1:1.11
+BuildRequires: autoconf >= 2.62
+BuildRequires: automake >= 1:1.11.1
 BuildRequires: gcc >= 5:3.2
-BuildRequires: gettext-devel >= 0.16-2
+BuildRequires: gettext-devel >= 0.17
 BuildRequires: gmp-devel
 BuildRequires: help2man
 BuildRequires: libcap-devel
 BuildRequires: libselinux-devel
 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
@@ -104,12 +111,9 @@ Programy zawarte w tym pakiecie to:
   unexpand uniq unlink users vdir wc who whoami yes
 
 %prep
-%setup -q -c -T -a1
-xz -dc %{SOURCE0} | tar xf - -C ..
-# currently obsolete
-# %patch13 -p1
-# ?
-# %patch0 -p1
+%setup -q -a1
+%patch13 -p1
+%patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
@@ -123,14 +127,15 @@ xz -dc %{SOURCE0} | tar xf - -C ..
 %ifarch sparc64
 %patch12 -p1
 %endif
+%if %{with advcopy}
+# progress-bar patch, -g,--progress-bar //if in doubt, comment it out
+%patch14 -p1
+%endif
 
 %{__perl} -pi -e 's@GNU/Linux@PLD Linux@' m4/host-os.m4
 
 # allow rebuilding *.gmo
-rm -f po/stamp-po
-
-# drop when our automake supports dist-xz
-sed -i -e 's#1.10a dist-xz#1.10#g' configure.ac
+%{__rm} po/stamp-po
 
 %build
 %{__gettextize}
@@ -141,13 +146,14 @@ sed -i -e 's#1.10a dist-xz#1.10#g' configure.ac
 %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}
+%{?with_tests:%{__make} tests check}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -179,7 +185,7 @@ for d in cs da de es fi fr hu id it ja ko nl pl pt ru zh_CN ; do
        install man/$d/*.1 $RPM_BUILD_ROOT%{_mandir}/$d/man1
 done
 install %{SOURCE9} $RPM_BUILD_ROOT%{_mandir}/pl/man1/mktemp.1
-# unwanted
+# unwanted (-f left intentionally - some manuals could have no translations)
 rm -f $RPM_BUILD_ROOT%{_mandir}/*/man1/{hostname,kill,uptime}.1
 
 %find_lang %{name}
@@ -208,6 +214,8 @@ rm -rf $RPM_BUILD_ROOT
 %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
 %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/*
@@ -226,5 +234,3 @@ rm -rf $RPM_BUILD_ROOT
 %lang(ru) %{_mandir}/ru/man1/*
 %lang(zh_CN) %{_mandir}/zh_CN/man1/*
 %{_infodir}/coreutils.info*
-%dir %{_libdir}/coreutils
-%attr(755,root,root) %{_libdir}/coreutils/libstdbuf.so