diff --git a/findutils.changes b/findutils.changes index 5809e97..018f3bc 100644 --- a/findutils.changes +++ b/findutils.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat Feb 4 23:27:05 UTC 2012 - rschweikert@suse.com + +- keep binary in /usr tree (UsrMerge project) + ------------------------------------------------------------------- Tue Jan 17 02:40:55 UTC 2012 - tabraham@novell.com diff --git a/findutils.spec b/findutils.spec index f004d42..06c3348 100644 --- a/findutils.spec +++ b/findutils.spec @@ -16,14 +16,13 @@ # - Name: findutils Url: http://www.gnu.org/software/findutils/ -License: GPL-3.0+ -Group: Productivity/File utilities Version: 4.5.10 Release: 0 Summary: The GNU versions of find utilities (find and xargs) +License: GPL-3.0+ +Group: Productivity/File utilities # retrieved from http://alpha.gnu.org/pub/gnu/findutils/findutils-4.5.10.tar.gz Source: findutils-%{version}.tar.bz2 Source1: sysconfig.locate @@ -61,6 +60,7 @@ useful for finding things on your system. %lang_package %package locate Summary: Tool for Locating Files (findutils subpackage) +Group: Productivity/File utilities Provides: findutils:/usr/bin/locate PreReq: %{fillup_prereq} Requires: cron findutils = %{version} @@ -107,11 +107,10 @@ rm -f $RPM_BUILD_ROOT%{_bindir}/oldfind rm -f $RPM_BUILD_ROOT%{_bindir}/ftsfind rm -f $RPM_BUILD_ROOT%{_infodir}/find-maint* %find_lang %{name} -# move find to /bin/find +#UsrMerge mkdir -p $RPM_BUILD_ROOT/bin -mv $RPM_BUILD_ROOT{%{_bindir},/bin}/find -# create /usr/bin/find -> /bin/find symlink -ln -sf ../../bin/find $RPM_BUILD_ROOT%{_bindir} +ln -sf %{_bindir}/find $RPM_BUILD_ROOT/bin +#UsrMerge %post locate %{fillup_only -n locate} @@ -125,7 +124,9 @@ ln -sf ../../bin/find $RPM_BUILD_ROOT%{_bindir} %files %defattr(-,root,root,-) %doc AUTHORS COPYING NEWS README THANKS TODO +#UsrMerge /bin/find +#UsrMerge %{_bindir}/find %{_bindir}/xargs %doc %{_infodir}/find.info*.gz