rpms/qt/devel qt-x11-opensource-src-4.3.4-openssl.patch, NONE, 1.1 qt.spec, 1.166, 1.167

[Kevin Kofler (kkofler)]

Author: kkofler

Update of /cvs/pkgs/rpms/qt/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4748/devel

Modified Files:
	qt.spec 
Added Files:
	qt-x11-opensource-src-4.3.4-openssl.patch 
Log Message:
* Wed Apr 02 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.3.4-10
- look for OpenSSL using versioned sonames (#432271)

qt-x11-opensource-src-4.3.4-openssl.patch:

--- NEW FILE qt-x11-opensource-src-4.3.4-openssl.patch ---
diff -ur qt-x11-opensource-src-4.3.4/src/network/qsslsocket_openssl_symbols.cpp qt-x11-opensource-src-4.3.4-openssl/src/network/qsslsocket_openssl_symbols.cpp
--- qt-x11-opensource-src-4.3.4/src/network/qsslsocket_openssl_symbols.cpp	2008-02-19 18:47:39.000000000 +0100
+++ qt-x11-opensource-src-4.3.4-openssl/src/network/qsslsocket_openssl_symbols.cpp	2008-04-02 04:55:24.000000000 +0200
@@ -254,7 +254,7 @@
         return false;
     }
 #else
-    QLibrary libssl(QLatin1String("ssl"));
+    QLibrary libssl(QLatin1String("libssl.so." SHLIB_VERSION_NUMBER));
     if (!libssl.load()) {
         // Cannot find libssl
         qWarning("QSslSocket: cannot find ssl library: %s.",
@@ -262,7 +262,7 @@
         return false;
     }
 
-    QLibrary libcrypto(QLatin1String("crypto"));
+    QLibrary libcrypto(QLatin1String("libcrypto.so." SHLIB_VERSION_NUMBER));
     if (!libcrypto.load()) {
         // Cannot find libcrypto
         qWarning("QSslSocket: cannot find crypto library: %s.",


Index: qt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt/devel/qt.spec,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -r1.166 -r1.167
--- qt.spec	26 Mar 2008 11:29:03 -0000	1.166
+++ qt.spec	2 Apr 2008 03:02:20 -0000	1.167
@@ -8,7 +8,7 @@
 Name:    qt4
 %endif
 Version: 4.3.4
-Release: 9%{?dist}
+Release: 10%{?dist}
 
 # GPLv2 exceptions(see GPL_EXCEPTIONS*.txt)
 License: GPLv3 or GPLv2 with exceptions or QPL
@@ -37,6 +37,8 @@
 Patch3: qt-43-aliasing.diff
 Patch4: qt-x11-opensource-src-4.3.4-aliasing.patch
 Patch5: qt-x11-opensource-src-4.3.4-as_IN-437440.patch
+# look for OpenSSL using versioned sonames
+Patch6: qt-x11-opensource-src-4.3.4-openssl.patch
 
 ## qt-copy patches
 %define qt_copy 20080305
@@ -283,6 +285,12 @@
 %patch2 -p1
 %patch4 -p1
 %patch5 -p1 -b .bz#437440-as_IN-437440
+%patch6 -p1 -b .openssl
+# SHLIB_VERSION_NUMBER is wrong on F8 and older
+# 0.9.8b is the version in both F7 and F8
+%if 0%{?fedora} < 9
+sed -i -e 's/SHLIB_VERSION_NUMBER/"0.9.8b"/g' src/network/qsslsocket_openssl_symbols.cpp
+%endif
 
 # drop -fexceptions from $RPM_OPT_FLAGS
 RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed 's|-fexceptions||g'`
@@ -698,6 +706,9 @@
 
 
 %changelog
+* Wed Apr 02 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.3.4-10
+- look for OpenSSL using versioned sonames (#432271)
+
 * Wed Mar 26 2008 Than Ngo <than at redhat.com> 4.3.4-9
 - apply patch bz#437440 to fix [as-IN] Consonant combination issue, thanks to Pravin Satpute