summaryrefslogtreecommitdiffstats
path: root/cygwin-pcre.spec
diff options
context:
space:
mode:
authorYaakov Selkowitz <yselkowitz@users.sourceforge.net>2012-01-10 19:52:29 -0600
committerYaakov Selkowitz <yselkowitz@users.sourceforge.net>2012-01-10 19:52:29 -0600
commit8b936b4223e669ea3ffebd56a59f516fbd1561d4 (patch)
tree5f7330c59c0096ab97e404a2c4267c0ca1d7e64f /cygwin-pcre.spec
parent4d0866fd3bf083073bdd69f499612f457deda236 (diff)
downloadcygwin-pcre-8b936b4223e669ea3ffebd56a59f516fbd1561d4.tar.gz
cygwin-pcre-8b936b4223e669ea3ffebd56a59f516fbd1561d4.tar.xz
cygwin-pcre-8b936b4223e669ea3ffebd56a59f516fbd1561d4.zip
cygwin-pcre 8.21-1
Diffstat (limited to 'cygwin-pcre.spec')
-rw-r--r--cygwin-pcre.spec26
1 files changed, 14 insertions, 12 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.