From 00461148104ffbb981ff159bc468712135a70ff08c189f92d832c94195f7f116 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADt=C4=9Bzslav=20=C4=8C=C3=AD=C5=BEek?=
 <vcizek@suse.com>
Date: Wed, 8 Feb 2012 09:51:32 +0000
Subject: [PATCH] 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
---
 gzip.changes |  5 +++++
 gzip.spec    | 20 +++++++++++---------
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/gzip.changes b/gzip.changes
index bfa9b7b..4078328 100644
--- a/gzip.changes
+++ b/gzip.changes
@@ -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
 
diff --git a/gzip.spec b/gzip.spec
index 106c80c..6c63897 100644
--- a/gzip.spec
+++ b/gzip.spec
@@ -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:        GPLv2+
-Group:          Productivity/Archiving/Compression
 PreReq:         %{install_info_prereq} update-alternatives
 Version:        1.4
-Release:        1
+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
@@ -100,6 +101,7 @@ ln -sf zmore.1 $RPM_BUILD_ROOT%{_mandir}/man1/zless.1
 
 %post
 %install_info --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz  
+
 %postun
 %install_info_delete --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz