- partially update from fedora, fixes test suite

[packages/coreutils.git] / coreutils.spec

diff --git a/coreutils.spec b/coreutils.spec
index c61c48978be5ed31315857aa5dad75dfa14298c2..180b00191edb3a61ef78f793d4c2f6a8fcf15299 100644 (file)
--- a/coreutils.spec
+++ b/coreutils.spec
@@ -1,16 +1,17 @@
 #
 # Conditional build:
-%bcond_without tests
+%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.6
+Version:       8.10
 Release:       1
 License:       GPL v3+
 Group:         Applications/System
 Source0:       http://ftp.gnu.org/gnu/coreutils/%{name}-%{version}.tar.xz
-# Source0-md5: 17d693d282ac57c62b241a045e7b511c
+# Source0-md5: 4bb81c051da6e5436fc1ad9a67ae44fe
 Source1:       %{name}-non-english-man-pages.tar.bz2
 # Source1-md5: f7c986ebc74ccb8d08ed70141063f14c
 Source2:       DIR_COLORS
@@ -34,6 +35,7 @@ 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
@@ -43,7 +45,7 @@ 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: gettext-devel >= 0.17
 BuildRequires: gmp-devel
 BuildRequires: help2man
 BuildRequires: libcap-devel
@@ -110,7 +112,7 @@ Programy zawarte w tym pakiecie to:
 
 %prep
 %setup -q -a1
-#%patch13 -p1
+%patch13 -p1
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
@@ -125,13 +127,15 @@ Programy zawarte w tym pakiecie to:
 %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
+%{__rm} po/stamp-po
 
 %build
 %{__gettextize}
@@ -181,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}