[rpms/openssl] rebase_40beta: move the libraries needed for static linking to Libs.private

[rpms/openssl] rebase_40beta: move the libraries needed for static linking to Libs.private

[Tomas Mraz]

A new commit has been pushed.

Repo   : rpms/openssl
Branch : rebase_40beta
Commit : 497f2d674c5886aaf93950bd215f677d6585765d
Author : Tomas Mraz <tmraz@fedoraproject.org>
Date   : 2011-11-22T11:53:40+01:00
Stats  : +39/-1 in 2 file(s)
URL    : https://src.fedoraproject.org/rpms/openssl/c/497f2d674c5886aaf93950bd215f677d6585765d?branch=rebase_40beta

Log:
move the libraries needed for static linking to Libs.private

---
diff --git a/openssl-1.0.0e-pkgconfig-private.patch b/openssl-1.0.0e-pkgconfig-private.patch
new file mode 100644
index 0000000..a1f8878
--- /dev/null
+++ b/openssl-1.0.0e-pkgconfig-private.patch
@@ -0,0 +1,33 @@
+diff -up openssl-1.0.0e/Makefile.org.private openssl-1.0.0e/Makefile.org
+--- openssl-1.0.0e/Makefile.org.private	2011-11-03 10:01:53.000000000 +0100
++++ openssl-1.0.0e/Makefile.org	2011-11-22 11:50:27.000000000 +0100
+@@ -326,7 +326,8 @@ libcrypto.pc: Makefile
+ 	    echo 'Description: OpenSSL cryptography library'; \
+ 	    echo 'Version: '$(VERSION); \
+ 	    echo 'Requires: '; \
+-	    echo 'Libs: -L$${libdir} -lcrypto $(EX_LIBS)'; \
++	    echo 'Libs: -L$${libdir} -lcrypto'; \
++	    echo 'Libs.private: $(EX_LIBS)'; \
+ 	    echo 'Cflags: -I$${includedir} $(KRB5_INCLUDES)' ) > libcrypto.pc
+ 
+ libssl.pc: Makefile
+@@ -339,7 +340,8 @@ libssl.pc: Makefile
+ 	    echo 'Description: Secure Sockets Layer and cryptography libraries'; \
+ 	    echo 'Version: '$(VERSION); \
+ 	    echo 'Requires: '; \
+-	    echo 'Libs: -L$${libdir} -lssl -lcrypto $(EX_LIBS)'; \
++	    echo 'Libs: -L$${libdir} -lssl -lcrypto'; \
++	    echo 'Libs.private: $(EX_LIBS)'; \
+ 	    echo 'Cflags: -I$${includedir} $(KRB5_INCLUDES)' ) > libssl.pc
+ 
+ openssl.pc: Makefile
+@@ -352,7 +354,8 @@ openssl.pc: Makefile
+ 	    echo 'Description: Secure Sockets Layer and cryptography libraries and tools'; \
+ 	    echo 'Version: '$(VERSION); \
+ 	    echo 'Requires: '; \
+-	    echo 'Libs: -L$${libdir} -lssl -lcrypto $(EX_LIBS)'; \
++	    echo 'Libs: -L$${libdir} -lssl -lcrypto'; \
++	    echo 'Libs.private: $(EX_LIBS)'; \
+ 	    echo 'Cflags: -I$${includedir} $(KRB5_INCLUDES)' ) > openssl.pc
+ 
+ Makefile: Makefile.org Configure config

diff --git a/openssl.spec b/openssl.spec
index bd07689..1714260 100644
--- a/openssl.spec
+++ b/openssl.spec
@@ -21,7 +21,7 @@
 Summary: A general purpose cryptography library with TLS implementation
 Name: openssl
 Version: 1.0.0e
-Release: 3%{?dist}
+Release: 4%{?dist}
 # We remove certain patented algorithms from the openssl source tarball
 # with the hobble-openssl script which is included below.
 Source: openssl-%{version}-usa.tar.bz2
@@ -77,6 +77,7 @@ Patch63: openssl-1.0.0d-xmpp-starttls.patch
 Patch64: openssl-1.0.0d-intelopts.patch
 Patch65: openssl-1.0.0e-chil-fixes.patch
 Patch66: openssl-1.0.0-sha2test.patch
+Patch67: openssl-1.0.0-pkgconfig-private.patch
 # Backported fixes including security fixes
 Patch81: openssl-1.0.0d-padlock64.patch
 
@@ -175,6 +176,7 @@ from other formats to the formats used by the OpenSSL toolkit.
 %patch64 -p1 -b .intelopts
 %patch65 -p1 -b .chil
 %patch66 -p1 -b .sha2test
+%patch67 -p1 -b .private
 
 %patch81 -p1 -b .padlock64
 
@@ -426,6 +428,9 @@ rm -rf $RPM_BUILD_ROOT/%{_libdir}/fipscanister.*
 %postun -p /sbin/ldconfig
 
 %changelog
+* Tue Nov 22 2011 Tomas Mraz <tmraz@redhat.com> 1.0.0e-4
+- move the libraries needed for static linking to Libs.private
+
 * Thu Nov  3 2011 Tomas Mraz <tmraz@redhat.com> 1.0.0e-3
 - do not use AVX instructions when osxsave bit not set
 - add direct known answer tests for SHA2 algorithms