Add cygwin64 support

1 files changed, 81 insertions, 58 deletions

diff --git a/cygwin-pcre.spec b/cygwin-pcre.spec
index cb35105..aaaaffa 100644
--- a/cygwin-pcre.spec
+++ b/cygwin-pcre.spec
@@ -1,56 +1,55 @@
-%global __strip %{_cygwin_strip}
-%global __objdump %{_cygwin_objdump}
-%global _use_internal_dependency_generator 0
-%global __find_requires %{_cygwin_findrequires}
-%global __find_provides %{_cygwin_findprovides}
-%define __debug_install_post %{_cygwin_debug_install_post}
+%{?cygwin_package_header}
 
 Name:		cygwin-pcre
 Version:	8.32
-Release:	1
+Release:	2
 Summary:	Cygwin pcre library
 
 Group:		Development/Libraries
 License:	BSD
 URL:		http://www.pcre.org/
-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, libtool
 
-BuildRequires:  autoconf, automake, cygwin-libtool
-BuildRequires:	cygwin-filesystem
-BuildRequires:	cygwin-gcc
-BuildRequires:	cygwin-gcc-c++
-BuildRequires:	cygwin-binutils
+BuildRequires:	cygwin32-filesystem
+BuildRequires:	cygwin32-gcc
+BuildRequires:	cygwin32-gcc-c++
+BuildRequires:	cygwin32-binutils
 
-%{?_cygwin_debug_package}
+BuildRequires:	cygwin64-filesystem
+BuildRequires:	cygwin64-gcc
+BuildRequires:	cygwin64-gcc-c++
+BuildRequires:	cygwin64-binutils
 
 %description
-Cross compiled Perl-compatible regular expression library for use with cygwin.
+Cross compiled PCRE library for use with Cygwin toolchains.
 
-PCRE has its own native API, but a set of "wrapper" functions that are based on
-the POSIX API are also supplied in the library libpcreposix. Note that this
-just provides a POSIX calling interface to PCRE: the regular expressions
-themselves still follow Perl syntax and semantics. The header file
-for the POSIX-style functions is called pcreposix.h.
+%package -n cygwin32-pcre
+Summary:        PCRE library for Cygwin32 toolchain
+Group:          Development/Libraries
+Provides:       %{name} = %{version}-%{release}
+Obsoletes:      %{name} < %{version}-%{release}
 
+%description -n cygwin32-pcre
+Cross compiled PCRE library for use with Cygwin i686 toolchain.
 
-%package static
-Summary:        Static version of the Cygwin PCRE library
-Requires:       %{name} = %{version}-%{release}
+%package -n cygwin64-pcre
+Summary:        PCRE library for Cygwin64 toolchain
 Group:          Development/Libraries
 
-%description static
-Static version of the Cygwin PCRE library.
+%description -n cygwin64-pcre
+Cross compiled PCRE library for use with Cygwin x86_64 toolchain.
+
+%{?cygwin_debug_package}
 
 
 %prep
 %setup -q -n pcre-%{version}
 mkdir -p m4
-%{_cygwin_autoreconf}
+autoreconf -fiv
 
 # One contributor's name is non-UTF-8
 for F in ChangeLog; do
@@ -60,52 +59,76 @@ for F in ChangeLog; do
 done
 
 %build
-%{_cygwin_configure} --enable-pcre16 --enable-pcre32 \
+%cygwin_configure \
+	--enable-shared --disable-static \
+	--enable-pcre16 --enable-pcre32 \
 	--enable-utf8 --enable-unicode-properties \
 	--enable-newline-is-anycrlf
-make %{?_smp_mflags}
+%cygwin_make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make DESTDIR=$RPM_BUILD_ROOT install
+%cygwin_make install DESTDIR=$RPM_BUILD_ROOT
 
 # Remove unnecessary Cygwin native binaries
-rm -f $RPM_BUILD_ROOT%{_cygwin_bindir}/*.exe
+rm -f $RPM_BUILD_ROOT%{cygwin32_bindir}/*.exe
+rm -f $RPM_BUILD_ROOT%{cygwin64_bindir}/*.exe
 
 # We intentionally don't ship *.la files
-rm -f $RPM_BUILD_ROOT%{_cygwin_libdir}/*.la
+find $RPM_BUILD_ROOT -name '*.la' -delete
 
 # same documentation as from native pcre
-rm -rf $RPM_BUILD_ROOT%{_cygwin_docdir}
-rm -rf $RPM_BUILD_ROOT%{_cygwin_mandir}
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%files
-%defattr(-,root,root,-)
-%{_cygwin_bindir}/pcre-config
-%{_cygwin_bindir}/cygpcre-1.dll
-%{_cygwin_bindir}/cygpcre16-0.dll
-%{_cygwin_bindir}/cygpcre32-0.dll
-%{_cygwin_bindir}/cygpcrecpp-0.dll
-%{_cygwin_bindir}/cygpcreposix-0.dll
-%{_cygwin_libdir}/libpcre*.dll.a
-%{_cygwin_libdir}/pkgconfig/libpcre*.pc
-%{_cygwin_includedir}/*.h
-%doc AUTHORS COPYING LICENCE NEWS README ChangeLog
+rm -rf $RPM_BUILD_ROOT%{cygwin32_docdir}
+rm -rf $RPM_BUILD_ROOT%{cygwin32_mandir}
+rm -rf $RPM_BUILD_ROOT%{cygwin64_docdir}
+rm -rf $RPM_BUILD_ROOT%{cygwin64_mandir}
 
 
-%files static
-%defattr(-,root,root,-)
-%{_cygwin_libdir}/libpcre.a
-%{_cygwin_libdir}/libpcre16.a
-%{_cygwin_libdir}/libpcre32.a
-%{_cygwin_libdir}/libpcrecpp.a
-%{_cygwin_libdir}/libpcreposix.a
+%files -n cygwin32-pcre
+%doc AUTHORS COPYING LICENCE NEWS README ChangeLog
+%{cygwin32_bindir}/pcre-config
+%{cygwin32_bindir}/cygpcre-1.dll
+%{cygwin32_bindir}/cygpcre16-0.dll
+%{cygwin32_bindir}/cygpcre32-0.dll
+%{cygwin32_bindir}/cygpcrecpp-0.dll
+%{cygwin32_bindir}/cygpcreposix-0.dll
+%{cygwin32_includedir}/pcre*.h
+%{cygwin32_libdir}/libpcre.dll.a
+%{cygwin32_libdir}/libpcre16.dll.a
+%{cygwin32_libdir}/libpcre32.dll.a
+%{cygwin32_libdir}/libpcrecpp.dll.a
+%{cygwin32_libdir}/libpcreposix.dll.a
+%{cygwin32_libdir}/pkgconfig/libpcre.pc
+%{cygwin32_libdir}/pkgconfig/libpcre16.pc
+%{cygwin32_libdir}/pkgconfig/libpcre32.pc
+%{cygwin32_libdir}/pkgconfig/libpcrecpp.pc
+%{cygwin32_libdir}/pkgconfig/libpcreposix.pc
+
+%files -n cygwin64-pcre
+%doc AUTHORS COPYING LICENCE NEWS README ChangeLog
+%{cygwin64_bindir}/pcre-config
+%{cygwin64_bindir}/cygpcre-1.dll
+%{cygwin64_bindir}/cygpcre16-0.dll
+%{cygwin64_bindir}/cygpcre32-0.dll
+%{cygwin64_bindir}/cygpcrecpp-0.dll
+%{cygwin64_bindir}/cygpcreposix-0.dll
+%{cygwin64_includedir}/pcre*.h
+%{cygwin64_libdir}/libpcre.dll.a
+%{cygwin64_libdir}/libpcre16.dll.a
+%{cygwin64_libdir}/libpcre32.dll.a
+%{cygwin64_libdir}/libpcrecpp.dll.a
+%{cygwin64_libdir}/libpcreposix.dll.a
+%{cygwin64_libdir}/pkgconfig/libpcre.pc
+%{cygwin64_libdir}/pkgconfig/libpcre16.pc
+%{cygwin64_libdir}/pkgconfig/libpcre32.pc
+%{cygwin64_libdir}/pkgconfig/libpcrecpp.pc
+%{cygwin64_libdir}/pkgconfig/libpcreposix.pc
 
 
 %changelog
+* Fri Jun 28 2013 Yaakov Selkowitz <cygwin-ports-general@lists.sourceforge.net> - 8.32-2
+- Rebuild for new Cygwin packaging scheme.
+- Add cygwin64 support.
+
 * Sun Jan 20 2013 Yaakov Selkowitz <cygwin-ports-general@lists.sourceforge.net> - 8.32-1
 - Version bump.
 - Add libpcre32.