pool/findutils
SHA256
2
0
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 102998 from Base:System

Browse Source 
usrMerge project - move files from toplevel to /usr (forwarded request 102739 from rjschwei)

OBS-URL: https://build.opensuse.org/request/show/102998
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/findutils?expand=0&rev=33
This commit is contained in:
Stephan Kulow 2012-02-10 16:46:37 +00:00 committed by Git OBS Bridge
commit f9c93ba787
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
findutils.changes
View File

@ -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 Tue Jan 17 02:40:55 UTC 2012 - tabraham@novell.com

15
findutils.spec
View File

@ -16,14 +16,13 @@
# #
Name: findutils Name: findutils
Url: http://www.gnu.org/software/findutils/ Url: http://www.gnu.org/software/findutils/
License: GPL-3.0+
Group: Productivity/File utilities
Version: 4.5.10 Version: 4.5.10
Release: 0 Release: 0
Summary: The GNU versions of find utilities (find and xargs) 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 # retrieved from http://alpha.gnu.org/pub/gnu/findutils/findutils-4.5.10.tar.gz
Source: findutils-%{version}.tar.bz2 Source: findutils-%{version}.tar.bz2
Source1: sysconfig.locate Source1: sysconfig.locate
@ -61,6 +60,7 @@ useful for finding things on your system.
%lang_package %lang_package
%package locate %package locate
Summary: Tool for Locating Files (findutils subpackage) Summary: Tool for Locating Files (findutils subpackage)
Group: Productivity/File utilities
Provides: findutils:/usr/bin/locate Provides: findutils:/usr/bin/locate
PreReq: %{fillup_prereq} PreReq: %{fillup_prereq}
Requires: cron findutils = %{version} 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%{_bindir}/ftsfind
rm -f $RPM_BUILD_ROOT%{_infodir}/find-maint* rm -f $RPM_BUILD_ROOT%{_infodir}/find-maint*
%find_lang %{name} %find_lang %{name}
# move find to /bin/find #UsrMerge
mkdir -p $RPM_BUILD_ROOT/bin mkdir -p $RPM_BUILD_ROOT/bin
mv $RPM_BUILD_ROOT{%{_bindir},/bin}/find ln -sf %{_bindir}/find $RPM_BUILD_ROOT/bin
# create /usr/bin/find -> /bin/find symlink #UsrMerge
ln -sf ../../bin/find $RPM_BUILD_ROOT%{_bindir}
%post locate %post locate
%{fillup_only -n locate} %{fillup_only -n locate}
@ -125,7 +124,9 @@ ln -sf ../../bin/find $RPM_BUILD_ROOT%{_bindir}
%files %files
%defattr(-,root,root,-) %defattr(-,root,root,-)
%doc AUTHORS COPYING NEWS README THANKS TODO %doc AUTHORS COPYING NEWS README THANKS TODO
#UsrMerge
/bin/find /bin/find
#UsrMerge
%{_bindir}/find %{_bindir}/find
%{_bindir}/xargs %{_bindir}/xargs
%doc %{_infodir}/find.info*.gz %doc %{_infodir}/find.info*.gz