From 99d6dc79cd6189c3fff650bef46142f97343b1c1806cd34e20cf7f71af32e197 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Fri, 17 Feb 2012 19:28:27 +0000 Subject: [PATCH] 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 --- gawk.changes | 5 +++++ gawk.spec | 13 +++++++++---- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/gawk.changes b/gawk.changes index 9fe2d6d..f014ddc 100644 --- a/gawk.changes +++ b/gawk.changes @@ -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 diff --git a/gawk.spec b/gawk.spec index 6e4376f..20ecba0 100644 --- a/gawk.spec +++ b/gawk.spec @@ -76,13 +76,14 @@ make check %install make install DESTDIR=$RPM_BUILD_ROOT +#UsrMerge install -d $RPM_BUILD_ROOT/bin -mv -f $RPM_BUILD_ROOT/usr/bin/gawk $RPM_BUILD_ROOT/bin -ln -sf ../../bin/gawk $RPM_BUILD_ROOT/usr/bin +ln -sf %{_bindir}/gawk $RPM_BUILD_ROOT/bin +touch $RPM_BUILD_ROOT/bin/awk +#EndUsrMerge rm -f $RPM_BUILD_ROOT/usr/bin/*-%{version} $RPM_BUILD_ROOT/usr/bin/awk # create ghost files -touch $RPM_BUILD_ROOT/usr/bin/awk $RPM_BUILD_ROOT/bin/awk \ - $RPM_BUILD_ROOT/%{_mandir}/man1/awk.1.gz +touch $RPM_BUILD_ROOT/%{_bindir}/awk $RPM_BUILD_ROOT/%{_mandir}/man1/awk.1.gz %find_lang %name %clean @@ -107,12 +108,16 @@ fi %files -f %name.lang %defattr(-,root,root) %if %{suse_version} >= 1120 +#UsrMerge %ghost /bin/awk +#EndUsrMerge %ghost %{_bindir}/awk %ghost %{_mandir}/man1/awk.1.gz %endif %doc AUTHORS COPYING FUTURES LIMITATIONS NEWS POSIX.STD PROBLEMS README +#UsrMerge /bin/gawk +#EndUsrMerge %{_bindir}/dgawk %{_bindir}/gawk %{_bindir}/igawk