rpms/kdelibs/devel kdelibs-4.0.0-openssl.patch, NONE, 1.1 kdelibs.spec, 1.261, 1.262

[Rex Dieter (rdieter)]

Author: rdieter

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

Modified Files:
	kdelibs.spec 
Added Files:
	kdelibs-4.0.0-openssl.patch 
Log Message:
* Wed Jan 23 2008 Rex Dieter <rdieter at fedoraproject.org> 4.0.0-3
- openssl patch


kdelibs-4.0.0-openssl.patch:

--- NEW FILE kdelibs-4.0.0-openssl.patch ---
diff -up kdelibs-4.0.0/kio/kssl/kopenssl.cpp.openssl kdelibs-4.0.0/kio/kssl/kopenssl.cpp
--- kdelibs-4.0.0/kio/kssl/kopenssl.cpp.openssl	2008-01-04 18:00:20.000000000 -0600
+++ kdelibs-4.0.0/kio/kssl/kopenssl.cpp	2008-01-23 06:58:32.000000000 -0600
@@ -357,6 +357,10 @@ KOpenSSLProxy::KOpenSSLProxy()
              #ifdef SHLIB_VERSION_NUMBER
              << "libssl.so." SHLIB_VERSION_NUMBER
              #endif
+             << "libssl.so.0.9.8g"
+             << "libssl.so.7"
+             << "libssl.so.0.9.8b"
+             << "libssl.so.6"
              << "libssl.so"
 	     << "libssl.so.0"
              #endif
@@ -374,6 +378,10 @@ KOpenSSLProxy::KOpenSSLProxy()
              #ifdef SHLIB_VERSION_NUMBER
              << "libcrypto.so." SHLIB_VERSION_NUMBER
              #endif
+             << "libcrypto.so.0.9.8g"
+             << "libcrypto.so.7"
+             << "libcrypto.so.0.9.8b"
+             << "libcrypto.so.6"
              << "libcrypto.so"
 	     << "libcrypto.so.0"
              #endif


Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.261
retrieving revision 1.262
diff -u -r1.261 -r1.262
--- kdelibs.spec	19 Jan 2008 15:55:33 -0000	1.261
+++ kdelibs.spec	23 Jan 2008 13:02:18 -0000	1.262
@@ -4,7 +4,7 @@
 
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.0.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -61,6 +61,9 @@
 # http://fedoraproject.org/wiki/Releases/FeatureDictionary
 # http://bugs.kde.org/show_bug.cgi?id=154561
 Patch5: kdelibs-4.0.0-k3spell-hunspell.patch
+# openssl's SHLIB_VERSION_NUMBER macro can't be used/trusted
+Patch6: kdelibs-4.0.0-openssl.patch
+
 
 BuildRequires: qt4-devel >= 4.3.0
 Requires: qt4 >= %{_qt4_version} 
@@ -143,6 +146,8 @@
 %if 0%{?fedora} >= 9
 %patch5 -p1 -b .k3spell-hunspell
 %endif
+%patch6 -p1 -b .openssl
+
 
 
 %build
@@ -271,6 +276,9 @@
 
 
 %changelog
+* Wed Jan 23 2008 Rex Dieter <rdieter at fedoraproject.org> 4.0.0-3
+- openssl patch
+
 * Sat Jan 19 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.0.0-2
 - patch K3Spell for hunspell support on F9+ (FeatureDictionary, kde#154561)