diff --git a/sed.changes b/sed.changes index a818b35..42f3d15 100644 --- a/sed.changes +++ b/sed.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Feb 3 15:20:39 UTC 2012 - rschweikert@suse.com + +- 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 ae06394..fab1ea0 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 @@ -15,13 +15,14 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + 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 +62,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