From 878ebfbf59a758127f65f784abffc95e35945deec437021659f35abcc777209f Mon Sep 17 00:00:00 2001
From: Andreas Jaeger <aj@suse.com>
Date: Tue, 7 Feb 2012 10:09:11 +0000
Subject: [PATCH] Accepting request 102725 from
 home:rjschwei:branches:Base:System

usrMerge project - move files from toplevel to /usr

OBS-URL: https://build.opensuse.org/request/show/102725
OBS-URL: https://build.opensuse.org/package/show/Base:System/grep?expand=0&rev=20
---
 grep.changes |  5 +++++
 grep.spec    | 27 ++++++++++++++++++++++-----
 2 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/grep.changes b/grep.changes
index 6b699e2..353301b 100644
--- a/grep.changes
+++ b/grep.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sat Feb  4 15:53:38 UTC 2012 - rschweikert@suse.com
+
+- keep executables in /usr tree (UsrMerge project)
+
 -------------------------------------------------------------------
 Fri Dec  2 10:13:19 UTC 2011 - cfarrell@suse.com
 
diff --git a/grep.spec b/grep.spec
index 7ee55e0..845a13c 100644
--- a/grep.spec
+++ b/grep.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package grep
 #
-# 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
@@ -22,13 +22,13 @@ BuildRequires:  pcre-devel
 BuildRequires:  pcre
 %endif
 Url:            http://www.gnu.org/software/grep/
-License:        GPL-3.0+
-Group:          Productivity/Text/Utilities
 Provides:       base:/usr/bin/grep
 PreReq:         %{install_info_prereq}
 Version:        2.9
 Release:        0
 Summary:        Print lines matching a pattern
+License:        GPL-3.0+
+Group:          Productivity/Text/Utilities
 Source:         grep-%{version}.tar.bz2
 Patch0:         fix-testsuite.diff
 Patch1:         grep-ppc-fix.patch
@@ -56,7 +56,7 @@ echo "ac_cv_search_pcre_compile=\${ac_cv_search_pcre_compile=%{_libdir}/libpcre.
 %configure -C --bindir=/bin --disable-silent-rules --without-included-regex
 %else
 AUTOPOINT=true autoreconf --force --install
-%configure --disable-silent-rules --bindir=/bin --without-included-regex
+%configure --disable-silent-rules --without-included-regex
 %endif
 %{__make} %{?_smp_mflags}
 
@@ -65,10 +65,19 @@ make check VERBOSE=1
 
 %install
 make install DESTDIR=$RPM_BUILD_ROOT
+%if 0%{?suse_version} < 1120
 install -d $RPM_BUILD_ROOT/usr/bin
 ln -sf ../../bin/egrep $RPM_BUILD_ROOT/usr/bin/egrep
 ln -sf ../../bin/fgrep $RPM_BUILD_ROOT/usr/bin/fgrep
 ln -sf ../../bin/grep  $RPM_BUILD_ROOT/usr/bin/grep
+%else
+#UsrMerge
+install -d $RPM_BUILD_ROOT/bin
+ln -sf %{_bindir}/egrep $RPM_BUILD_ROOT/bin/egrep
+ln -sf %{_bindir}/fgrep $RPM_BUILD_ROOT/bin/fgrep
+ln -sf %{_bindir}/grep $RPM_BUILD_ROOT/bin/grep
+#EndUsrMerge
+%endif
 %find_lang %name
 
 %post
@@ -80,8 +89,16 @@ ln -sf ../../bin/grep  $RPM_BUILD_ROOT/usr/bin/grep
 %files -f %name.lang
 %defattr(-,root,root)
 %doc README AUTHORS NEWS THANKS TODO
+%if 0%{?suse_version} < 1120
 /bin/*
-/usr/bin/*
+%else
+#UsrMerge
+/bin/egrep
+/bin/fgrep
+/bin/grep
+#EndUsrMerge
+%endif
+%{_bindir}/*
 %{_mandir}/man1/*.gz
 %{_infodir}/*.gz