- merged 8.30 from PLD

diff --git a/coreutils-pl.po-update.patch b/coreutils-pl.po-update.patch
index 957401e56cedb3fbeee65430a839330df34aca7d..90b8a1db729d072cbc9839fa8c79414dc6a46ae0 100644 (file)
--- a/coreutils-pl.po-update.patch
+++ b/coreutils-pl.po-update.patch
@@ -1,12 +1,307 @@
-diff -urN coreutils-8.29.org/po/pl.po coreutils-8.29/po/pl.po
---- coreutils-8.29.org/po/pl.po        2017-12-27 18:57:56.000000000 +0100
-+++ coreutils-8.29/po/pl.po    2018-02-26 13:16:52.437464295 +0100
+diff -urN coreutils-8.30.org/po/pl.po coreutils-8.30/po/pl.po
+--- coreutils-8.30.org/po/pl.po        2018-07-02 02:59:42.000000000 +0200
++++ coreutils-8.30/po/pl.po    2018-07-07 17:51:59.501517733 +0200
 @@ -16,7 +16,7 @@
  msgstr ""
- "Project-Id-Version: coreutils 8.29-pre1\n"
+ "Project-Id-Version: coreutils 8.30-pre1\n"
  "Report-Msgid-Bugs-To: bug-coreutils@gnu.org\n"
--"POT-Creation-Date: 2017-12-27 17:57+0000\n"
-+"POT-Creation-Date: 2017-12-21 12:18+0000\n"
- "PO-Revision-Date: 2017-12-25 17:45+0100\n"
+-"POT-Creation-Date: 2018-07-01 17:59-0700\n"
++"POT-Creation-Date: 2018-06-24 21:56-0700\n"
+ "PO-Revision-Date: 2018-06-26 17:30+0200\n"
  "Last-Translator: Rafał Maszkowski <rzm@icm.edu.pl>\n"
  "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
+@@ -57,7 +57,7 @@
+ msgid "write error"
+ msgstr "błąd zapisu"
+ 
+-#: lib/copy-acl.c:54 src/copy.c:1393 src/copy.c:2908
++#: lib/copy-acl.c:54 src/copy.c:1393 src/copy.c:2901
+ #, c-format
+ msgid "preserving permissions for %s"
+ msgstr "zachowanie uprawnień %s"
+@@ -278,7 +278,7 @@
+ msgid "cannot change permissions of %s"
+ msgstr "nie można zmienić uprawnień do %s"
+ 
+-#: lib/mkdir-p.c:189 src/copy.c:2523 src/install.c:740 src/install.c:753
++#: lib/mkdir-p.c:189 src/copy.c:2516 src/install.c:740 src/install.c:753
+ #, c-format
+ msgid "cannot create directory %s"
+ msgstr "nie można utworzyć katalogu %s"
+@@ -447,7 +447,7 @@
+ msgid "^[nN]"
+ msgstr "^[nN]"
+ 
+-#: lib/set-acl.c:46 src/copy.c:2546 src/cp.c:514
++#: lib/set-acl.c:46 src/copy.c:2539 src/cp.c:514
+ #, c-format
+ msgid "setting permissions for %s"
+ msgstr "nie można ustawić uprawnień do %s"
+@@ -1876,7 +1876,7 @@
+ msgid "clearing permissions for %s"
+ msgstr "kasowanie uprawnień dla %s"
+ 
+-#: src/copy.c:841 src/copy.c:2754 src/cp.c:318
++#: src/copy.c:841 src/copy.c:2747 src/cp.c:318
+ #, c-format
+ msgid "failed to preserve ownership for %s"
+ msgstr "nie udało się zachować własności %s"
+@@ -1924,13 +1924,13 @@
+ msgid "skipping file %s, as it was replaced while being copied"
+ msgstr "plik %s został ominięty, bo został zmieniony w trakcie kopiowania"
+ 
+-#: src/copy.c:1094 src/copy.c:2184 src/remove.c:263 src/remove.c:280
++#: src/copy.c:1094 src/copy.c:2177 src/remove.c:263 src/remove.c:280
+ #: src/remove.c:406 src/remove.c:432
+ #, c-format
+ msgid "cannot remove %s"
+ msgstr "nie można usunąć %s"
+ 
+-#: src/copy.c:1099 src/copy.c:1796 src/copy.c:2189 src/remove.c:376
++#: src/copy.c:1099 src/copy.c:1796 src/copy.c:2182 src/remove.c:376
+ #, c-format
+ msgid "removed %s\n"
+ msgstr "usunięty %s\n"
+@@ -1952,7 +1952,7 @@
+ msgid "failed to clone %s from %s"
+ msgstr "nie udało się sklonować %s z %s"
+ 
+-#: src/copy.c:1323 src/copy.c:2829
++#: src/copy.c:1323 src/copy.c:2822
+ #, c-format
+ msgid "preserving times for %s"
+ msgstr "zachowanie czasu %s"
+@@ -1993,7 +1993,7 @@
+ msgid "cannot create hard link %s to %s"
+ msgstr "nie można utworzyć dowiązania zwykłego %s do %s"
+ 
+-#: src/copy.c:1891 src/copy.c:1963 src/copy.c:2534 src/copy.c:2895
++#: src/copy.c:1891 src/copy.c:1956 src/copy.c:2527 src/copy.c:2888
+ #: src/find-mount-point.c:84 src/install.c:702 src/realpath.c:146
+ #: src/stat.c:1389 src/truncate.c:338
+ #, c-format
+@@ -2010,156 +2010,156 @@
+ msgid "omitting directory %s"
+ msgstr "katalog %s został pominięty"
+ 
+-#: src/copy.c:1924
++#: src/copy.c:1917
+ #, c-format
+ msgid "warning: source file %s specified more than once"
+ msgstr "uwaga: plik źródłowy %s podany więcej niż raz"
+ 
+-#: src/copy.c:1979 src/ln.c:263
++#: src/copy.c:1972 src/ln.c:263
+ #, c-format
+ msgid "%s and %s are the same file"
+ msgstr "%s i %s to ten sam plik"
+ 
+-#: src/copy.c:2069
++#: src/copy.c:2062
+ #, c-format
+ msgid "cannot overwrite non-directory %s with directory %s"
+ msgstr "nie można zamazać nie-katalogu %s katalogiem %s"
+ 
+-#: src/copy.c:2087 src/ln.c:231
++#: src/copy.c:2080 src/ln.c:231
+ #, c-format
+ msgid "will not overwrite just-created %s with %s"
+ msgstr "nie można zamazać właśnie utworzonego %s plikiem %s"
+ 
+-#: src/copy.c:2105
++#: src/copy.c:2098
+ #, c-format
+ msgid "cannot overwrite directory %s with non-directory"
+ msgstr "nie można zamazać katalogu %s nie-katalogiem"
+ 
+-#: src/copy.c:2119
++#: src/copy.c:2112
+ #, c-format
+ msgid "cannot move directory onto non-directory: %s -> %s"
+ msgstr "nie można przenieść katalogu do nie-katalogu: %s -> %s"
+ 
+-#: src/copy.c:2146
++#: src/copy.c:2139
+ #, c-format
+ msgid "backing up %s might destroy source;  %s not moved"
+ msgstr ""
+ "utworzenie kopii zapasowej %s mogłoby zniszczyć żródło; %s nie został "
+ "przeniesiony"
+ 
+-#: src/copy.c:2147
++#: src/copy.c:2140
+ #, c-format
+ msgid "backing up %s might destroy source;  %s not copied"
+ msgstr ""
+ "utworzenie kopii zapasowej %s mogłoby zniszczyć żródło; %s nie został "
+ "skopiowany"
+ 
+-#: src/copy.c:2168 src/ln.c:293
++#: src/copy.c:2161 src/ln.c:293
+ #, c-format
+ msgid "cannot backup %s"
+ msgstr "nie można utworzyć kopii zapasowej %s"
+ 
+-#: src/copy.c:2223
++#: src/copy.c:2216
+ #, c-format
+ msgid "will not copy %s through just-created symlink %s"
+ msgstr ""
+ "plik %s nie będzie skopiowany poprzez właśnie utworzone dowiązanie "
+ "symboliczne %s"
+ 
+-#: src/copy.c:2303
++#: src/copy.c:2296
+ #, c-format
+ msgid "cannot copy a directory, %s, into itself, %s"
+ msgstr "nie można skopiować katalogu %s do siebie samego %s"
+ 
+-#: src/copy.c:2311
++#: src/copy.c:2304
+ #, c-format
+ msgid "warning: source directory %s specified more than once"
+ msgstr "uwaga: katalog źródłowy %s podany więcej niż raz"
+ 
+-#: src/copy.c:2337
++#: src/copy.c:2330
+ #, c-format
+ msgid "will not create hard link %s to directory %s"
+ msgstr "nie można utworzyć dowiązania zwykłego %s do katalogu %s"
+ 
+-#: src/copy.c:2361
++#: src/copy.c:2354
+ #, c-format
+ msgid "renamed "
+ msgstr "przemianowany "
+ 
+-#: src/copy.c:2399
++#: src/copy.c:2392
+ #, c-format
+ msgid "cannot move %s to a subdirectory of itself, %s"
+ msgstr "nie można przenieść %s do własnego podkatalogu %s"
+ 
+-#: src/copy.c:2442
++#: src/copy.c:2435
+ #, c-format
+ msgid "cannot move %s to %s"
+ msgstr "nie można przenieść %s do %s"
+ 
+-#: src/copy.c:2458
++#: src/copy.c:2451
+ #, c-format
+ msgid "inter-device move failed: %s to %s; unable to remove target"
+ msgstr ""
+ "nie udało się przeniesienie między urządzeniami: %s do %s; nie udało się "
+ "usunać pliku docelowego"
+ 
+-#: src/copy.c:2466
++#: src/copy.c:2459
+ #, c-format
+ msgid "copied "
+ msgstr "skopiowany "
+ 
+-#: src/copy.c:2503
++#: src/copy.c:2496
+ #, c-format
+ msgid "cannot copy cyclic symbolic link %s"
+ msgstr "nie można skopiować cyklicznego dowiązania symbolicznego %s"
+ 
+-#: src/copy.c:2565
++#: src/copy.c:2558
+ #, c-format
+ msgid "created directory %s\n"
+ msgstr "utworzony katalog %s\n"
+ 
+-#: src/copy.c:2628
++#: src/copy.c:2621
+ #, c-format
+ msgid "%s: can make relative symbolic links only in current directory"
+ msgstr ""
+ "%s: można zrobić tylko względne dowiązanie symboliczne w bieżącym katalogu"
+ 
+-#: src/copy.c:2637
++#: src/copy.c:2630
+ #, c-format
+ msgid "cannot create symbolic link %s to %s"
+ msgstr "nie można utworzyć dowiązania symbolicznego %s do %s"
+ 
+-#: src/copy.c:2691 src/mkfifo.c:170
++#: src/copy.c:2684 src/mkfifo.c:170
+ #, c-format
+ msgid "cannot create fifo %s"
+ msgstr "nie można utworzyć potoku %s"
+ 
+-#: src/copy.c:2700
++#: src/copy.c:2693
+ #, c-format
+ msgid "cannot create special file %s"
+ msgstr "nie można utworzyć pliku specjalnego %s"
+ 
+-#: src/copy.c:2711 src/ls.c:3455 src/stat.c:1071
++#: src/copy.c:2704 src/ls.c:3455 src/stat.c:1071
+ #, c-format
+ msgid "cannot read symbolic link %s"
+ msgstr "nie można przeczytać dowiązania symbolicznego %s"
+ 
+-#: src/copy.c:2738
++#: src/copy.c:2731
+ #, c-format
+ msgid "cannot create symbolic link %s"
+ msgstr "nie można utworzyć dowiązania symbolicznego %s"
+ 
+-#: src/copy.c:2770
++#: src/copy.c:2763
+ #, c-format
+ msgid "%s has unknown file type"
+ msgstr "%s to nieznany typ pliku"
+ 
+-#: src/copy.c:2935 src/ln.c:362
++#: src/copy.c:2928 src/ln.c:362
+ #, c-format
+ msgid "cannot un-backup %s"
+ msgstr "nie można przywrócić kopii zapasowej %s"
+ 
+-#: src/copy.c:2939
++#: src/copy.c:2932
+ #, c-format
+ msgid "%s -> %s (unbackup)\n"
+ msgstr "%s -> %s (przywrócenie kopii zapasowej)\n"
+@@ -4294,32 +4294,32 @@
+ msgid "no terminating quote in -S string"
+ msgstr "brak zamknięcia cudzysłowu w napisie przy -S"
+ 
+-#: src/env.c:573
++#: src/env.c:574
+ #, c-format
+ msgid "invalid option -- '%c'"
+ msgstr "błędna opcja -- „%c”"
+ 
+-#: src/env.c:574 src/env.c:658
++#: src/env.c:576 src/env.c:660
+ #, c-format
+ msgid "use -[v]S to pass options in shebang lines"
+ msgstr "użyj -[v]S do przekazania opcji do linii z #!"
+ 
+-#: src/env.c:607
++#: src/env.c:609
+ #, c-format
+ msgid "cannot set %s"
+ msgstr "nie można ustawić %s"
+ 
+-#: src/env.c:617
++#: src/env.c:619
+ #, c-format
+ msgid "cannot specify --null (-0) with command"
+ msgstr "nie można podać --null (-0) razem z poleceniem"
+ 
+-#: src/env.c:623
++#: src/env.c:625
+ #, c-format
+ msgid "must specify command with --chdir (-C)"
+ msgstr "razem z --chdir (-C) musi być podane polecenie"
+ 
+-#: src/env.c:641
++#: src/env.c:643
+ #, c-format
+ msgid "cannot change directory to %s"
+ msgstr "nie można zmienić katalogu na %s"

diff --git a/coreutils.spec b/coreutils.spec
index 7a597074e64dec3eda49947ced2e229e4846ece9..e8cba5fba057d0623b5ae78df9a8aa8f63bbc710 100644 (file)
--- a/coreutils.spec
+++ b/coreutils.spec
@@ -1,17 +1,18 @@
+#
 # Conditional build:
-%bcond_with    advcopy # progress bar in cp (orphaned patch)
+%bcond_with    advcopy         # progress bar in cp (orphaned patch)
 %bcond_with    multicall       # Compile all the tools in a single binary
-%bcond_without tests   # do not perform "make test check"
+%bcond_with    tests           # unit tests running
 
 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.29
+Version:       8.30
 Release:       1
 License:       GPL v3+
 Group:         Applications/System
 Source0:       http://ftp.gnu.org/gnu/coreutils/%{name}-%{version}.tar.xz
-# Source0-md5: 960cfe75a42c9907c71439f8eb436303
+# Source0-md5: ab06d68949758971fe744db66b572816
 Source1:       %{name}-non-english-man-pages.tar.bz2
 # Source1-md5: f7c986ebc74ccb8d08ed70141063f14c
 Source2:       DIR_COLORS
@@ -23,6 +24,7 @@ Patch0:               %{name}-info.patch
 Patch1:                %{name}-getgid.patch
 Patch2:                %{name}-uname-cpuinfo.patch
 Patch3:                %{name}-date-man.patch
+
 Patch6:                %{name}-fmt-wchars.patch
 Patch7:                %{name}-sparc64.patch
 # http://translationproject.org/latest/coreutils/pl.po (pass through msgcat to generate shorter diff)
@@ -33,15 +35,16 @@ Patch10:    tests.patch
 URL:           http://www.gnu.org/software/coreutils/
 BuildRequires: acl-devel
 BuildRequires: attr-devel
-BuildRequires: autoconf >= 2.64
+BuildRequires: autoconf >= 2.69
 BuildRequires: automake >= 1:1.11.2
 BuildRequires: gcc >= 5:3.2
-BuildRequires: gettext-tools >= 0.18.1
+BuildRequires: gettext-tools >= 0.19.2
 BuildRequires: gmp-devel
 BuildRequires: help2man
 BuildRequires: libcap-devel
 BuildRequires: libselinux-devel
 BuildRequires: rpmbuild(find_lang) >= 1.24
+BuildRequires: smack-devel
 BuildRequires: tar >= 1:1.22
 BuildRequires: texinfo >= 4.2
 BuildRequires: xz
@@ -108,6 +111,7 @@ Programy zawarte w tym pakiecie to:
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+
 %patch6 -p1
 %ifarch sparc64
 %patch7 -p1
@@ -118,9 +122,9 @@ Programy zawarte w tym pakiecie to:
 %endif
 %patch10 -p1
 
-mv man/pt_BR man/pt
+%{__mv} man/pt_BR man/pt
 
-%{__perl} -pi -e 's@GNU/Linux@TLD Linux@' m4/host-os.m4
+%{__perl} -pi -e 's@GNU/Linux@PLD Linux@' m4/host-os.m4
 
 # allow rebuilding *.gmo
 %{__rm} po/stamp-po
@@ -170,7 +174,7 @@ build-aux/gen-lists-of-programs.sh --automake > src/cu-progs.mk
        --enable-install-program=arch \
        --enable-no-install-program=hostname,kill,uptime
 
-%{__make}
+%{__make} -j1
 
 %if %{with tests}
 sed -i -e 's#COLUMNS##g' tests/envvar-check
@@ -184,16 +188,16 @@ install -d $RPM_BUILD_ROOT{/bin,/sbin,%{_bindir},%{_sbindir},/etc/shrc.d}
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
-mv $RPM_BUILD_ROOT%{_bindir}/{arch,basename,cat,chgrp,chmod,chown,cp,date,dd,\
+%{__mv} $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,readlink,rm,rmdir,\
 sleep,sort,stat,stty,sync,touch,true,unlink,uname} $RPM_BUILD_ROOT/bin
 
 %if %{with multicall}
-mv $RPM_BUILD_ROOT{%{_bindir},/bin}/coreutils
+%{__mv} $RPM_BUILD_ROOT{%{_bindir},/bin}/coreutils
 ln -s ../../bin/coreutils $RPM_BUILD_ROOT%{_bindir}
 %endif
 
-mv $RPM_BUILD_ROOT%{_bindir}/chroot $RPM_BUILD_ROOT%{_sbindir}
+%{__mv} $RPM_BUILD_ROOT%{_bindir}/chroot $RPM_BUILD_ROOT%{_sbindir}
 
 cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}
 cp -p %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}
@@ -208,8 +212,6 @@ cp -p %{SOURCE6} $RPM_BUILD_ROOT%{_mandir}/pl/man1/mktemp.1
 rm -f $RPM_BUILD_ROOT%{_mandir}/*/man1/{hostname,kill,su,uptime}.1
 # always remove, never packaged but sometimes installed
 rm -f $RPM_BUILD_ROOT%{_infodir}/dir
-# remove locales not available in the system
-rm -rf $RPM_BUILD_ROOT%{_datadir}/locale/sr/LC_TIME
 
 %find_lang %{name}
 
@@ -339,8 +341,8 @@ 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
-%dir %{_libdir}/coreutils
-%attr(755,root,root) %{_libdir}/coreutils/libstdbuf.so
+%dir %{_libexecdir}/coreutils
+%attr(755,root,root) %{_libexecdir}/coreutils/libstdbuf.so
 %{_mandir}/man1/arch.1*
 %{_mandir}/man1/b2sum.1*
 %{_mandir}/man1/base32.1*

diff --git a/tests.patch b/tests.patch
index c520626a4c31fd2a054f5bfdb60c60d73a4f04be..9b30f6c5a36cce1a5b245653f13ac5c415e1bb85 100644 (file)
--- a/tests.patch
+++ b/tests.patch
@@ -84,11 +84,11 @@ diff -ruN coreutils-8.27.orig/gnulib-tests/gnulib.mk coreutils-8.27/gnulib-tests
 diff -ruN coreutils-8.27.orig/gnulib-tests/test-stat-time.c coreutils-8.27/gnulib-tests/test-stat-time.c
 --- coreutils-8.27.orig/gnulib-tests/test-stat-time.c  2017-01-01 23:35:38.000000000 +0100
 +++ coreutils-8.27/gnulib-tests/test-stat-time.c       2017-06-10 20:43:44.599627263 +0200
-@@ -145,7 +145,7 @@
+@@ -167,7 +167,7 @@ test_mtime (const struct stat *statinfo,
      }
  }
  
--#if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__
+-#if defined _WIN32 && !defined __CYGWIN__
 +#if 1
  /* Skip the ctime tests on native Windows platforms, because their
     st_ctime is either the same as st_mtime (plus or minus an offset)
@@ -96,15 +96,15 @@ diff -ruN coreutils-8.27.orig/gnulib-tests/test-stat-time.c coreutils-8.27/gnuli
 diff -ruN coreutils-8.27.orig/gnulib-tests/test-utimens-common.h coreutils-8.27/gnulib-tests/test-utimens-common.h
 --- coreutils-8.27.orig/gnulib-tests/test-utimens-common.h     2017-01-01 23:35:38.000000000 +0100
 +++ coreutils-8.27/gnulib-tests/test-utimens-common.h  2017-06-10 20:43:44.598627265 +0200
-@@ -48,7 +48,7 @@
+@@ -49,7 +49,7 @@ enum {
                            : 0)
  };
  
--# if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__
+-# if defined _WIN32 && !defined __CYGWIN__
 +# if 1
  /* Skip ctime tests on native Windows, since it is either a copy of
     mtime or birth time (depending on the file system), rather than a
-    properly tracked change time.  */
+    properly tracked change time.  See
 diff -ruN coreutils-8.27.orig/tests/local.mk coreutils-8.27/tests/local.mk
 --- coreutils-8.27.orig/tests/local.mk 2017-03-01 05:25:37.000000000 +0100
 +++ coreutils-8.27/tests/local.mk      2017-06-10 20:43:44.601627257 +0200