- merged 9.0 from PLD

[packages/coreutils.git] / coreutils.spec

diff --git a/coreutils.spec b/coreutils.spec
index e7d5f589366b902efbd9a77b3e08ee4a4c64d9b3..a286284bc4223489fc49da557d7792ffbed59fb2 100644 (file)
--- a/coreutils.spec
+++ b/coreutils.spec
@@ -3,16 +3,17 @@
 %bcond_with    advcopy         # progress bar in cp (orphaned patch)
 %bcond_with    multicall       # Compile all the tools in a single binary
 %bcond_with    tests           # unit tests running
+%bcond_without y2038           # Y2038 support for 32-bit archs
 
 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.32
-Release:       2
+Version:       9.0
+Release:       3
 License:       GPL v3+
 Group:         Applications/System
 Source0:       http://ftp.gnu.org/gnu/coreutils/%{name}-%{version}.tar.xz
-# Source0-md5: 022042695b7d5bcf1a93559a9735e668
+# Source0-md5: 0d79ae8a6124546e3b94171375e5e5d0
 Source1:       %{name}-non-english-man-pages.tar.bz2
 # Source1-md5: f7c986ebc74ccb8d08ed70141063f14c
 Source2:       DIR_COLORS
@@ -25,15 +26,15 @@ Patch0:             %{name}-info.patch
 Patch1:                %{name}-getgid.patch
 Patch2:                %{name}-uname-cpuinfo.patch
 Patch3:                %{name}-date-man.patch
-Patch4:                %{name}-8.32-ls-removed-dir.patch
 
 Patch6:                %{name}-fmt-wchars.patch
 Patch7:                %{name}-sparc64.patch
 # http://translationproject.org/latest/coreutils/pl.po (pass through msgcat to generate shorter diff)
 Patch8:                %{name}-pl.po-update.patch
-# from http://www.beatex.org/web/advancedcopy.html, edited by shadzik
+# https://github.com/jarun/advcpmv
 Patch9:                %{name}-advcopy.patch
 Patch10:       tests.patch
+Patch11:       ignore-symlinks.patch
 URL:           http://www.gnu.org/software/coreutils/
 BuildRequires: acl-devel
 BuildRequires: attr-devel
@@ -46,7 +47,7 @@ BuildRequires:        help2man
 BuildRequires: libcap-devel
 BuildRequires: libselinux-devel
 BuildRequires: rpmbuild(find_lang) >= 1.24
-#BuildRequires:        smack-devel
+BuildRequires: smack-devel
 BuildRequires: tar >= 1:1.22
 BuildRequires: texinfo >= 4.2
 BuildRequires: xz
@@ -108,12 +109,12 @@ Programy zawarte w tym pakiecie to:
 
 %prep
 %setup -q -a1
-%patch8 -p1
+# translationproject seems to be older than in 9.0
+#%patch8 -p1
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%patch4 -p1
 
 %patch6 -p1
 %ifarch sparc64
@@ -124,6 +125,7 @@ Programy zawarte w tym pakiecie to:
 %patch9 -p1
 %endif
 %patch10 -p1
+%patch11 -p1
 
 %{__mv} man/pt_BR man/pt
 
@@ -175,7 +177,8 @@ build-aux/gen-lists-of-programs.sh --automake > src/cu-progs.mk
        %{?with_multicall:--enable-single-binary=symlinks} \
        --disable-silent-rules \
        --enable-install-program=arch \
-       --enable-no-install-program=hostname,kill,uptime
+       --enable-no-install-program=hostname,kill,uptime \
+       %{!?with_y2038:--disable-year2038}
 
 %{__make} -j1