rpms/kdelibs/F-7 kdelibs-3.5.7-openssl.patch, NONE, 1.1 kdelibs.spec, 1.216, 1.217 kdelibs-3.5.0-openssl0.9.8a.patch, 1.1, NONE

Rex Dieter (rdieter) fedora-extras-commits at redhat.com
Wed Jul 11 18:31:08 UTC 2007


Author: rdieter

Update of /cvs/pkgs/rpms/kdelibs/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16937

Modified Files:
	kdelibs.spec 
Added Files:
	kdelibs-3.5.7-openssl.patch 
Removed Files:
	kdelibs-3.5.0-openssl0.9.8a.patch 
Log Message:
* Mon Jul 09 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.7-9
- omit ICEauthority patch (kde#147454, rh#243560, rh#247455)

* Wed Jun 20 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.7-7
- -devel: Provides: kdelibs3-devel = ...
- openssl patch update (portability)
- drop deprecated ssl-krb5 patch

* Sat Jun 16 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.7-6
- Provides: kdelibs3 = %%version-%%release

* Sat Jun 16 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.7-5
- -devel: +Requires: libutempter-devel


kdelibs-3.5.7-openssl.patch:

--- NEW FILE kdelibs-3.5.7-openssl.patch ---
--- kdelibs-3.5.7/kio/kssl/kopenssl.cc.openssl	2006-07-22 03:16:39.000000000 -0500
+++ kdelibs-3.5.7/kio/kssl/kopenssl.cc	2007-06-20 08:58:25.000000000 -0500
@@ -329,6 +329,15 @@ KConfig *cfg;
              #ifdef SHLIB_VERSION_NUMBER
              << "libssl.so." SHLIB_VERSION_NUMBER
              #endif
+             << "libssl.so.0.9.8b"
+             << "libssl.so.0.9.8a"
+             << "libssl.so.6"
+             << "libssl.so.0.9.7e"
+             << "libssl.so.5"
+             << "libssl.so.0.9.7a"
+             << "libssl.so.4"
+             << "libssl.so.0.9.6b"
+             << "libssl.so.2"
              << "libssl.so"
 	     << "libssl.so.0"
              #endif
@@ -346,6 +355,15 @@ KConfig *cfg;
              #ifdef SHLIB_VERSION_NUMBER
              << "libcrypto.so." SHLIB_VERSION_NUMBER
              #endif
+             << "libcrypto.so.0.9.8b"
+             << "libcrypto.so.0.9.8a"
+             << "libcrypto.so.6"
+             << "libcrypto.so.0.9.7e"
+             << "libcrypto.so.5"
+             << "libcrypto.so.0.9.7a"
+             << "libcrypto.so.4"
+             << "libcrypto.so.0.9.6b"
+             << "libcrypto.so.2"
              << "libcrypto.so"
 	     << "libcrypto.so.0"
              #endif


Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/F-7/kdelibs.spec,v
retrieving revision 1.216
retrieving revision 1.217
diff -u -r1.216 -r1.217
--- kdelibs.spec	11 Jun 2007 16:32:44 -0000	1.216
+++ kdelibs.spec	11 Jul 2007 18:30:32 -0000	1.217
@@ -24,7 +24,7 @@
 Summary: K Desktop Environment - Libraries
 Epoch:   6
 Version: 3.5.7
-Release: 2%{?dist}
+Release: 9%{?dist}
 
 License: LGPL
 Url: http://www.kde.org/
@@ -38,9 +38,8 @@
 Patch1: kdelibs-3.5.1-xdg-menu.patch
 Patch2: kdelibs-3.0.0-ndebug.patch
 Patch4: kdelibs-3.0.4-ksyscoca.patch
-Patch5: kdelibs-3.5.0-openssl0.9.8a.patch
+Patch5: kdelibs-3.5.7-openssl.patch
 Patch15: kdelibs-3.4.91-buildroot.patch
-Patch16: kdelibs-3.1-ssl-krb5.patch
 Patch32: kdelibs-3.2.3-cups.patch
 Patch33: kdelibs-3.3.2-ppc.patch
 Patch34: kdelibs-3.4.0-qtdoc.patch
@@ -64,24 +63,35 @@
 Patch505: kdelibs-3.5.7-kde#146105.patch
 # http://bugs.kde.org/93359, alternative to export libltdl_cv_shlibext=".so" hack.
 Patch93359: kde-3.5-libtool-shlibext.patch
-## See http://bugs.kde.org/139445, patch needs boost-devel
+## See http://bugs.kde.org/139445, patch needs boost-devel, FIXME, doesn't apply to kde-3.5.7
 Patch139445: kdelibs-3.5.5-lib_loader-1.2.patch
 #BuildRequires: boost-devel
 
+# To help transition to kde4
+Provides: kdelibs3 = %{version}-%{release}
+
 Requires: arts >= %{arts_epoch}:%{arts_version}
 Requires: qt >= %{qt_epoch}:%{qt_ver}
 Requires: cups-libs >= %{cups_epoch}:1.1.12
 Requires: hicolor-icon-theme
-Requires: iceauth
 %if %{kde_settings}
 Requires: kde-settings >= 3.5
 %endif
-Requires: libkdnssd
-Requires: redhat-menus >= 5.0.4
+Requires: redhat-menus
 Requires: shadow-utils
 # kdesu/sudo support, http://bugs.kde.org/20914
 BuildRequires: sudo
 Requires(hint): sudo
+# dnssd, FIXME/TODO
+#BuildRequires: mDNSResponder-devel
+
+%if 0%{?fedora} > 4 || 0%{?rhel} > 4
+%define libkdnssd libkdnssd
+Requires: libkdnssd
+%define BuildRequires: xorg-x11-proto-devel libX11-devel
+%define _with_rgbfile --with-rgbfile=%{_datadir}/X11/rgb.txt
+Requires: iceauth
+%endif
 
 Requires(pre): coreutils
 Requires(post): /sbin/ldconfig
@@ -90,11 +100,11 @@
 BuildRequires: gettext
 BuildRequires: pcre-devel
 BuildRequires: cups-devel >= %{cups_epoch}:1.1.20, cups
-BuildRequires: qt-devel >= %{qt_epoch}:%{qt_version}, qt-devel-docs
+BuildRequires: qt-devel qt-devel-docs
 BuildRequires: arts-devel >= %{arts_epoch}:%{arts_version}
 BuildRequires: flex >= 2.5.4a-13
 BuildRequires: doxygen
-BuildRequires: libxslt-devel >= 1.1.15
+BuildRequires: libxslt-devel
 BuildRequires: sgml-common
 BuildRequires: openjade
 BuildRequires: jadetex
@@ -120,7 +130,13 @@
 BuildRequires: alsa-lib-devel
 BuildRequires: pkgconfig
 BuildRequires: glibc-kernheaders
+%if 0%{?fedora} > 5 || 0%{?rhel} > 4
+# See also http://bugzilla.redhat.com/205767
+%define _with_libutempter 1
 BuildRequires: libutempter-devel
+%else
+BuildRequires: utempter
+%endif
 BuildRequires: findutils
 BuildRequires: jasper-devel
 BuildRequires: OpenEXR-devel
@@ -138,10 +154,11 @@
 %package devel
 Group: Development/Libraries
 Summary: Header files and documentation for compiling KDE applications.
+Provides: kdelibs3-devel = %{version}-%{release}
 Requires: %{name} = %{epoch}:%{version}-%{release}
 Requires: qt-devel
 Requires: arts-devel
-Requires: libkdnssd-devel
+%{?libkdnssd:Requires: libkdnssd-devel}
 ## those below can/should be omitted from future builds -- Rex
 Requires: libart_lgpl-devel
 Requires: libxslt-devel
@@ -153,7 +170,7 @@
 Requires: libidn-devel
 Requires: libacl-devel
 Requires: pcre-devel
-Requires: libutempter-devel
+%{?_with_libutempter:Requires: libutempter-devel}
 %description devel
 This package includes the header files you will need to compile
 applications for KDE.
@@ -177,7 +194,6 @@
 %patch4 -p1 -b .ksyscoca
 %patch5 -p1 -b .openssl
 %patch15 -p1 -b .buildroot
-%patch16 -p1 -b .ssl-krb5
 %patch32 -p1 -b .cups
 %patch33 -p1 -b .ppc
 %patch34 -p1 -b .qtdoc
@@ -186,8 +202,9 @@
 %patch38 -p1 -b .cupsdconf2-group
 %patch39 -p1 -b .kabc-make
 %patch40 -p1 -b .kdeprint-utf8
-%patch41 -p1 -b .utempter
-%patch42 -p1 -b .ICEauthority
+%{?_with_libutempter:%patch41 -p1 -b .utempter}
+# omission recommended by upstream: http://bugs.kde.org/147454#c37
+#patch42 -p1 -b .ICEauthority
 %patch43 -p1 -b .lang
 
 %patch104 -p1 -b .kstandarddirs
@@ -195,7 +212,7 @@
 # upstream patches
 %patch503 -p0 -b .kde#137675
 %patch505 -p0 -b .kde#146105
-#patch93359 -p1 -b .libtool-shlibext
+%patch93359 -p1 -b .libtool-shlibext
 #patch139445 -p1 -b .kde#139445
 
 sed -i -e "s,^#define KDE_VERSION_STRING .*,#define KDE_VERSION_STRING \"%{version}-%{release} %{distname}\"," kdecore/kdeversion.h
@@ -209,7 +226,8 @@
 unset QTDIR && . /etc/profile.d/qt.sh
 
 export QTDOC=%{qtdocdir}
-export libltdl_cv_shlibext=".so"
+# use patch93359 instead
+#export libltdl_cv_shlibext=".so"
 
 if [ -x /etc/profile.d/krb5.sh ]; then
   . /etc/profile.d/krb5.sh
@@ -240,12 +258,14 @@
    --enable-inotify \
    --with-utempter \
    %{!?arts:--without-arts} \
-   --with-rgbfile=%{_datadir}/X11/rgb.txt \
+   %{?_with_rgbfile} \
    --with-jasper \
    --with-openexr \
    --with-xinerama
 
 make %{?_smp_mflags}
+
+# FIXME/TODO: build as noarch?  -- Rex
 %if %{apidocs}
 make %{?_smp_mflags} apidox
 %endif
@@ -316,12 +336,13 @@
  -e "s at -lattr@@g" \
  -e "s@%{_libdir}/libattr.la@@g" \
  -e "s@/%{_lib}/libattr.la@@g" \
- -e "s at -lasound@@g" 
+ -e "s at -lasound@@g"  \
+ -e "s at -lutempter@@g"
 
 ## unpackaged files
 # libkdnssd bits
-rm -f %{buildroot}%{_libdir}/libkdnssd.*
-rm -rf %{buildroot}%{_includedir}/kde/dnssd
+rm -f %{buildroot}%{_libdir}/libkdnssd.la
+%{?libkdnssd:rm -rf %{buildroot}{%{_libdir}/libkdnssd.*,%{_includedir}/kde/dnssd}}
 
 
 %clean
@@ -456,8 +477,30 @@
 
 
 %changelog
+* Mon Jul 09 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.7-9
+- omit ICEauthority patch (kde#147454, rh#243560, rh#247455)
+
+* Wed Jun 20 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.7-8
+- rework previously botched openssl patch
+
+* Wed Jun 20 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.7-7
+- -devel: Provides: kdelibs3-devel = ...
+- openssl patch update (portability)
+- drop deprecated ssl-krb5 patch
+
+* Sat Jun 16 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.7-6
+- Provides: kdelibs3 = %%version-%%release
+
+* Sat Jun 16 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.7-5
+- -devel: +Requires: libutempter-devel
+
+* Fri Jun 15 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.7-4
+- omit lib_loader patch (doesn't apply cleanly)
+
+* Fri Jun 15 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.7-3
+- include experimental libtool patches
+
 * Mon Jun 11 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.7-2
-- include (but don't apply/use) experimental libtool patches
 - kdesu: sudo support (kde bug #20914), Requires(hint): sudo
 
 * Wed Jun 06 2007 Than Ngo <than at redhat.com> -  6:3.5.7-0.1.fc7


--- kdelibs-3.5.0-openssl0.9.8a.patch DELETED ---




More information about the scm-commits mailing list