- merged 9.1 from PLD

[packages/coreutils.git] / coreutils.spec

diff --git a/coreutils.spec b/coreutils.spec
index e8cba5fba057d0623b5ae78df9a8aa8f63bbc710..5d37ac64c17b0f9e559a672d7163660da774eaec 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.30
+Version:       9.1
 Release:       1
 License:       GPL v3+
 Group:         Applications/System
 Source0:       http://ftp.gnu.org/gnu/coreutils/%{name}-%{version}.tar.xz
-# Source0-md5: ab06d68949758971fe744db66b572816
+# Source0-md5: 8b1ca4e018a7dce9bb937faec6618671
 Source1:       %{name}-non-english-man-pages.tar.bz2
 # Source1-md5: f7c986ebc74ccb8d08ed70141063f14c
 Source2:       DIR_COLORS
@@ -20,6 +21,7 @@ Source3:      DIR_COLORS.256color
 Source4:       colorls.sh
 Source5:       colorls.csh
 Source6:       mktemp.1.pl
+Source7:       %{name}.sh
 Patch0:                %{name}-info.patch
 Patch1:                %{name}-getgid.patch
 Patch2:                %{name}-uname-cpuinfo.patch
@@ -29,7 +31,7 @@ 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
 URL:           http://www.gnu.org/software/coreutils/
@@ -106,7 +108,8 @@ 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
@@ -124,7 +127,7 @@ Programy zawarte w tym pakiecie to:
 
 %{__mv} man/pt_BR man/pt
 
-%{__perl} -pi -e 's@GNU/Linux@PLD Linux@' m4/host-os.m4
+%{__perl} -pi -e 's@GNU/Linux@TLD Linux@' m4/host-os.m4
 
 # allow rebuilding *.gmo
 %{__rm} po/stamp-po
@@ -134,7 +137,7 @@ Programy zawarte w tym pakiecie to:
 # fmt: memory exhausted
 %{__sed} -i -e 25,27d tests/fmt/base.pl
 
-# /etc/resolv.conf is blocked in pld builders, try some other file
+# /etc/resolv.conf is blocked in tld builders, try some other file
 %{__sed} -i -e 's,/etc/resolv.conf,/etc/hosts,' gnulib-tests/test-read-file.c
 
 # getgid needs to be fixed:
@@ -172,7 +175,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
 
@@ -201,7 +205,7 @@ ln -s ../../bin/coreutils $RPM_BUILD_ROOT%{_bindir}
 
 cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}
 cp -p %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}
-cp -p %{SOURCE4} %{SOURCE5} $RPM_BUILD_ROOT/etc/shrc.d
+cp -p %{SOURCE4} %{SOURCE5} %{SOURCE7} $RPM_BUILD_ROOT/etc/shrc.d
 
 for d in cs da de es fi fr hu id it ja ko nl pl pt ru zh_CN; do
        install -d $RPM_BUILD_ROOT%{_mandir}/$d/man1
@@ -266,6 +270,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/b2sum
 %attr(755,root,root) %{_bindir}/base32
 %attr(755,root,root) %{_bindir}/base64
+%attr(755,root,root) %{_bindir}/basenc
 %attr(755,root,root) %{_bindir}/chcon
 %attr(755,root,root) %{_bindir}/cksum
 %attr(755,root,root) %{_bindir}/comm
@@ -341,12 +346,14 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/DIR_COLORS.256color
 %config(noreplace) /etc/shrc.d/colorls.csh
 %config(noreplace) /etc/shrc.d/colorls.sh
+%config(noreplace) /etc/shrc.d/%{name}.sh
 %dir %{_libexecdir}/coreutils
 %attr(755,root,root) %{_libexecdir}/coreutils/libstdbuf.so
 %{_mandir}/man1/arch.1*
 %{_mandir}/man1/b2sum.1*
 %{_mandir}/man1/base32.1*
 %{_mandir}/man1/base64.1*
+%{_mandir}/man1/basenc.1*
 %{_mandir}/man1/basename.1*
 %{_mandir}/man1/cat.1*
 %{_mandir}/man1/chcon.1*