cygwin-pcre 8.21-1

3 files changed, 15 insertions, 51 deletions

diff --git a/cygwin-pcre.spec b/cygwin-pcre.spec
index ed93c0b..d84f1b0 100644
--- a/cygwin-pcre.spec
+++ b/cygwin-pcre.spec
@@ -6,28 +6,26 @@
 %define __debug_install_post %{_cygwin_debug_install_post}
 
 Name:		cygwin-pcre
-Version:	8.12
+Version:	8.21
 Release:	1
 Summary:	Cygwin pcre library
 
 Group:		Development/Libraries
 License:	BSD
 URL:		http://www.pcre.org/
-Source0:	ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-%{version}.tar.gz
-Patch0:		pcre-8.10-multilib.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
 
+Source0:	ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-%{version}.tar.bz2
+
 Requires:	pkgconfig
 
+BuildRequires:  autoconf, automake, cygwin-libtool
 BuildRequires:	cygwin-filesystem
 BuildRequires:	cygwin-gcc
 BuildRequires:	cygwin-gcc-c++
 BuildRequires:	cygwin-binutils
 
-# New libtool to get rid of rpath
-BuildRequires: autoconf, automake, libtool
-
 %{?_cygwin_debug_package}
 
 %description
@@ -51,10 +49,9 @@ Static version of the Cygwin PCRE library.
 
 %prep
 %setup -q -n pcre-%{version}
+mkdir -p m4
+%{_cygwin_autoreconf}
 
-# Get rid of rpath
-%patch0 -p1 -b .multilib
-libtoolize --copy --force && autoreconf
 # One contributor's name is non-UTF-8
 for F in ChangeLog; do
     iconv -f latin1 -t utf8 "$F" >"${F}.utf8"
@@ -70,9 +67,12 @@ make %{?_smp_mflags}
 rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
 
+# We intentionally don't ship *.la files
+rm -f $RPM_BUILD_ROOT%{_cygwin_libdir}/*.la
+
 # same documentation as from native pcre
-rm -rf $RPM_BUILD_ROOT%{_cygwin_datadir}/doc/*
-rm -rf $RPM_BUILD_ROOT%{_cygwin_datadir}/man/*
+rm -rf $RPM_BUILD_ROOT%{_cygwin_docdir}
+rm -rf $RPM_BUILD_ROOT%{_cygwin_mandir}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -84,7 +84,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_cygwin_bindir}/pcretest.exe
 %{_cygwin_bindir}/cygpcre*.dll
 %{_cygwin_libdir}/libpcre*.dll.a
-%{_cygwin_libdir}/libpcre*.la
 %{_cygwin_libdir}/pkgconfig/libpcre*.pc
 %{_cygwin_includedir}/*.h
 %doc AUTHORS COPYING LICENCE NEWS README ChangeLog
@@ -98,5 +97,8 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Jan 10 2012 Yaakov Selkowitz <cygwin-ports-general@lists.sourceforge.net> - 8.21-1
+- Version bump.
+
 * Thu Feb 17 2011 Yaakov Selkowitz <cygwin-ports-general@lists.sourceforge.net> - 8.12-1
 - Initial spec file, largely based on mingw32-pcre.
diff --git a/pcre-8.10-multilib.patch b/pcre-8.10-multilib.patch
deleted file mode 100644
index d491612..0000000
--- a/pcre-8.10-multilib.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff -Naur pcre-8.10.orig/pcre-config.in pcre-8.10/pcre-config.in
---- pcre-8.10.orig/pcre-config.in	2010-03-02 12:08:45.000000000 +0100
-+++ pcre-8.10/pcre-config.in	2010-07-12 14:15:30.666700210 +0200
-@@ -15,16 +15,6 @@
-       exit 1
- fi
- 
--libR=
--case `uname -s` in
--  *SunOS*)
--  libR=" -R@libdir@"
--  ;;
--  *BSD*)
--  libR=" -Wl,-R@libdir@"
--  ;;
--esac
--
- while test $# -gt 0; do
-   case "$1" in
-   -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
-@@ -58,14 +48,14 @@
-       echo $includes @PCRE_STATIC_CFLAG@
-       ;;
-     --libs-posix)
--      echo -L@libdir@$libR -lpcreposix -lpcre
-+      echo -lpcreposix -lpcre
-       ;;
-     --libs)
--      echo -L@libdir@$libR -lpcre
-+      echo -lpcre
-       ;;
-     --libs-cpp)
-       if test @enable_cpp@ = yes ; then
--        echo -L@libdir@$libR -lpcrecpp -lpcre
-+        echo -lpcrecpp -lpcre
-       else
-         echo "${usage}" 1>&2
-       fi
diff --git a/sources b/sources
index 543daa0..a3215ee 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-fa69e4c5d8971544acd71d1f10d59193  pcre-8.12.tar.gz
+0a7b592bea64b7aa7f4011fc7171a730  pcre-8.21.tar.bz2