rpm/grep
SHA256
1
0
Fork 0
forked from pool/grep
Code Pull Requests Activity

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

Browse Source 
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
This commit is contained in:
Andreas Jaeger 2012-02-07 10:09:11 +00:00 committed by Git OBS Bridge
parent caec96c698
commit 878ebfbf59
2 changed files with 27 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
grep.changes
View File

@ -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 Fri Dec 2 10:13:19 UTC 2011 - cfarrell@suse.com

27
grep.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package grep # 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 # 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
@ -22,13 +22,13 @@ BuildRequires: pcre-devel
BuildRequires: pcre BuildRequires: pcre
%endif %endif
Url: http://www.gnu.org/software/grep/ Url: http://www.gnu.org/software/grep/
License: GPL-3.0+
Group: Productivity/Text/Utilities
Provides: base:/usr/bin/grep Provides: base:/usr/bin/grep
PreReq: %{install_info_prereq} PreReq: %{install_info_prereq}
Version: 2.9 Version: 2.9
Release: 0 Release: 0
Summary: Print lines matching a pattern Summary: Print lines matching a pattern
License: GPL-3.0+
Group: Productivity/Text/Utilities
Source: grep-%{version}.tar.bz2 Source: grep-%{version}.tar.bz2
Patch0: fix-testsuite.diff Patch0: fix-testsuite.diff
Patch1: grep-ppc-fix.patch 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 %configure -C --bindir=/bin --disable-silent-rules --without-included-regex
%else %else
AUTOPOINT=true autoreconf --force --install AUTOPOINT=true autoreconf --force --install
%configure --disable-silent-rules --bindir=/bin --without-included-regex %configure --disable-silent-rules --without-included-regex
%endif %endif
%{__make} %{?_smp_mflags} %{__make} %{?_smp_mflags}
@ -65,10 +65,19 @@ make check VERBOSE=1
%install %install
make install DESTDIR=$RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT
%if 0%{?suse_version} < 1120
install -d $RPM_BUILD_ROOT/usr/bin install -d $RPM_BUILD_ROOT/usr/bin
ln -sf ../../bin/egrep $RPM_BUILD_ROOT/usr/bin/egrep ln -sf ../../bin/egrep $RPM_BUILD_ROOT/usr/bin/egrep
ln -sf ../../bin/fgrep $RPM_BUILD_ROOT/usr/bin/fgrep ln -sf ../../bin/fgrep $RPM_BUILD_ROOT/usr/bin/fgrep
ln -sf ../../bin/grep $RPM_BUILD_ROOT/usr/bin/grep 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 %find_lang %name
%post %post
@ -80,8 +89,16 @@ ln -sf ../../bin/grep $RPM_BUILD_ROOT/usr/bin/grep
%files -f %name.lang %files -f %name.lang
%defattr(-,root,root) %defattr(-,root,root)
%doc README AUTHORS NEWS THANKS TODO %doc README AUTHORS NEWS THANKS TODO
%if 0%{?suse_version} < 1120
/bin/* /bin/*
/usr/bin/* %else
#UsrMerge
/bin/egrep
/bin/fgrep
/bin/grep
#EndUsrMerge
%endif
%{_bindir}/*
%{_mandir}/man1/*.gz %{_mandir}/man1/*.gz
%{_infodir}/*.gz %{_infodir}/*.gz