|
|
@@ -1,8 +1,8 @@
|
|
|
%define build_compat32 %{?_with_compat32:1}%{!?_with_compat32:0}
|
|
|
|
|
|
-Name: pcre
|
|
|
-Version: 8.39
|
|
|
-Release: 2%{?_dist_release}
|
|
|
+Name: pcre2
|
|
|
+Version: 10.31
|
|
|
+Release: 1%{?_dist_release}
|
|
|
Summary: Perl-compatible regular expression library
|
|
|
Summary(ja): Perl 互換の正規表現ライブラリ
|
|
|
|
|
|
@@ -12,9 +12,7 @@ URL: http://www.pcre.org/
|
|
|
|
|
|
Source0: ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/%{name}-%{version}.tar.bz2
|
|
|
# Upstream thinks RPATH is good idea.
|
|
|
-Patch0: pcre-8.21-multilib.patch
|
|
|
-# Refused by upstream, bug #675477
|
|
|
-Patch1: pcre-8.32-refused_spelling_terminated.patch
|
|
|
+Patch0: pcre2-10.31-multilib.patch
|
|
|
|
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-root
|
|
|
BuildRequires: zlib-devel
|
|
|
@@ -74,7 +72,6 @@ Development files (Headers, libraries for static linking, etc) for %{name}.
|
|
|
%setup -q
|
|
|
# Get rid of rpath
|
|
|
%patch0 -p1 -b .multilib
|
|
|
-%patch1 -p1 -b .terminated_typos
|
|
|
# Because of rpath patch
|
|
|
libtoolize --copy --force && autoreconf -vif
|
|
|
# One contributor's name is non-UTF-8
|
|
|
@@ -93,9 +90,9 @@ done
|
|
|
--enable-pcregrep-libz \
|
|
|
--enable-pcregrep-libbz2 \
|
|
|
--enable-pcretest-libedit \
|
|
|
- --enable-pcre8 \
|
|
|
- --enable-pcre16 \
|
|
|
- --enable-pcre32
|
|
|
+ --enable-pcre2-8 \
|
|
|
+ --enable-pcre2-16 \
|
|
|
+ --enable-pcre2-32
|
|
|
|
|
|
make %{?_smp_mflags}
|
|
|
|
|
|
@@ -128,20 +125,20 @@ rm -rf $RPM_BUILD_ROOT
|
|
|
%files
|
|
|
%defattr(-,root,root)
|
|
|
%doc AUTHORS COPYING ChangeLog LICENCE NEWS README
|
|
|
-%{_bindir}/pcregrep
|
|
|
+%{_bindir}/pcre2grep
|
|
|
%{_libdir}/*.so.*
|
|
|
-%{_mandir}/man1/pcregrep.*
|
|
|
+%{_mandir}/man1/pcre2grep.*
|
|
|
|
|
|
%files devel
|
|
|
%defattr(-,root,root)
|
|
|
%doc doc/html/*
|
|
|
-%{_bindir}/pcre-config
|
|
|
-%{_bindir}/pcretest
|
|
|
+%{_bindir}/pcre2-config
|
|
|
+%{_bindir}/pcre2test
|
|
|
%{_includedir}/*
|
|
|
%{_libdir}/*.so
|
|
|
%{_libdir}/pkgconfig/*.pc
|
|
|
-%{_mandir}/man1/pcre-config.*
|
|
|
-%{_mandir}/man1/pcretest.*
|
|
|
+%{_mandir}/man1/pcre2-config.*
|
|
|
+%{_mandir}/man1/pcre2test.*
|
|
|
%{_mandir}/man3/*
|
|
|
|
|
|
%if %{build_compat32}
|
|
|
@@ -156,6 +153,11 @@ rm -rf $RPM_BUILD_ROOT
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
+* Sun May 20 2018 IWAI, Masaharu <iwaim.sub@gmail.com> 10.31-1
|
|
|
+- new: pcre2 package
|
|
|
+- update multilib patch (Patch0)
|
|
|
+- drop unnecessary patch (Patch1)
|
|
|
+
|
|
|
* Fri Jul 29 2016 Yoji TOYODA <bsyamato@sea.plala.or.jp> 8.39-2
|
|
|
- create comapt32 packages
|
|
|
|
iwaim