Hello community, here is the log from the commit of package grep for openSUSE:Factory checked in at 2012-02-07 14:45:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/grep (Old) and /work/SRC/openSUSE:Factory/.grep.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "grep", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/grep/grep.changes 2011-12-05 20:33:10.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.grep.new/grep.changes 2012-02-07 14:45:48.000000000 +0100 @@ -1,0 +2,5 @@ +Sat Feb 4 15:53:38 UTC 2012 - [email protected] + +- keep executables in /usr tree (UsrMerge project) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ grep.spec ++++++ --- /var/tmp/diff_new_pack.wP0otl/_old 2012-02-07 14:45:50.000000000 +0100 +++ /var/tmp/diff_new_pack.wP0otl/_new 2012-02-07 14:45:50.000000000 +0100 @@ -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 %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 @@ %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 @@ %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 @@ %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 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
