- Adhere to packaging guidelines.

- Resolves: #225857
- Use CPPFLAGS= argument to configure to add an -I option.
- Do not set LDFLAGS=-s for "make install".
This commit is contained in:
skasal 2007-04-20 17:30:41 +00:00
parent 0d0134c39c
commit e58a1de3fd

View File

@ -1,7 +1,9 @@
Summary: The GNU versions of grep pattern matching utilities. Summary: The GNU versions of grep pattern matching utilities
- Adhere to packaging guidelines.
- Resolves: #225857
Name: grep Name: grep
Version: 2.5.1 Version: 2.5.1
Release: 57%{?dist} Release: 58%{?dist}
License: GPL License: GPL
Group: Applications/Text Group: Applications/Text
Source: ftp://ftp.gnu.org/pub/gnu/grep/grep-%{version}a.tar.bz2 Source: ftp://ftp.gnu.org/pub/gnu/grep/grep-%{version}a.tar.bz2
@ -21,9 +23,10 @@ Patch14: grep-P.patch
Patch15: grep-mem-exhausted.patch Patch15: grep-mem-exhausted.patch
Patch16: grep-empty-pattern.patch Patch16: grep-empty-pattern.patch
URL: http://www.gnu.org/software/grep/ URL: http://www.gnu.org/software/grep/
Prereq: /sbin/install-info Requires(post): /sbin/install-info
Buildroot: %{_tmppath}/%{name}-%{version}-root Requires(preun): /sbin/install-info
Buildrequires: pcre-devel >= 3.9-10, texinfo, gettext, gzip BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildRequires: pcre-devel >= 3.9-10, texinfo, gettext
%description %description
The GNU versions of commonly used grep utilities. Grep searches The GNU versions of commonly used grep utilities. Grep searches
@ -55,13 +58,12 @@ chmod a+x tests/fmbtest.sh
%build %build
[ ! -e configure ] && ./autogen.sh [ ! -e configure ] && ./autogen.sh
%configure --without-included-regex %configure --without-included-regex CPPFLAGS="-I%{_includedir}/pcre"
make CFLAGS="$RPM_OPT_FLAGS -I%{_includedir}/pcre" make %{?_smp_mflags}
make check
%install %install
rm -rf ${RPM_BUILD_ROOT} rm -rf ${RPM_BUILD_ROOT}
%makeinstall LDFLAGS=-s prefix=${RPM_BUILD_ROOT}%{_prefix} exec_prefix=${RPM_BUILD_ROOT} make %{?_smp_mflags} DESTDIR=$RPM_BUILD_ROOT install
%ifos Linux %ifos Linux
mkdir -p $RPM_BUILD_ROOT/bin mkdir -p $RPM_BUILD_ROOT/bin
mv -f $RPM_BUILD_ROOT%{_bindir}/* $RPM_BUILD_ROOT/bin mv -f $RPM_BUILD_ROOT%{_bindir}/* $RPM_BUILD_ROOT/bin
@ -76,6 +78,9 @@ ln -sf grep $RPM_BUILD_ROOT/bin/fgrep
%find_lang %name %find_lang %name
%check
make check
%clean %clean
rm -rf ${RPM_BUILD_ROOT} rm -rf ${RPM_BUILD_ROOT}
@ -89,7 +94,7 @@ fi
%files -f %{name}.lang %files -f %{name}.lang
%defattr(-,root,root) %defattr(-,root,root)
%doc ABOUT-NLS AUTHORS THANKS TODO NEWS README ChangeLog %doc ABOUT-NLS AUTHORS THANKS TODO NEWS README ChangeLog COPYING
%ifos Linux %ifos Linux
/bin/* /bin/*
@ -100,6 +105,12 @@ fi
%{_mandir}/*/* %{_mandir}/*/*
%changelog %changelog
* Fri Apr 20 2007 Stepan Kasal <skasal@redhat.com> - 2.5.1-58
- Adhere to packaging guidelines.
- Resolves: #225857
- Use CPPFLAGS= argument to configure to add an -I option.
- Do not set LDFLAGS=-s for "make install".
* Mon Jan 22 2007 Tim Waugh <twaugh@redhat.com> 2.5.1-57 * Mon Jan 22 2007 Tim Waugh <twaugh@redhat.com> 2.5.1-57
- Make preun scriptlet unconditionally succeed (bug #223697). - Make preun scriptlet unconditionally succeed (bug #223697).
@ -380,7 +391,7 @@ fi
* Sun May 13 2001 Bernhard Rosenkraenzer <bero@redhat.com> 2.5e-1 * Sun May 13 2001 Bernhard Rosenkraenzer <bero@redhat.com> 2.5e-1
- 2.5e - 2.5e
* Tue Feb 27 2001 Trond Eivind Glomsrød <teg@redhat.com> * Tue Feb 27 2001 Trond Eivind Glomsrød <teg@redhat.com>
- use %%{_tmppath} - use %%{_tmppath}
- langify - langify
@ -413,7 +424,7 @@ fi
- auto rebuild in the new build environment (release 2) - auto rebuild in the new build environment (release 2)
* Mon Mar 08 1999 Preston Brown <pbrown@redhat.com> * Mon Mar 08 1999 Preston Brown <pbrown@redhat.com>
- upgraded to grep 2.3, added install-info %post/%preun for info - upgraded to grep 2.3, added install-info %%post/%%preun for info
* Wed Feb 24 1999 Preston Brown <pbrown@redhat.com> * Wed Feb 24 1999 Preston Brown <pbrown@redhat.com>
- Injected new description and group. - Injected new description and group.