diff --git a/baselibs.conf b/baselibs.conf index 20e9df2..f52c1b4 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,3 +1,4 @@ libpcre2-8-0 libpcre2-16-0 +libpcre2-32-0 libpcre2-posix0 diff --git a/pcre2.changes b/pcre2.changes index 9111be6..84fa2b2 100644 --- a/pcre2.changes +++ b/pcre2.changes @@ -1,5 +1,5 @@ ------------------------------------------------------------------- -Thu Jun 18 18:53:16 UTC 2015 - astieger@suse.com +Thu Jun 18 20:51:45 UTC 2015 - astieger@suse.com - PCRE2, a re-working of the original PCRE library to provide an entirely new API, version 10.10. Not source compatible. @@ -7,9 +7,10 @@ Thu Jun 18 18:53:16 UTC 2015 - astieger@suse.com * required name changes * adjust pcre-8.21-multilib.patch to pcre2-10.10-multilib.patch * drop upstreamed pcre-8.32-visibility.patch + * --enable-{utf8,unicode-properties} became --enable-unicode * drop cpp subpackage - * libpcre1(-0) -> libpcre2-8(-0) * make test -> check + * enable 32 bit character support ------------------------------------------------------------------- Thu Apr 30 22:08:31 UTC 2015 - astieger@suse.com diff --git a/pcre2.spec b/pcre2.spec index 743b63f..b7eb114 100644 --- a/pcre2.spec +++ b/pcre2.spec @@ -49,6 +49,7 @@ API. Summary: A library for Perl-compatible regular expressions Group: Development/Libraries/C and C++ Requires: libpcre2-16-0 = %{version} +Requires: libpcre2-32-0 = %{version} Requires: libpcre2-8-0 = %{version} Requires: libpcre2-posix0 = %{version} Requires: libstdc++-devel @@ -89,7 +90,7 @@ PCRE2 is a re-working of the original PCRE library to provide an entirely new API. This PCRE2 library variant supports 8-bit and UTF-8 strings. -(See also libpcre2-16.) +(See also libpcre2-16 and libpcre2-32) %package -n libpcre2-16-0 Summary: A library for Perl-compatible regular expressions @@ -105,6 +106,20 @@ API. libpcre2-16 supports 16-bit and UTF-16 strings. +%package -n libpcre2-32-0 +Summary: A library for Perl-compatible regular expressions +Group: System/Libraries + +%description -n libpcre2-32-0 +The PCRE2 library is a set of functions that implement regular +expression pattern matching using the same syntax and semantics +as Perl 5. + +PCRE2 is a re-working of the original PCRE library to provide an entirely new +API. + +libpcre2-32 supports 32-bit and UTF-32 strings. + %package -n libpcre2-posix0 Summary: A library for Perl-compatible regular expressions Group: System/Libraries @@ -164,8 +179,8 @@ export LDFLAGS="-Wl,-z,relro,-z,now" --with-match-limit=10000000 \ --enable-newline-is-lf \ --enable-pcre2-16 \ - --enable-utf8 \ - --enable-unicode-properties + --enable-pcre2-32 \ + --enable-unicode make %{?_smp_mflags} V=1 %install @@ -187,6 +202,10 @@ make check -j1 %postun -n libpcre2-16-0 -p /sbin/ldconfig +%post -n libpcre2-32-0 -p /sbin/ldconfig + +%postun -n libpcre2-32-0 -p /sbin/ldconfig + %post -n libpcre2-posix0 -p /sbin/ldconfig %postun -n libpcre2-posix0 -p /sbin/ldconfig @@ -200,6 +219,10 @@ make check -j1 %defattr(-,root,root) %{_libdir}/libpcre2-16.so.* +%files -n libpcre2-32-0 +%defattr(-,root,root) +%{_libdir}/libpcre2-32.so.* + %files -n libpcre2-posix0 %defattr(-,root,root) %{_libdir}/libpcre2-posix.so.* @@ -222,6 +245,7 @@ make check -j1 %{_libdir}/*.so %{_libdir}/pkgconfig/libpcre2-8.pc %{_libdir}/pkgconfig/libpcre2-16.pc +%{_libdir}/pkgconfig/libpcre2-32.pc %{_libdir}/pkgconfig/libpcre2-posix.pc %{_mandir}/man1/pcre2-config.* %{_mandir}/man3/*.gz