SHA256
1
0
forked from pool/gzip

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

usrMerge project - move files from toplevel to /usr

OBS-URL: https://build.opensuse.org/request/show/103114
OBS-URL: https://build.opensuse.org/package/show/Base:System/gzip?expand=0&rev=16
This commit is contained in:
Vítězslav Čížek 2012-02-08 09:51:32 +00:00 committed by Git OBS Bridge
parent 7b3bf6b130
commit 0046114810
2 changed files with 16 additions and 9 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Feb 7 21:33:35 UTC 2012 - rschweikert@suse.com
- keep binaries in /usr tree (UsrMerge project)
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Nov 13 12:36:20 UTC 2010 - cristian.rodriguez@opensuse.org Sat Nov 13 12:36:20 UTC 2010 - cristian.rodriguez@opensuse.org

View File

@ -1,7 +1,7 @@
# #
# spec file for package gzip (Version 1.4) # spec file for package gzip
# #
# Copyright (c) 2010 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
@ -16,15 +16,14 @@
# #
Name: gzip Name: gzip
Url: http://www.gzip.org/ Url: http://www.gzip.org/
License: GPLv2+
Group: Productivity/Archiving/Compression
PreReq: %{install_info_prereq} update-alternatives PreReq: %{install_info_prereq} update-alternatives
Version: 1.4 Version: 1.4
Release: 1 Release: 0
Summary: GNU Zip Compression Utilities Summary: GNU Zip Compression Utilities
License: GPL-2.0+
Group: Productivity/Archiving/Compression
Source: %{name}-%{version}.tar.gz Source: %{name}-%{version}.tar.gz
Patch: zgrep.diff Patch: zgrep.diff
Patch1: tempfile.diff Patch1: tempfile.diff
@ -83,16 +82,18 @@ done
%install %install
%makeinstall %makeinstall
#UsrMerge
mkdir -p $RPM_BUILD_ROOT/bin mkdir -p $RPM_BUILD_ROOT/bin
mv $RPM_BUILD_ROOT%{_bindir}/{gzip,gunzip,zcat} $RPM_BUILD_ROOT/bin ln -sf %{_bindir}/gzip %{_bindir}/gunzip %{_bindir}/zcat $RPM_BUILD_ROOT/bin
sed -i 's:%{_bindir}:/bin:' $RPM_BUILD_ROOT/bin/{gunzip,zcat} #EndUsrMerge
ln -sf /bin/gzip /bin/gunzip /bin/zcat $RPM_BUILD_ROOT%{_bindir}
ln -sf zmore $RPM_BUILD_ROOT%{_bindir}/zless ln -sf zmore $RPM_BUILD_ROOT%{_bindir}/zless
ln -sf zmore.1 $RPM_BUILD_ROOT%{_mandir}/man1/zless.1 ln -sf zmore.1 $RPM_BUILD_ROOT%{_mandir}/man1/zless.1
%files %files
%defattr(-, root, root) %defattr(-, root, root)
#UsrMerge
/bin/* /bin/*
#EndUsrMerge
%{_bindir}/* %{_bindir}/*
%doc README AUTHORS ChangeLog TODO NEWS THANKS %doc README AUTHORS ChangeLog TODO NEWS THANKS
%doc %{_infodir}/*.gz %doc %{_infodir}/*.gz
@ -100,6 +101,7 @@ ln -sf zmore.1 $RPM_BUILD_ROOT%{_mandir}/man1/zless.1
%post %post
%install_info --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz %install_info --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz
%postun %postun
%install_info_delete --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz %install_info_delete --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz