ppisar pushed to pcre (f22). "Fix static linking"

[notifications at fedoraproject.org]

>From f2c5bd12ece9ba9ffd0068a814da589e6fba6471 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar at redhat.com>
Date: Thu, 23 Apr 2015 11:25:46 +0200
Subject: Fix static linking


diff --git a/pcre-8.37-RC1-Fix-static-linking-issue-with-pkg-config.patch b/pcre-8.37-RC1-Fix-static-linking-issue-with-pkg-config.patch
new file mode 100644
index 0000000..adf46ec
--- /dev/null
+++ b/pcre-8.37-RC1-Fix-static-linking-issue-with-pkg-config.patch
@@ -0,0 +1,44 @@
+From 2765d0933715e6b2c78a4e74fa8d5cad27273f29 Mon Sep 17 00:00:00 2001
+From: ph10 <ph10 at 2f5784b3-3f2a-0410-8824-cb99058d5e15>
+Date: Thu, 23 Apr 2015 17:34:33 +0000
+Subject: [PATCH] Fix static linking issue with pkg-config.
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+git-svn-id: svn://vcs.exim.org/pcre/code/trunk@1552 2f5784b3-3f2a-0410-8824-cb99058d5e15
+Signed-off-by: Petr Písař <ppisar at redhat.com>
+
+diff --git a/libpcre.pc.in b/libpcre.pc.in
+index 1f26b32..0a35da8 100644
+--- a/libpcre.pc.in
++++ b/libpcre.pc.in
+@@ -9,4 +9,5 @@ Name: libpcre
+ Description: PCRE - Perl compatible regular expressions C library with 8 bit character support
+ Version: @PACKAGE_VERSION@
+ Libs: -L${libdir} -lpcre
++Libs.private: @PTHREAD_CFLAGS@ @PTHREAD_LIBS@
+ Cflags: -I${includedir} @PCRE_STATIC_CFLAG@
+diff --git a/libpcre16.pc.in b/libpcre16.pc.in
+index f589b75..080c9dc 100644
+--- a/libpcre16.pc.in
++++ b/libpcre16.pc.in
+@@ -9,4 +9,5 @@ Name: libpcre16
+ Description: PCRE - Perl compatible regular expressions C library with 16 bit character support
+ Version: @PACKAGE_VERSION@
+ Libs: -L${libdir} -lpcre16
++Libs.private: @PTHREAD_CFLAGS@ @PTHREAD_LIBS@
+ Cflags: -I${includedir} @PCRE_STATIC_CFLAG@
+diff --git a/libpcre32.pc.in b/libpcre32.pc.in
+index 6582105..a3ae0e1 100644
+--- a/libpcre32.pc.in
++++ b/libpcre32.pc.in
+@@ -9,4 +9,5 @@ Name: libpcre32
+ Description: PCRE - Perl compatible regular expressions C library with 32 bit character support
+ Version: @PACKAGE_VERSION@
+ Libs: -L${libdir} -lpcre32
++Libs.private: @PTHREAD_CFLAGS@ @PTHREAD_LIBS@
+ Cflags: -I${includedir} @PCRE_STATIC_CFLAG@
+-- 
+2.1.0
+
diff --git a/pcre.spec b/pcre.spec
index eefc168..5cf1a35 100644
--- a/pcre.spec
+++ b/pcre.spec
@@ -2,7 +2,7 @@
 #%%global rcversion RC1
 Name: pcre
 Version: 8.36
-Release: %{?rcversion:0.}5%{?rcversion:.%rcversion}%{?dist}
+Release: %{?rcversion:0.}6%{?rcversion:.%rcversion}%{?dist}
 %global myversion %{version}%{?rcversion:-%rcversion}
 Summary: Perl-compatible regular expression library
 Group: System Environment/Libraries
@@ -43,6 +43,8 @@ Patch10: pcre-8.36-Fix-pcretest-loop-for-K-in-lookbehind-assertion.patch
 # Fix backtracking for \C\X* in UTF-8 mode, bug #1210576,
 # in upstream after 8.36
 Patch11: pcre-8.36-Fix-backtracking-bug-for-C-X-in-UTF-mode.patch
+# Fix static linking, bug #1214494, in upstream after 8.37-RC1
+Patch12: pcre-8.37-RC1-Fix-static-linking-issue-with-pkg-config.patch
 BuildRequires: readline-devel
 # New libtool to get rid of rpath
 BuildRequires: autoconf, automake, libtool
@@ -94,6 +96,7 @@ Utilities demonstrating PCRE capabilities like pcregrep or pcretest.
 %patch9 -p1 -b .pcregrep_k_loop
 %patch10 -p1 -b .pcretest_k_loop
 %patch11 -p1 -b .backtracking_cx8
+%patch12 -p1 -b .static_linking
 # Because of rpath patch
 libtoolize --copy --force && autoreconf -vif
 # One contributor's name is non-UTF-8
@@ -164,6 +167,9 @@ make %{?_smp_mflags} check VERBOSE=yes
 %{_mandir}/man1/pcretest.*
 
 %changelog
+* Thu Apr 23 2015 Petr Pisar <ppisar at redhat.com> - 8.36-6
+- Fix static linking (bug #1214494)
+
 * Thu Apr 09 2015 Petr Pisar <ppisar at redhat.com> - 8.36-5
 - Fix computing size for pattern with a negated special calss in on-UCP mode
   (bug #1210383)
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/pcre.git/commit/?h=f22&id=f2c5bd12ece9ba9ffd0068a814da589e6fba6471