Accepting request 103443 from home:rjschwei:branches:Base:System

usrMerge project - move files from toplevel to /usr

OBS-URL: https://build.opensuse.org/request/show/103443
OBS-URL: https://build.opensuse.org/package/show/Base:System/gawk?expand=0&rev=23
This commit is contained in:
Marcus Meissner 2012-02-17 19:28:27 +00:00 committed by Git OBS Bridge
parent fa5d01c5a9
commit 99d6dc79cd
2 changed files with 14 additions and 4 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Feb 8 20:59:12 UTC 2012 - rschweikert@suse.com
- keep binaries in /usr tree {UsrMerge project)
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Jan 30 16:16:45 CET 2012 - pth@suse.de Mon Jan 30 16:16:45 CET 2012 - pth@suse.de

View File

@ -76,13 +76,14 @@ make check
%install %install
make install DESTDIR=$RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT
#UsrMerge
install -d $RPM_BUILD_ROOT/bin install -d $RPM_BUILD_ROOT/bin
mv -f $RPM_BUILD_ROOT/usr/bin/gawk $RPM_BUILD_ROOT/bin ln -sf %{_bindir}/gawk $RPM_BUILD_ROOT/bin
ln -sf ../../bin/gawk $RPM_BUILD_ROOT/usr/bin touch $RPM_BUILD_ROOT/bin/awk
#EndUsrMerge
rm -f $RPM_BUILD_ROOT/usr/bin/*-%{version} $RPM_BUILD_ROOT/usr/bin/awk rm -f $RPM_BUILD_ROOT/usr/bin/*-%{version} $RPM_BUILD_ROOT/usr/bin/awk
# create ghost files # create ghost files
touch $RPM_BUILD_ROOT/usr/bin/awk $RPM_BUILD_ROOT/bin/awk \ touch $RPM_BUILD_ROOT/%{_bindir}/awk $RPM_BUILD_ROOT/%{_mandir}/man1/awk.1.gz
$RPM_BUILD_ROOT/%{_mandir}/man1/awk.1.gz
%find_lang %name %find_lang %name
%clean %clean
@ -107,12 +108,16 @@ fi
%files -f %name.lang %files -f %name.lang
%defattr(-,root,root) %defattr(-,root,root)
%if %{suse_version} >= 1120 %if %{suse_version} >= 1120
#UsrMerge
%ghost /bin/awk %ghost /bin/awk
#EndUsrMerge
%ghost %{_bindir}/awk %ghost %{_bindir}/awk
%ghost %{_mandir}/man1/awk.1.gz %ghost %{_mandir}/man1/awk.1.gz
%endif %endif
%doc AUTHORS COPYING FUTURES LIMITATIONS NEWS POSIX.STD PROBLEMS README %doc AUTHORS COPYING FUTURES LIMITATIONS NEWS POSIX.STD PROBLEMS README
#UsrMerge
/bin/gawk /bin/gawk
#EndUsrMerge
%{_bindir}/dgawk %{_bindir}/dgawk
%{_bindir}/gawk %{_bindir}/gawk
%{_bindir}/igawk %{_bindir}/igawk