X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=coreutils.spec;h=91bdf4a0228564cdc2d1c64bc8b31ef85036fe89;hb=e92253fb0982241afa31a663a0e730da6a412e63;hp=cb56cdab3cd8a4ddd6a85e4fcce0ed4be1a40591;hpb=926e00285ea210262ca6d5e9f95cdfd69f67b955;p=packages%2Fcoreutils.git

diff --git a/coreutils.spec b/coreutils.spec
index cb56cda..91bdf4a 100644
--- a/coreutils.spec
+++ b/coreutils.spec
@@ -1,12 +1,13 @@
+%bcond_without	tests
 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:	6.10
-Release:	2
+Version:	8.4
+Release:	1
 License:	GPL v3+
 Group:		Applications/System
-Source0:	http://ftp.gnu.org/gnu/coreutils/%{name}-%{version}.tar.lzma
-# Source0-md5:	23582a4e8b21e837cfbafbc3834a8a4b
+Source0:	http://ftp.gnu.org/gnu/coreutils/%{name}-%{version}.tar.xz
+# Source0-md5:	1fde97f144b4699b18f36c2ec18b1f18
 Source1:	%{name}-non-english-man-pages.tar.bz2
 # Source1-md5:	f7c986ebc74ccb8d08ed70141063f14c
 Source2:	DIR_COLORS
@@ -24,30 +25,38 @@ Patch3:		%{name}-su-paths.patch
 Patch4:		%{name}-uname-cpuinfo.patch
 Patch5:		%{name}-date-man.patch
 Patch6:		%{name}-mem.patch
-Patch7:		%{name}-install-C.patch
-Patch8:		%{name}-po.patch
+Patch7:		%{name}-7.4-sttytcsadrain.patch
+
 Patch9:		%{name}-fmt-wchars.patch
 Patch10:	%{name}-runuser.patch
 Patch11:	%{name}-split-pam.patch
+Patch12:	%{name}-sparc64.patch
+Patch13:	%{name}-pl.po-update.patch
+
 URL:		http://www.gnu.org/software/coreutils/
 BuildRequires:	acl-devel
+BuildRequires:	attr-devel
 BuildRequires:	autoconf >= 2.61
-BuildRequires:	automake >= 1:1.10
+BuildRequires:	automake >= 1:1.11.1
 BuildRequires:	gcc >= 5:3.2
 BuildRequires:	gettext-devel >= 0.16-2
+BuildRequires:	gmp-devel
 BuildRequires:	help2man
+BuildRequires:	libcap-devel
 BuildRequires:	libselinux-devel
-BuildRequires:	lzma
 BuildRequires:	pam-devel
 BuildRequires:	rpmbuild(find_lang) >= 1.24
 BuildRequires:	texinfo >= 4.2
+BuildRequires:	xz
 Requires:	pam >= 0.77.3
 Requires:	setup >= 2.4.6-2
+Provides:	coreutils-su
 Provides:	fileutils
 Provides:	mktemp = %{version}-%{release}
 Provides:	sh-utils
 Provides:	stat
 Provides:	textutils
+Obsoletes:	coreutils-su
 Obsoletes:	fileutils
 Obsoletes:	mktemp
 Obsoletes:	sh-utils
@@ -72,9 +81,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 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 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
@@ -90,14 +99,17 @@ 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 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 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 -c -T -a1
-lzma -dc %{SOURCE0} | tar xf - -C ..
-%patch0 -p1
+xz -dc %{SOURCE0} | tar xf - -C ..
+# currently obsolete
+# %patch13 -p1
+# ?
+# %patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
@@ -105,16 +117,21 @@ lzma -dc %{SOURCE0} | tar xf - -C ..
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
-%patch8 -p1
 %patch9 -p1
 %patch10 -p1
 %patch11 -p1
+%ifarch sparc64
+%patch12 -p1
+%endif
 
 %{__perl} -pi -e 's@GNU/Linux@PLD Linux@' m4/host-os.m4
 
 # allow rebuilding *.gmo
 rm -f po/stamp-po
 
+# drop when our automake supports dist-xz
+sed -i -e 's#1.10a dist-xz#1.10#g' configure.ac
+
 %build
 %{__gettextize}
 %{__aclocal} -I m4
@@ -130,6 +147,8 @@ rm -f po/stamp-po
 
 %{__make}
 
+%{?with_tests:%{__make} tests}
+
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{/bin,/sbin,%{_bindir},%{_sbindir},/etc/pam.d,/etc/shrc.d}
@@ -137,9 +156,9 @@ install -d $RPM_BUILD_ROOT{/bin,/sbin,%{_bindir},%{_sbindir},/etc/pam.d,/etc/shr
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-mv -f $RPM_BUILD_ROOT%{_bindir}/{arch,basename,cat,chgrp,chmod,chown,cp,date,dd,df,\
-echo,false,id,link,ln,ls,mkdir,mknod,mktemp,mv,nice,printf,pwd,rm,rmdir,sleep,sort,\
-stty,sync,touch,true,unlink,uname} $RPM_BUILD_ROOT/bin
+mv -f $RPM_BUILD_ROOT%{_bindir}/{arch,basename,cat,chgrp,chmod,chown,cp,date,dd,\
+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}
 
@@ -183,13 +202,12 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) /sbin/runuser
 %attr(755,root,root) %{_bindir}/*
 %attr(755,root,root) %{_sbindir}/chroot
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/DIR_COLORS
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/pam.d/su
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/pam.d/su-l
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/pam.d/runuser
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/pam.d/runuser-l
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/DIR_COLORS
-/etc/shrc.d/fileutils.csh
-/etc/shrc.d/fileutils.sh
+%config(noreplace) /etc/shrc.d/fileutils.*sh
 %{_mandir}/man1/*
 %lang(cs) %{_mandir}/cs/man1/*
 %lang(da) %{_mandir}/da/man1/*
@@ -208,3 +226,5 @@ rm -rf $RPM_BUILD_ROOT
 %lang(ru) %{_mandir}/ru/man1/*
 %lang(zh_CN) %{_mandir}/zh_CN/man1/*
 %{_infodir}/coreutils.info*
+%dir %{_libdir}/coreutils
+%attr(755,root,root) %{_libdir}/coreutils/libstdbuf.so