From 590c1438c7f4a768f6dbd2d20fec64eeb48074f40736de6d423ab23afac7830a Mon Sep 17 00:00:00 2001
From: Philipp Thomas <pth@suse.com>
Date: Mon, 4 Aug 2014 10:27:20 +0000
Subject: [PATCH] Accepting request 243551 from
 home:bernhard-voelker:branches:Base:System

- Upgrade to 4.5.14
- Refresh patches:
    findutils-4.4.2-xautofs.patch
    findutils-gnulib-ppc64le.patch (using -p0 for consistency)
- findutils.spec (Version): s/4.5.12/4.5/14
  (%patch1): Remove -p1.
  (%configure): Remove --without-included-regex option,
    as it is the default anyway.

OBS-URL: https://build.opensuse.org/request/show/243551
OBS-URL: https://build.opensuse.org/package/show/Base:System/findutils?expand=0&rev=56
---
 findutils-4.4.2-xautofs.patch  |  2 +-
 findutils-4.5.12.tar.gz        |  3 ---
 findutils-4.5.14.tar.gz        |  3 +++
 findutils-gnulib-ppc64le.patch | 30 ++++++++++++++++++------------
 findutils.changes              | 12 ++++++++++++
 findutils.spec                 | 10 +++++-----
 6 files changed, 39 insertions(+), 21 deletions(-)
 delete mode 100644 findutils-4.5.12.tar.gz
 create mode 100644 findutils-4.5.14.tar.gz

diff --git a/findutils-4.4.2-xautofs.patch b/findutils-4.4.2-xautofs.patch
index 8593620..802d44b 100644
--- a/findutils-4.4.2-xautofs.patch
+++ b/findutils-4.4.2-xautofs.patch
@@ -117,7 +117,7 @@ Index: find/util.c
 ===================================================================
 --- find/util.c.orig
 +++ find/util.c
-@@ -1010,6 +1010,7 @@ set_option_defaults (struct options *p)
+@@ -1014,6 +1014,7 @@ set_option_defaults (struct options *p)
  
    p->full_days = false;
    p->stay_on_filesystem = false;
diff --git a/findutils-4.5.12.tar.gz b/findutils-4.5.12.tar.gz
deleted file mode 100644
index 512669d..0000000
--- a/findutils-4.5.12.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:df859eebad68c216204363f163c0e4200208ce7348f3658564a120e32e4f63de
-size 3236073
diff --git a/findutils-4.5.14.tar.gz b/findutils-4.5.14.tar.gz
new file mode 100644
index 0000000..46ac2d4
--- /dev/null
+++ b/findutils-4.5.14.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0de3cf625a5c9f154eee3171e072515ffdde405244dd00502af617ac57b73ae2
+size 3536727
diff --git a/findutils-gnulib-ppc64le.patch b/findutils-gnulib-ppc64le.patch
index 784b2d6..721733e 100644
--- a/findutils-gnulib-ppc64le.patch
+++ b/findutils-gnulib-ppc64le.patch
@@ -1,7 +1,13 @@
-diff --git a/tests/test-isfinite.c b/tests/test-isfinite.c
-index 9e8dd0d..a762ceb 100644
---- a/tests/test-isfinite.c
-+++ b/tests/test-isfinite.c
+---
+ 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.  */
@@ -18,10 +24,10 @@ index 9e8dd0d..a762ceb 100644
      memory_long_double m;
      m.value = zerol / zerol;
  # if LDBL_EXPBIT0_BIT > 0
-diff --git a/tests/test-isinf.c b/tests/test-isinf.c
-index 276e480..eb1b7f2 100644
---- a/tests/test-isinf.c
-+++ b/tests/test-isinf.c
+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.  */
@@ -38,10 +44,10 @@ index 276e480..eb1b7f2 100644
      memory_long_double m;
      m.value = zerol / zerol;
  # if LDBL_EXPBIT0_BIT > 0
-diff --git a/tests/test-isnanl.h b/tests/test-isnanl.h
-index 06e6a7c..2df10f8 100644
---- a/tests/test-isnanl.h
-+++ b/tests/test-isnanl.h
+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.  */
diff --git a/findutils.changes b/findutils.changes
index f19d671..eb81597 100644
--- a/findutils.changes
+++ b/findutils.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Sun Aug  3 22:56:51 UTC 2014 - mail@bernhard-voelker.de
+
+- Upgrade to 4.5.14
+- Refresh patches:
+    findutils-4.4.2-xautofs.patch
+    findutils-gnulib-ppc64le.patch (using -p0 for consistency)
+- findutils.spec (Version): s/4.5.12/4.5/14
+  (%patch1): Remove -p1.
+  (%configure): Remove --without-included-regex option,
+    as it is the default anyway.
+
 -------------------------------------------------------------------
 Wed Dec 18 19:19:34 UTC 2013 - uweigand@de.ibm.com
 
diff --git a/findutils.spec b/findutils.spec
index 14fe3e6..3d72f0e 100644
--- a/findutils.spec
+++ b/findutils.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package findutils
 #
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -18,7 +18,7 @@
 
 Name:           findutils
 Url:            http://www.gnu.org/software/findutils/
-Version:        4.5.12
+Version:        4.5.14
 Release:        0
 Summary:        The GNU versions of find utilities (find and xargs)
 License:        GPL-3.0+
@@ -55,7 +55,7 @@ useful for finding things on your system.
 %prep
 %setup -q
 %patch0
-%patch1 -p1
+%patch1
 
 %build
 %if 0%{?qemu_user_space_build}
@@ -64,8 +64,8 @@ export DEFAULT_ARG_SIZE="(31u * 1024u)"
 %endif
 %configure \
   --libexecdir=%{_libdir}/find \
-  --localstatedir=/var/lib \
-  --without-included-regex
+  --localstatedir=/var/lib
+
 make %{?_smp_mflags}
 
 %check