Minor spec cleanups and modifications, Drop Changelog, details in NEWS
This commit is contained in:
parent
3ee72574b5
commit
1386273667
18
grep.spec
18
grep.spec
@ -3,9 +3,11 @@
|
|||||||
Summary: Pattern matching utilities
|
Summary: Pattern matching utilities
|
||||||
Name: grep
|
Name: grep
|
||||||
Version: 2.21
|
Version: 2.21
|
||||||
Release: 6%{?dist}
|
Release: 7%{?dist}
|
||||||
License: GPLv3+
|
License: GPLv3+
|
||||||
|
URL: http://www.gnu.org/software/grep/
|
||||||
Group: Applications/Text
|
Group: Applications/Text
|
||||||
|
|
||||||
Source: ftp://ftp.gnu.org/pub/gnu/grep/grep-%{version}.tar.xz
|
Source: ftp://ftp.gnu.org/pub/gnu/grep/grep-%{version}.tar.xz
|
||||||
Source1: colorgrep.sh
|
Source1: colorgrep.sh
|
||||||
Source2: colorgrep.csh
|
Source2: colorgrep.csh
|
||||||
@ -20,10 +22,9 @@ Patch2: grep-2.21-buf-overrun-fix.patch
|
|||||||
# backported from upstream
|
# backported from upstream
|
||||||
# http://git.savannah.gnu.org/cgit/grep.git/commit/?id=c8b9364d5900a40809827aee6cc53705073278f6
|
# http://git.savannah.gnu.org/cgit/grep.git/commit/?id=c8b9364d5900a40809827aee6cc53705073278f6
|
||||||
Patch3: grep-2.21-recurse-behaviour-change-doc.patch
|
Patch3: grep-2.21-recurse-behaviour-change-doc.patch
|
||||||
URL: http://www.gnu.org/software/grep/
|
|
||||||
Requires(post): /sbin/install-info
|
Requires(post): /sbin/install-info
|
||||||
Requires(preun): /sbin/install-info
|
Requires(preun): /sbin/install-info
|
||||||
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
|
|
||||||
BuildRequires: pcre-devel >= 3.9-10, texinfo, gettext
|
BuildRequires: pcre-devel >= 3.9-10, texinfo, gettext
|
||||||
BuildRequires: autoconf automake
|
BuildRequires: autoconf automake
|
||||||
# https://fedorahosted.org/fpc/ticket/174
|
# https://fedorahosted.org/fpc/ticket/174
|
||||||
@ -60,7 +61,6 @@ chmod 755 tests/kwset-abuse
|
|||||||
make %{?_smp_mflags}
|
make %{?_smp_mflags}
|
||||||
|
|
||||||
%install
|
%install
|
||||||
rm -rf ${RPM_BUILD_ROOT}
|
|
||||||
make %{?_smp_mflags} DESTDIR=$RPM_BUILD_ROOT install
|
make %{?_smp_mflags} DESTDIR=$RPM_BUILD_ROOT install
|
||||||
gzip $RPM_BUILD_ROOT%{_infodir}/grep*
|
gzip $RPM_BUILD_ROOT%{_infodir}/grep*
|
||||||
rm -f $RPM_BUILD_ROOT%{_infodir}/dir
|
rm -f $RPM_BUILD_ROOT%{_infodir}/dir
|
||||||
@ -74,9 +74,6 @@ install -Dpm 755 %{SOURCE4} $RPM_BUILD_ROOT%{_libexecdir}/grepconf.sh
|
|||||||
%check
|
%check
|
||||||
make check
|
make check
|
||||||
|
|
||||||
%clean
|
|
||||||
rm -rf ${RPM_BUILD_ROOT}
|
|
||||||
|
|
||||||
%post
|
%post
|
||||||
/sbin/install-info --quiet --info-dir=%{_infodir} %{_infodir}/grep.info.gz || :
|
/sbin/install-info --quiet --info-dir=%{_infodir} %{_infodir}/grep.info.gz || :
|
||||||
|
|
||||||
@ -86,8 +83,7 @@ if [ $1 = 0 ]; then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
%files -f %{name}.lang
|
%files -f %{name}.lang
|
||||||
%defattr(-,root,root,-)
|
%doc AUTHORS THANKS TODO NEWS README
|
||||||
%doc ABOUT-NLS AUTHORS THANKS TODO NEWS README ChangeLog
|
|
||||||
%{!?_licensedir:%global license %%doc}
|
%{!?_licensedir:%global license %%doc}
|
||||||
%license COPYING
|
%license COPYING
|
||||||
|
|
||||||
@ -99,6 +95,10 @@ fi
|
|||||||
%{_libexecdir}/grepconf.sh
|
%{_libexecdir}/grepconf.sh
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Sun Aug 2 2015 Peter Robinson <pbrobinson@fedoraproject.org> 2.21-7
|
||||||
|
- Minor spec cleanups and modifications
|
||||||
|
- Drop Changelog, details in NEWS
|
||||||
|
|
||||||
* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.21-6
|
* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.21-6
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user