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
This commit is contained in:
Dirk Mueller 2012-02-06 21:10:47 +00:00 committed by Git OBS Bridge
parent bfd156ba6c
commit 245af782e7
2 changed files with 12 additions and 7 deletions

View File

@ -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 Fri Dec 2 13:16:18 UTC 2011 - cfarrell@suse.com

View File

@ -1,7 +1,7 @@
# #
# spec file for package sed # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -18,10 +18,10 @@
Name: sed Name: sed
Version: 4.2.1 Version: 4.2.1
Release: 0 Release: 0
License: GPL-3.0+
Summary: A Stream-Oriented Non-Interactive Text Editor Summary: A Stream-Oriented Non-Interactive Text Editor
Url: http://www.gnu.org/directory/sed.html License: GPL-3.0+
Group: System/Base Group: System/Base
Url: http://www.gnu.org/directory/sed.html
Source: %name-%version.tar.bz2 Source: %name-%version.tar.bz2
PreReq: %install_info_prereq PreReq: %install_info_prereq
Provides: base:/bin/sed Provides: base:/bin/sed
@ -61,17 +61,17 @@ make %{?_smp_mflags} check
%install %install
%makeinstall %makeinstall
# Move sed to /bin: #UsrMerge
mkdir -p %{buildroot}/bin mkdir -p %{buildroot}/bin
mv %{buildroot}%{_bindir}/sed %{buildroot}/bin ln -s %{_bindir}/sed %{buildroot}/bin/sed
ln -s ../../bin/sed %{buildroot}%{_bindir}/sed #EndUserMerge
%find_lang %name %find_lang %name
%files -f %name.lang %files -f %name.lang
%defattr(-, root, root) %defattr(-, root, root)
/bin/sed /bin/sed
%{_bindir}/sed %{_bindir}/sed
%doc AUTHORS BUGS COPYING* INSTALL NEWS README* THANKS %doc AUTHORS BUGS COPYING* NEWS README* THANKS
%{_infodir}/sed.info*.gz %{_infodir}/sed.info*.gz
%{_mandir}/man*/*.gz %{_mandir}/man*/*.gz