Accepting request 103289 from Base:System

- keep binaries in /usr tree (UsrMerge project)

OBS-URL: https://build.opensuse.org/request/show/103289
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gzip?expand=0&rev=24
This commit is contained in:
Stephan Kulow 2012-02-10 16:46:41 +00:00 committed by Git OBS Bridge
commit 8fd8e41e1a
2 changed files with 15 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

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
# remain the property of their copyright owners, unless otherwise agreed
@ -16,15 +16,14 @@
#
Name: gzip
Url: http://www.gzip.org/
License: GPL-2.0+
Group: Productivity/Archiving/Compression
PreReq: %{install_info_prereq} update-alternatives
Version: 1.4
Release: 2
Release: 0
Summary: GNU Zip Compression Utilities
License: GPL-2.0+
Group: Productivity/Archiving/Compression
Source: %{name}-%{version}.tar.gz
Patch: zgrep.diff
Patch1: tempfile.diff
@ -83,16 +82,18 @@ done
%install
%makeinstall
#UsrMerge
mkdir -p $RPM_BUILD_ROOT/bin
mv $RPM_BUILD_ROOT%{_bindir}/{gzip,gunzip,zcat} $RPM_BUILD_ROOT/bin
sed -i 's:%{_bindir}:/bin:' $RPM_BUILD_ROOT/bin/{gunzip,zcat}
ln -sf /bin/gzip /bin/gunzip /bin/zcat $RPM_BUILD_ROOT%{_bindir}
ln -sf %{_bindir}/gzip %{_bindir}/gunzip %{_bindir}/zcat $RPM_BUILD_ROOT/bin
#EndUsrMerge
ln -sf zmore $RPM_BUILD_ROOT%{_bindir}/zless
ln -sf zmore.1 $RPM_BUILD_ROOT%{_mandir}/man1/zless.1
%files
%defattr(-, root, root)
#UsrMerge
/bin/*
#EndUsrMerge
%{_bindir}/*
%doc README AUTHORS ChangeLog TODO NEWS THANKS
%doc %{_infodir}/*.gz