Accepting request 351210 from home:berny:branches:Base:System

- Upgrade to 4.6.0 stable release, removing 'oldfind'. - Add signature file and keyring. - Delete now-upstream patches: findutils-gnulib-ppc64le.patch, gnulib-perl522.patch - Refresh patch: findutils-4.4.2-xautofs.patch OBS-URL: https://build.opensuse.org/request/show/351210 OBS-URL: https://build.opensuse.org/package/show/Base:System/findutils?expand=0&rev=64
2015-12-29 17:12:26 +00:00 · 2015-12-29 17:12:26 +00:00 · ffbca3a158
commit ffbca3a158
parent 2929704796
9 changed files with 30 additions and 104 deletions
--- a/findutils-4.4.2-xautofs.patch
+++ b/findutils-4.4.2-xautofs.patch
@ -40,9 +40,9 @@ Index: find/find.1
 ===================================================================
 --- find/find.1.orig
 +++ find/find.1
-@@ -466,6 +466,9 @@ if standard input is a tty, and to
- .B \-nowarn
- otherwise.
+@@ -520,6 +520,9 @@ to stat them; this gives a significant i
+ .IP "\-version, \-\-version"
+ Print the \fBfind\fR version number and exit.
 
 +.IP \-xautofs
 +Don't descend directories on autofs filesystems.
@ -87,7 +87,7 @@ Index: find/parser.c
   PARSE_TEST       ("xtype",                 xtype),	     /* GNU */
 #ifdef UNIMPLEMENTED_UNIX
   /* It's pretty ugly for find to know about archive formats.
-@@ -1230,7 +1232,7 @@ operators (decreasing precedence; -and i
+@@ -1239,7 +1241,7 @@ operators (decreasing precedence; -and i
 positional options (always true): -daystart -follow -regextype\n\n\
 normal options (always true, specified before other expressions):\n\
       -depth --help -maxdepth LEVELS -mindepth LEVELS -mount -noleaf\n\
@ -96,7 +96,7 @@ Index: find/parser.c
   puts (_("\
 tests (N can be +N or -N or N): -amin N -anewer FILE -atime N -cmin N\n\
       -cnewer FILE -ctime N -empty -false -fstype TYPE -gid N -group NAME\n\
-@@ -2673,6 +2675,16 @@ parse_xdev (const struct parser_table* e
+@@ -2683,6 +2685,16 @@ parse_xdev (const struct parser_table* e
 }
 
 static bool
@ -117,7 +117,7 @@ Index: find/util.c
 ===================================================================
 --- find/util.c.orig
 +++ find/util.c
-@@ -1014,6 +1014,7 @@ set_option_defaults (struct options *p)
+@@ -1017,6 +1017,7 @@ set_option_defaults (struct options *p)
 
   p->full_days = false;
   p->stay_on_filesystem = false;
--- a/findutils-4.5.15.tar.gz
+++ b/findutils-4.5.15.tar.gz
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:bc843179f32cba7bec8192edc91b4ad0d0bf434e61b82c04d9d2c8115617d9fb
-size 3815470
--- a/findutils-4.6.0.tar.gz
+++ b/findutils-4.6.0.tar.gz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ded4c9f73731cd48fec3b6bdaccce896473b6d8e337e9612e16cf1431bb1169d
+size 3780154
--- a/findutils-4.6.0.tar.gz.sig
+++ b/findutils-4.6.0.tar.gz.sig
--- a/findutils-gnulib-ppc64le.patch
+++ b/findutils-gnulib-ppc64le.patch
@ -1,66 +0,0 @@
---
- tests/test-isfinite.c |    9 +++++++++
- tests/test-isinf.c    |    9 +++++++++
- tests/test-isnanl.h   |    9 +++++++++
- 3 files changed, 27 insertions(+)
-
-Index: tests/test-isfinite.c
-===================================================================
--- tests/test-isfinite.c.orig
-+++ tests/test-isfinite.c
-@@ -152,6 +152,15 @@ test_isfinitel ()
-   /* A bit pattern that is different from a Quiet NaN.  With a bit of luck,
-      it's a Signalling NaN.  */
-   {
-+#if defined __powerpc__ && LDBL_MANT_DIG == 106
-+    /* This is PowerPC "double double", a pair of two doubles.  Inf and Nan are
-+       represented as the corresponding 64-bit IEEE values in the first double;
-+       the second is ignored.  Manipulate only the first double.  */
-+    #undef NWORDS
-+    #define NWORDS \
-+      ((sizeof (double) + sizeof (unsigned int) - 1) / sizeof (unsigned int))
-+#endif
-+
-     memory_long_double m;
-     m.value = zerol / zerol;
- # if LDBL_EXPBIT0_BIT > 0
-Index: tests/test-isinf.c
-===================================================================
--- tests/test-isinf.c.orig
-+++ tests/test-isinf.c
-@@ -158,6 +158,15 @@ test_isinfl ()
-   /* A bit pattern that is different from a Quiet NaN.  With a bit of luck,
-      it's a Signalling NaN.  */
-   {
-+#if defined __powerpc__ && LDBL_MANT_DIG == 106
-+    /* This is PowerPC "double double", a pair of two doubles.  Inf and Nan are
-+       represented as the corresponding 64-bit IEEE values in the first double;
-+       the second is ignored.  Manipulate only the first double.  */
-+    #undef NWORDS
-+    #define NWORDS \
-+      ((sizeof (double) + sizeof (unsigned int) - 1) / sizeof (unsigned int))
-+#endif
-+
-     memory_long_double m;
-     m.value = zerol / zerol;
- # if LDBL_EXPBIT0_BIT > 0
-Index: tests/test-isnanl.h
-===================================================================
--- tests/test-isnanl.h.orig
-+++ tests/test-isnanl.h
-@@ -51,6 +51,15 @@ main ()
-   /* A bit pattern that is different from a Quiet NaN.  With a bit of luck,
-      it's a Signalling NaN.  */
-   {
-+#if defined __powerpc__ && LDBL_MANT_DIG == 106
-+    /* This is PowerPC "double double", a pair of two doubles.  Inf and Nan are
-+       represented as the corresponding 64-bit IEEE values in the first double;
-+       the second is ignored.  Manipulate only the first double.  */
-+    #undef NWORDS
-+    #define NWORDS \
-+      ((sizeof (double) + sizeof (unsigned int) - 1) / sizeof (unsigned int))
-+#endif
-+
-     memory_long_double m;
-     m.value = NaNl ();
- # if LDBL_EXPBIT0_BIT > 0
--- a/findutils.changes
+++ b/findutils.changes
@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Tue Dec 29 16:26:33 UTC 2015 - mail@bernhard-voelker.de
+
+- Upgrade to 4.6.0
+    stable release, removing 'oldfind'.
+- Add signature file and keyring.
+- Delete now-upstream patches: findutils-gnulib-ppc64le.patch,
+    gnulib-perl522.patch
+- Refresh patch: findutils-4.4.2-xautofs.patch
+
 -------------------------------------------------------------------
 Sun Dec 20 12:29:05 UTC 2015 - mail@bernhard-voelker.de

--- a/findutils.keyring
+++ b/findutils.keyring
--- a/findutils.spec
+++ b/findutils.spec
@ -18,17 +18,21 @@

 Name:           findutils
 Url:            http://www.gnu.org/software/findutils/
-Version:        4.5.15
+Version:        4.6.0
 Release:        0
 Summary:        The GNU versions of find utilities (find and xargs)
 License:        GPL-3.0+
 Group:          Productivity/File utilities
-Source:         http://alpha.gnu.org/gnu/%{name}/%{name}-%{version}.tar.gz
+
+# For upgrading you now just need to increase the version, remove the old
+# tarballs, then run osc service localrun download_files, osc addremove,
+# osc vc and osc ci and you are done.
+Source0:        http://ftp.gnu.org/pub/gnu/%{name}/%{name}-%{version}.tar.gz
+Source1:        https://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.gz.sig
+Source2:        https://savannah.gnu.org/project/memberlist-gpgkeys.php?group=%{name}&download=1&file=./%{name}.keyring
+
 # adds a new option -xautofs to find to not descend into directories on autofs file systems
 Patch0:         findutils-4.4.2-xautofs.patch
-# Fix imported gnulib long double math tests for little-endian PowerPC
-Patch1:         findutils-gnulib-ppc64le.patch
-Patch2:         gnulib-perl522.patch

 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 # BuildRequire dejagnu for 'runtest' to execute all tests.
@ -59,8 +63,6 @@ useful for finding things on your system.
 %prep
 %setup -q
 %patch0
-%patch1
-%patch2

 %build
 %if 0%{?qemu_user_space_build}
@ -74,7 +76,8 @@ export DEFAULT_ARG_SIZE="(31u * 1024u)"
 make %{?_smp_mflags}

 %check
-make check
+make check \
+  || { cat tests/test-suite.log; exit 1; }

 %install
 make DESTDIR=%{buildroot} install
@ -106,11 +109,9 @@ rm %{buildroot}%{_mandir}/man5/locatedb.5*
 /bin/find
 #UsrMerge
 %{_bindir}/find
-%{_bindir}/oldfind
 %{_bindir}/xargs
 %doc %{_infodir}/find.info*.gz
 %doc %{_mandir}/man1/find.1.gz
-%doc %{_mandir}/man1/oldfind.1.gz
 %doc %{_mandir}/man1/xargs.1.gz

 %files lang -f %{name}.lang
--- a/gnulib-perl522.patch
+++ b/gnulib-perl522.patch
@ -1,19 +0,0 @@
-Subject: http://comments.gmane.org/gmane.comp.lib.gnulib.bugs/35272
-
---
- build-aux/update-copyright |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: build-aux/update-copyright
-===================================================================
--- build-aux/update-copyright.orig
-+++ build-aux/update-copyright
-@@ -124,7 +124,7 @@ use strict;
- use warnings;
- 
- my $copyright_re = 'Copyright';
-my $circle_c_re = '(?:\([cC]\)|@copyright{}|&copy;)';
-+my $circle_c_re = '(?:\([cC]\)|@copyright\{}|&copy;)';
- my $holder = $ENV{UPDATE_COPYRIGHT_HOLDER};
- $holder ||= 'Free Software Foundation, Inc.';
- my $prefix_max = 5;