Accepting request 200285 from home:bernhard-voelker:branches:Base:System

- Remove patches:
  - findutils-4.5.10-use_proc_mounts.patch:
    /etc/mtab is a link to /proc/self/mounts nowadays.
  - findutils-4.5.10-prune_unknown.patch:
    merge patch into findutils-4.4.2-updatedb.patch.
  - findutils-4.5.10-updatedb_ignore_nfsv4.patch:
    fixed upstream.
  - findutils-stdio.in.patch:
    fixed upstream (in included gnulib).
  - findutils-init_stat_buf.patch:
    fixed upstream.

- Refresh other patches:
  - findutils-4.4.2-updatedb.patch:
    refresh with changes from the above, removed patch.
  - findutils-4.4.2-xautofs.patch:
    refresh, and added -xautofs in find's usage text.

- Adapt findutils.spec:
  - Version bump.
  - Remove above removed patches.
  - Add BuildRequires for makeinfo.
  - configure call: remove --enable-d_type-optimization
    option because turned on by default since 4.2.15.
  - Do not remove oldfind's man page in %install.
  - Add oldfind's binary and man page in %files.

- Update to 4.5.12
  See /usr/share/doc/packages/findutils/NEWS,
  section "Major changes in release 4.5.12, 2013-09-22"

- Update to 4.5.11 (2013-02-02)
  See /usr/share/doc/packages/findutils/NEWS,
  section "Major changes in release 4.5.11, 2013-02-02"

OBS-URL: https://build.opensuse.org/request/show/200285
OBS-URL: https://build.opensuse.org/package/show/Base:System/findutils?expand=0&rev=46

findutils.spec

@@ -18,7 +18,7 @@
 
 Name:           findutils
 Url:            http://www.gnu.org/software/findutils/
-Version:        4.5.10
+Version:        4.5.12
 Release:        0
 Summary:        The GNU versions of find utilities (find and xargs)
 License:        GPL-3.0+
@@ -26,20 +26,14 @@ Group:          Productivity/File utilities
 Source:         http://alpha.gnu.org/gnu/%{name}/%{name}-%{version}.tar.gz
 Source1:        sysconfig.locate
 Source2:        cron.daily.updatedb
-# Use /proc/mounts instead of /etc/mtab as autofs entries are only
-# listed in the kernels >= 2.6.32
-Patch0:         findutils-4.5.10-use_proc_mounts.patch
 # adds a new option -xautofs to find to not descend into directories on autofs file systems
-Patch1:         findutils-4.4.2-xautofs.patch
-Patch2:         findutils-4.4.2-updatedb.patch
-Patch3:         findutils-4.5.10-prune_unknown.patch
-Patch4:         findutils-4.5.10-updatedb_ignore_nfsv4.patch
-Patch6:         findutils-stdio.in.patch
-Patch7:         findutils-init_stat_buf.patch
+Patch0:         findutils-4.4.2-xautofs.patch
+Patch1:         findutils-4.4.2-updatedb.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %if 0%{?suse_version} > 1100
 BuildRequires:  libselinux-devel
 %endif
+BuildRequires:  makeinfo
 Provides:       find = %{version}
 Obsoletes:      find < %{version}
 Requires(post):  %{install_info_prereq}
@@ -78,12 +72,7 @@ switching on the computer.
 %prep
 %setup -q
 %patch0
-%patch1 -p1
-%patch2
-%patch3
-%patch4
-%patch6 -p1
-%patch7
+%patch1
 
 %build
 %ifarch %arm armv5tel armv7l armv7el armv5el
@@ -93,8 +82,7 @@ export DEFAULT_ARG_SIZE="(31u * 1024u)"
 %configure \
   --libexecdir=%{_libdir}/find \
   --localstatedir=/var/lib \
-  --without-included-regex \
-  --enable-d_type-optimisation
+  --without-included-regex
 make %{?_smp_mflags}
 
 %check
@@ -104,8 +92,6 @@ make check
 %make_install
 install -D -m 644 %{SOURCE1} %{buildroot}/var/adm/fillup-templates/sysconfig.locate
 install -D -m 755 %{SOURCE2} %{buildroot}/etc/cron.daily/suse-updatedb
-rm -f %{buildroot}%{_bindir}/oldfind
-rm -f %{buildroot}%{_bindir}/ftsfind
 rm -f %{buildroot}%{_infodir}/find-maint*
 %find_lang %{name}
 #UsrMerge
@@ -129,9 +115,11 @@ ln -sf %{_bindir}/find %{buildroot}/bin
 /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