Bump to 4.5.14

[platform/upstream/findutils.git] / packaging / findutils.spec

diff --git a/packaging/findutils.spec b/packaging/findutils.spec
index 619f106..17dfb6b 100644 (file)
--- a/packaging/findutils.spec
+++ b/packaging/findutils.spec
@@ -1,23 +1,14 @@
 Name:           findutils
 Url:            http://www.gnu.org/software/findutils/
-Version:        4.5.10
+Version:        4.5.14
 Release:        0
 Summary:        The GNU versions of find utilities (find and xargs)
 License:        GPL-3.0+
-Group:          Productivity/File utilities
+Group:          Base/Tools
 # retrieved from http://alpha.gnu.org/pub/gnu/findutils/findutils-4.5.10.tar.gz
 Source:         findutils-%{version}.tar.bz2
 Source1:        sysconfig.locate
-# 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
-Patch5:         findutils-stdio.in.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+Source1001:    findutils.manifest
 
 %description
 The findutils package contains programs which will help you locate
@@ -31,10 +22,9 @@ You should install findutils because it includes tools that are very
 useful for finding things on your system.
 
 
-%lang_package
 %package locate
 Summary:        Tool for Locating Files (findutils subpackage)
-Group:          Productivity/File utilities
+Group:          Base/Tools
 Provides:       findutils:/usr/bin/locate
 Requires:       findutils = %{version}
 
@@ -49,12 +39,7 @@ switching on the computer.
 
 %prep
 %setup -q
-%patch0
-%patch1 -p1
-%patch2
-%patch3
-%patch4
-%patch5 -p1
+cp %{SOURCE1001} .
 
 %build
 %ifarch %arm armv5tel armv7l armv7el armv5el
@@ -67,13 +52,14 @@ export DEFAULT_ARG_SIZE="(31u * 1024u)"
   --without-included-regex \
   --without-fts \
   --enable-d_type-optimisation
-make %{?_smp_mflags}
+%{__make} %{?_smp_mflags}
 
 %check
 make check
 
 %install
-make install DESTDIR=$RPM_BUILD_ROOT
+%make_install
+
 install -D -m 644 %{SOURCE1} $RPM_BUILD_ROOT/etc/sysconfig/locate
 rm -f $RPM_BUILD_ROOT%{_bindir}/oldfind
 rm -f $RPM_BUILD_ROOT%{_bindir}/ftsfind
@@ -82,17 +68,21 @@ rm -f $RPM_BUILD_ROOT%{_infodir}/find-maint*
 
 %docs_package
 
+%lang_package
+
 %files
+%manifest %{name}.manifest
 %defattr(-,root,root,-)
-%doc COPYING
+%license COPYING
 %{_bindir}/find
 %{_bindir}/xargs
 
 %files locate
+%manifest %{name}.manifest
 %defattr(-,root,root,-)
 %{_bindir}/locate
 %{_bindir}/updatedb
 %{_libdir}/find
-%config(noreplace) %{_sysconfigdir}/sysconfig/locate
+%config(noreplace) %{_sysconfdir}/sysconfig/locate
 
 %changelog