From 2982cb87b3e6efcf8db438b61bc3266355ec5323 Mon Sep 17 00:00:00 2001 From: Erik van Pienbroek Date: Fri, 5 Jul 2013 00:20:05 +0200 Subject: [PATCH] Update to 8.33 and added various ./configure arguments - Update to 8.33 - Added the configure arguments --enable-pcre8 --enable-pcre16 --enable-pcre32 (the pcre16 one is needed by mingw-qt5-qtbase) - Use a more verbose filelist --- .gitignore | 1 + mingw-pcre.spec | 60 ++++++++++++++++++++++++++++++++++++++++--------- sources | 2 +- 3 files changed, 52 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index eafd77d..b211d58 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /pcre-8.30.tar.gz /pcre-8.31.tar.gz /pcre-8.32.tar.gz +/pcre-8.33.tar.gz diff --git a/mingw-pcre.spec b/mingw-pcre.spec index 114a4cf..905e91e 100644 --- a/mingw-pcre.spec +++ b/mingw-pcre.spec @@ -1,7 +1,7 @@ %?mingw_package_header Name: mingw-pcre -Version: 8.32 +Version: 8.33 Release: 1%{?dist} Summary: MinGW Windows pcre library @@ -72,7 +72,7 @@ for the POSIX-style functions is called pcreposix.h. %build -%mingw_configure --enable-utf8 --enable-unicode-properties --disable-static +%mingw_configure --enable-utf8 --enable-unicode-properties --disable-static --enable-pcre8 --enable-pcre16 --enable-pcre32 %mingw_make %{?_smp_mflags} @@ -94,10 +94,27 @@ find $RPM_BUILD_ROOT -name "*.la" -delete %{mingw32_bindir}/pcre-config %{mingw32_bindir}/pcregrep.exe %{mingw32_bindir}/pcretest.exe -%{mingw32_bindir}/libpcre*.dll -%{mingw32_libdir}/libpcre*.dll.a -%{mingw32_libdir}/pkgconfig/libpcre*.pc -%{mingw32_includedir}/*.h +%{mingw32_bindir}/libpcre-1.dll +%{mingw32_bindir}/libpcre16-0.dll +%{mingw32_bindir}/libpcre32-0.dll +%{mingw32_bindir}/libpcrecpp-0.dll +%{mingw32_bindir}/libpcreposix-0.dll +%{mingw32_libdir}/libpcre.dll.a +%{mingw32_libdir}/libpcre16.dll.a +%{mingw32_libdir}/libpcre32.dll.a +%{mingw32_libdir}/libpcrecpp.dll.a +%{mingw32_libdir}/libpcreposix.dll.a +%{mingw32_libdir}/pkgconfig/libpcre.pc +%{mingw32_libdir}/pkgconfig/libpcre16.pc +%{mingw32_libdir}/pkgconfig/libpcre32.pc +%{mingw32_libdir}/pkgconfig/libpcrecpp.pc +%{mingw32_libdir}/pkgconfig/libpcreposix.pc +%{mingw32_includedir}/pcre.h +%{mingw32_includedir}/pcre_scanner.h +%{mingw32_includedir}/pcre_stringpiece.h +%{mingw32_includedir}/pcrecpp.h +%{mingw32_includedir}/pcrecpparg.h +%{mingw32_includedir}/pcreposix.h # Win64 %files -n mingw64-pcre @@ -105,13 +122,36 @@ find $RPM_BUILD_ROOT -name "*.la" -delete %{mingw64_bindir}/pcre-config %{mingw64_bindir}/pcregrep.exe %{mingw64_bindir}/pcretest.exe -%{mingw64_bindir}/libpcre*.dll -%{mingw64_libdir}/libpcre*.dll.a -%{mingw64_libdir}/pkgconfig/libpcre*.pc -%{mingw64_includedir}/*.h +%{mingw64_bindir}/libpcre-1.dll +%{mingw64_bindir}/libpcre16-0.dll +%{mingw64_bindir}/libpcre32-0.dll +%{mingw64_bindir}/libpcrecpp-0.dll +%{mingw64_bindir}/libpcreposix-0.dll +%{mingw64_libdir}/libpcre.dll.a +%{mingw64_libdir}/libpcre16.dll.a +%{mingw64_libdir}/libpcre32.dll.a +%{mingw64_libdir}/libpcrecpp.dll.a +%{mingw64_libdir}/libpcreposix.dll.a +%{mingw64_libdir}/pkgconfig/libpcre.pc +%{mingw64_libdir}/pkgconfig/libpcre16.pc +%{mingw64_libdir}/pkgconfig/libpcre32.pc +%{mingw64_libdir}/pkgconfig/libpcrecpp.pc +%{mingw64_libdir}/pkgconfig/libpcreposix.pc +%{mingw64_includedir}/pcre.h +%{mingw64_includedir}/pcre_scanner.h +%{mingw64_includedir}/pcre_stringpiece.h +%{mingw64_includedir}/pcrecpp.h +%{mingw64_includedir}/pcrecpparg.h +%{mingw64_includedir}/pcreposix.h %changelog +* Wed Jul 3 2013 Erik van Pienbroek - 8.33-1 +- Update to 8.33 +- Added the configure arguments --enable-pcre8 --enable-pcre16 --enable-pcre32 + (the pcre16 one is needed by mingw-qt5-qtbase) +- Use a more verbose filelist + * Sun Mar 24 2013 Erik van Pienbroek - 8.32-1 - Update to 8.32 diff --git a/sources b/sources index cab3f7c..28a9334 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -234792d19a6c3c34a13ff25df82c1ce7 pcre-8.32.tar.gz +94854c93dcc881edd37904bb6ef49ebc pcre-8.33.tar.gz