From 245af782e7acd144bb5d1fddcd9df041a2a97927b1039c63fe03d813f6c1b485 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Mon, 6 Feb 2012 21:10:47 +0000 Subject: [PATCH 1/2] Accepting request 102624 from home:rjschwei:branches:Base:System usrMerge project - move files from toplevel to /usr OBS-URL: https://build.opensuse.org/request/show/102624 OBS-URL: https://build.opensuse.org/package/show/Base:System/sed?expand=0&rev=12 --- sed.changes | 5 +++++ sed.spec | 14 +++++++------- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/sed.changes b/sed.changes index a818b35..8c6152e 100644 --- a/sed.changes +++ b/sed.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Feb 3 15:20:39 UTC 2012 - rschweikert@suse.com + +- keep binary ni /usr tree (UsrMerge project) + ------------------------------------------------------------------- Fri Dec 2 13:16:18 UTC 2011 - cfarrell@suse.com diff --git a/sed.spec b/sed.spec index ae06394..bb9e97a 100644 --- a/sed.spec +++ b/sed.spec @@ -1,7 +1,7 @@ # # spec file for package sed # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,10 +18,10 @@ Name: sed Version: 4.2.1 Release: 0 -License: GPL-3.0+ Summary: A Stream-Oriented Non-Interactive Text Editor -Url: http://www.gnu.org/directory/sed.html +License: GPL-3.0+ Group: System/Base +Url: http://www.gnu.org/directory/sed.html Source: %name-%version.tar.bz2 PreReq: %install_info_prereq Provides: base:/bin/sed @@ -61,17 +61,17 @@ make %{?_smp_mflags} check %install %makeinstall -# Move sed to /bin: +#UsrMerge mkdir -p %{buildroot}/bin -mv %{buildroot}%{_bindir}/sed %{buildroot}/bin -ln -s ../../bin/sed %{buildroot}%{_bindir}/sed +ln -s %{_bindir}/sed %{buildroot}/bin/sed +#EndUserMerge %find_lang %name %files -f %name.lang %defattr(-, root, root) /bin/sed %{_bindir}/sed -%doc AUTHORS BUGS COPYING* INSTALL NEWS README* THANKS +%doc AUTHORS BUGS COPYING* NEWS README* THANKS %{_infodir}/sed.info*.gz %{_mandir}/man*/*.gz From c352991052dcbcb834e2549402e03b7b2d761372d3ff2eefbbc02479247c1993 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Tue, 7 Feb 2012 12:58:46 +0000 Subject: [PATCH 2/2] Accepting request 103027 from home:rjschwei:branches:Base:System usrMerge project - move files from toplevel to /usr OBS-URL: https://build.opensuse.org/request/show/103027 OBS-URL: https://build.opensuse.org/package/show/Base:System/sed?expand=0&rev=13 --- sed.changes | 2 +- sed.spec | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/sed.changes b/sed.changes index 8c6152e..42f3d15 100644 --- a/sed.changes +++ b/sed.changes @@ -1,7 +1,7 @@ ------------------------------------------------------------------- Fri Feb 3 15:20:39 UTC 2012 - rschweikert@suse.com -- keep binary ni /usr tree (UsrMerge project) +- keep binary in /usr tree (UsrMerge project) ------------------------------------------------------------------- Fri Dec 2 13:16:18 UTC 2011 - cfarrell@suse.com diff --git a/sed.spec b/sed.spec index bb9e97a..fab1ea0 100644 --- a/sed.spec +++ b/sed.spec @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: sed Version: 4.2.1 Release: 0