|
@@ -1,7 +1,7 @@
|
|
|
Summary: The GNU versions of grep pattern matching utilities.
|
|
Summary: The GNU versions of grep pattern matching utilities.
|
|
|
Summary(ja): GNU版 grep パターンマッチングユーティリティ
|
|
Summary(ja): GNU版 grep パターンマッチングユーティリティ
|
|
|
Name: grep
|
|
Name: grep
|
|
|
-Version: 2.7
|
|
+Version: 2.14
|
|
|
Release: 1%{?_dist_release}
|
|
Release: 1%{?_dist_release}
|
|
|
|
|
|
|
|
License: GPLv3+
|
|
License: GPLv3+
|
|
@@ -12,12 +12,15 @@ Source: ftp://ftp.gnu.org/pub/gnu/grep/grep-%{version}.tar.xz
|
|
|
Source1: colorgrep.sh
|
|
Source1: colorgrep.sh
|
|
|
Source2: colorgrep.csh
|
|
Source2: colorgrep.csh
|
|
|
Source3: GREP_COLORS
|
|
Source3: GREP_COLORS
|
|
|
-Patch0: grep-2.7-const-range-exp.patch
|
|
+Patch1: grep-2.11-gnulib-tests-rm-f.patch
|
|
|
|
|
+Patch2: grep-2.14-man-fix-R.patch
|
|
|
|
|
|
|
|
Requires(post): install-info
|
|
Requires(post): install-info
|
|
|
Requires(preun): install-info
|
|
Requires(preun): install-info
|
|
|
Buildroot: %{_tmppath}/%{name}-%{version}-root
|
|
Buildroot: %{_tmppath}/%{name}-%{version}-root
|
|
|
-BuildRequires: pcre-devel, texinfo, gettext, gzip
|
|
+BuildRequires: pcre-devel >= 8.31
|
|
|
|
|
+BuildRequires: texinfo, gettext, gzip
|
|
|
|
|
+BuildRequires: autoconf, automake
|
|
|
|
|
|
|
|
%description
|
|
%description
|
|
|
The GNU versions of commonly used grep utilities. Grep searches
|
|
The GNU versions of commonly used grep utilities. Grep searches
|
|
@@ -38,10 +41,12 @@ utility for searching through text.
|
|
|
|
|
|
|
|
%prep
|
|
%prep
|
|
|
%setup -q
|
|
%setup -q
|
|
|
-%patch0 -p1 -b .const-range-exp
|
|
+%patch1 -p1 -b .gnulib-tests-rm-f
|
|
|
|
|
+%patch2 -p1 -b .man-fix-R
|
|
|
|
|
+
|
|
|
|
|
|
|
|
%build
|
|
%build
|
|
|
-%configure CPPFLAGS="-I%{_includedir}/pcre" \
|
|
+%configure \
|
|
|
--without-included-regex
|
|
--without-included-regex
|
|
|
%__make %{?_smp_mflags}
|
|
%__make %{?_smp_mflags}
|
|
|
|
|
|
|
@@ -84,6 +89,10 @@ fi
|
|
|
%{_mandir}/*/*
|
|
%{_mandir}/*/*
|
|
|
|
|
|
|
|
%changelog
|
|
%changelog
|
|
|
|
|
+* Wed Oct 24 2012 Daisuke SUZUKI <daisuke@linux.or.jp> 2.14-1
|
|
|
|
|
+- update to 2.14
|
|
|
|
|
+- build with pcre-8.31
|
|
|
|
|
+
|
|
|
* Tue Feb 10 2011 Daisuke SUZUKI <daisuke@linux.or.jp> 2.7-1
|
|
* Tue Feb 10 2011 Daisuke SUZUKI <daisuke@linux.or.jp> 2.7-1
|
|
|
- new upstream release
|
|
- new upstream release
|
|
|
- drop unneeded old patches
|
|
- drop unneeded old patches
|
daisuke