- synced with PLD (update to 8.15)

[packages/coreutils.git] / coreutils.spec

diff --git a/coreutils.spec b/coreutils.spec
index 6e9c5058faa8ea6f661acc4f4cdcc8a6eeefb394..714d48c4407e9397bb78218ac828b7d5f3f9ac61 100644 (file)
--- a/coreutils.spec
+++ b/coreutils.spec
@@ -1,16 +1,16 @@
 # 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.13
+Version:       8.15
 Release:       2
 License:       GPL v3+
 Group:         Applications/System
 Source0:       http://ftp.gnu.org/gnu/coreutils/%{name}-%{version}.tar.xz
-# Source0-md5: 8e1675c6c336ff55557c698706a63d6c
+# Source0-md5: 094909fafa86110140b32e4948941545
 Source1:       %{name}-non-english-man-pages.tar.bz2
 # Source1-md5: f7c986ebc74ccb8d08ed70141063f14c
 Source2:       DIR_COLORS
@@ -29,7 +29,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
@@ -90,9 +89,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
@@ -108,9 +107,9 @@ 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
@@ -153,6 +152,10 @@ Programy zawarte w tym pakiecie to:
 %{__rm} tests/misc/help-version
 %{__sed} -i -e '/misc\/help-version/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}
 %{__aclocal} -I m4
@@ -163,7 +166,7 @@ Programy zawarte w tym pakiecie to:
        CFLAGS="%{rpmcflags} -DSYSLOG_SUCCESS -DSYSLOG_FAILURE -DSYSLOG_NON_ROOT" \
        DEFAULT_POSIX2_VERSION=199209 \
        --disable-silent-rules \
-       --enable-install-program=arch \
+       --enable-install-program=arch,su \
        --enable-no-install-program=hostname,kill,uptime \
        --enable-pam
 
@@ -186,10 +189,10 @@ df,echo,false,id,link,ln,ls,mkdir,mknod,mktemp,mv,nice,printf,pwd,rm,rmdir,\
 sleep,sort,stat,stty,sync,touch,true,unlink,uname} $RPM_BUILD_ROOT/bin
 
 mv -f $RPM_BUILD_ROOT%{_bindir}/chroot $RPM_BUILD_ROOT%{_sbindir}
+mv $RPM_BUILD_ROOT{%{_bindir},/sbin}/runuser
 
 # 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
 
 cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}
 cp -p %{SOURCE3} %{SOURCE4} $RPM_BUILD_ROOT/etc/shrc.d
@@ -206,7 +209,6 @@ 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 -rf $RPM_BUILD_ROOT%{_datadir}/locale/eo
 # always remove, never packaged but sometimes installed
 rm -f $RPM_BUILD_ROOT%{_infodir}/dir