- package runuser just once

[packages/coreutils.git] / coreutils.spec

diff --git a/coreutils.spec b/coreutils.spec
index f3b0546078a9e0ca83869eafad17c6b0060fd744..9f7d6bd37a4b83ceaf07290deb48d1ca269bb3a1 100644 (file)
--- a/coreutils.spec
+++ b/coreutils.spec
@@ -6,12 +6,12 @@
 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.10
-Release:       1
+Version:       8.15
+Release:       2
 License:       GPL v3+
 Group:         Applications/System
 Source0:       http://ftp.gnu.org/gnu/coreutils/%{name}-%{version}.tar.xz
-# Source0-md5: 4bb81c051da6e5436fc1ad9a67ae44fe
+# Source0-md5: 094909fafa86110140b32e4948941545
 Source1:       %{name}-non-english-man-pages.tar.bz2
 # Source1-md5: f7c986ebc74ccb8d08ed70141063f14c
 Source2:       DIR_COLORS
@@ -30,7 +30,6 @@ Patch4:               %{name}-uname-cpuinfo.patch
 Patch5:                %{name}-date-man.patch
 Patch6:                %{name}-mem.patch
 Patch7:                %{name}-7.4-sttytcsadrain.patch
-
 Patch9:                %{name}-fmt-wchars.patch
 Patch10:       %{name}-runuser.patch
 Patch11:       %{name}-split-pam.patch
@@ -42,10 +41,10 @@ Patch14:    %{name}-advcopy.patch
 URL:           http://www.gnu.org/software/coreutils/
 BuildRequires: acl-devel
 BuildRequires: attr-devel
-BuildRequires: autoconf >= 2.62
+BuildRequires: autoconf >= 2.64
 BuildRequires: automake >= 1:1.11.1
 BuildRequires: gcc >= 5:3.2
-BuildRequires: gettext-devel >= 0.17
+BuildRequires: gettext-devel >= 0.18.1
 BuildRequires: gmp-devel
 BuildRequires: help2man
 BuildRequires: libcap-devel
@@ -55,6 +54,9 @@ BuildRequires:        rpmbuild(find_lang) >= 1.24
 BuildRequires: tar >= 1:1.22
 BuildRequires: texinfo >= 4.2
 BuildRequires: xz
+%if %{with tests}
+BuildRequires: strace
+%endif
 Requires:      pam >= 0.77.3
 Requires:      setup >= 2.4.6-2
 Provides:      coreutils-su
@@ -88,9 +90,9 @@ The programs that can be built with this package are:
   dd df dir dircolors dirname du echo env expand expr factor false fmt
   fold install groups head hostid id join link ln logname ls md5sum
   mkdir mkfifo mknod mv nice nl nohup od paste pathchk pinky pr printenv
-  printf ptx pwd rm rmdir runuser seq sha1sum shred sleep sort split
-  stat stty su sum sync tac tail tee test touch tr true tsort tty uname
-  unexpand uniq unlink users vdir wc who whoami yes
+  printf ptx pwd realpath rm rmdir runuser seq sha1sum shred sleep sort
+  split stat stty su sum sync tac tail tee test touch tr true tsort tty
+  uname unexpand uniq unlink users vdir wc who whoami yes
 
 %description -l pl.UTF-8
 Narzędzia podstawowe (core utilities) GNU to połączone paczki GNU
@@ -106,13 +108,13 @@ Programy zawarte w tym pakiecie to:
   dd df dir dircolors dirname du echo env expand expr factor false fmt
   fold ginstall groups head hostid id join link ln logname ls md5sum
   mkdir mkfifo mknod mv nice nl nohup od paste pathchk pinky pr printenv
-  printf ptx pwd rm rmdir runuser seq sha1sum shred sleep sort split
-  stat stty su sum sync tac tail tee test touch tr true tsort tty uname
-  unexpand uniq unlink users vdir wc who whoami yes
+  printf ptx pwd realpath rm rmdir runuser seq sha1sum shred sleep sort
+  split stat stty su sum sync tac tail tee test touch tr true tsort tty
+  uname unexpand uniq unlink users vdir wc who whoami yes
 
 %prep
 %setup -q -a1
-%patch13 -p1
+#%patch13 -p1
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
@@ -140,8 +142,10 @@ Programy zawarte w tym pakiecie to:
 # fails under C locale:
 # LC_ALL=C echo -e "ça\nçb\n"|LC_ALL=C fmt -p 'ç'
 # fmt: memory exhausted
-%{__rm} tests/misc/fmt
-%{__sed} -i -e '/misc\/fmt/d' tests/Makefile.am
+%{__sed} -i -e 25,27d tests/misc/fmt
+
+# /etc/resolv.conf is blocked in pld 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:
 # getgid: missing operand
@@ -149,10 +153,9 @@ Programy zawarte w tym pakiecie to:
 %{__rm} tests/misc/help-version
 %{__sed} -i -e '/misc\/help-version/d' tests/Makefile.am
 
-# broken (racy?)
-# +du: fts_read failed: T/U/3/a/b: No such file or directory
-%{__rm} tests/du/move-dir-while-traversing
-%{__sed} -i -e '/du\/move-dir-while-traversing/d' tests/Makefile.am
+# fails on some filesystems (like XFS), where readdir returns d_type=DT_UNKNOWN
+%{__rm} tests/ls/stat-free-color
+%{__sed} -i -e '/ls\/stat-free-color/d' tests/Makefile.am
 
 %build
 %{__gettextize}
@@ -170,7 +173,10 @@ Programy zawarte w tym pakiecie to:
 
 %{__make}
 
-%{?with_tests:%{__make} tests check}
+%if %{with tests}
+sed -i -e 's#COLUMNS##g' tests/envvar-check
+%{__make} -j1 tests check
+%endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -187,7 +193,7 @@ mv -f $RPM_BUILD_ROOT%{_bindir}/chroot $RPM_BUILD_ROOT%{_sbindir}
 
 # su is missed by "make install" called by non-root
 install -p src/su $RPM_BUILD_ROOT/bin
-install -p src/runuser $RPM_BUILD_ROOT/sbin
+mv $RPM_BUILD_ROOT{%{_bindir},/sbin}/runuser
 
 cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}
 cp -p %{SOURCE3} %{SOURCE4} $RPM_BUILD_ROOT/etc/shrc.d
@@ -204,8 +210,8 @@ done
 install %{SOURCE9} $RPM_BUILD_ROOT%{_mandir}/pl/man1/mktemp.1
 # unwanted (-f left intentionally - some manuals could have no translations)
 rm -f $RPM_BUILD_ROOT%{_mandir}/*/man1/{hostname,kill,uptime}.1
-
-%{__rm} $RPM_BUILD_ROOT%{_infodir}/dir
+# always remove, never packaged but sometimes installed
+rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 
 %find_lang %{name}