rpms/kdelibs3/devel kdelibs3.spec,1.8,1.9

[Rex Dieter (rdieter)]

Author: rdieter

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

Modified Files:
	kdelibs3.spec 
Log Message:
* Thu Dec 13 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 3.5.8-19
- flash fix (#410651, kde#132138, kde#146784)
- simplify crystalsvg-icon-theme handling



Index: kdelibs3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs3/devel/kdelibs3.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- kdelibs3.spec	11 Dec 2007 09:04:20 -0000	1.8
+++ kdelibs3.spec	13 Dec 2007 17:06:56 -0000	1.9
@@ -21,13 +21,12 @@
 
 Summary: K Desktop Environment 3 - Libraries
 Version: 3.5.8
-Release: 18%{?dist}
+Release: 19%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs3
 Obsoletes: kdelibs < 6:%{version}-%{release}
 Provides: kdelibs = 6:%{version}-%{release}
-%define include_crystalsvg 0
 %else
 Name: kdelibs
 Epoch: 6
@@ -36,12 +35,6 @@
 %define include_crystalsvg 1
 %endif
 
-%if 0%{?include_crystalsvg} == 0
-# KDE3 apps still need the crystalsvg-icon-theme
-# This is provided by kdeartwork-icons >= 3.96.0-2
-Requires: crystalsvg-icon-theme
-%endif
-
 License: LGPLv2
 Url: http://www.kde.org/
 Group: System Environment/Libraries
@@ -69,6 +62,7 @@
 Patch43: kdelibs-3.5.6-lang.patch
 Patch45: kdelibs-3.5.7-autostart.patch
 Patch46: kdelibs-3.5.8-kate-vhdl.patch
+Patch47: kdelibs-3.5.8-new-flash.patch
 
 # use /etc/kde in addition to /usr/share/config, borrowed from debian
 Patch100: kdelibs-3.5.5-kstandarddirs.patch
@@ -157,11 +151,14 @@
 Obsoletes: kdelibs-apidocs < 6:%{version}-%{release}
 %endif
 
-# For KDE4 crystalsvg-icon-theme is provided by kdeartwork-icons
 %if 0%{?include_crystalsvg}
 Provides: crystalsvg-icon-theme = %{version}-%{release}
+%else
+# this Requires could be made unconditional -- Rex
+Requires: crystalsvg-icon-theme
 %endif
 
+
 %description
 Libraries for the K Desktop Environment 3:
 KDE Libraries included: kdecore (KDE core library), kdeui (user interface),
@@ -184,19 +181,6 @@
 Requires: openssl-devel
 %{?arts:Requires: arts-devel}
 %{?libkdnssd:Requires: libkdnssd-devel}
-## those below can/should be omitted from future(f8?) builds -- Rex
-%if 0
-Requires: bzip2-devel
-Requires: libacl-devel
-Requires: libart_lgpl-devel
-Requires: libidn-devel
-Requires: libxslt-devel
-Requires: libjpeg-devel
-Requires: libtiff-devel
-%{?_with_libutempter:Requires: libutempter-devel}
-Requires: pcre-devel
-Requires: zlib-devel
-%endif
 %description devel
 This package includes the header files you will need to compile
 applications for KDE 3.
@@ -237,6 +221,7 @@
 %patch43 -p1 -b .lang
 %patch45 -p1 -b .xdg-autostart
 %patch46 -p1 -b .kate-vhdl
+%patch47 -p0 -b .new-flash
 
 %patch100 -p1 -b .kstandarddirs
 %patch101 -p1 -b .libtool-shlibext
@@ -530,6 +515,10 @@
 
 
 %changelog
+* Thu Dec 13 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 3.5.8-19
+- flash fix (#410651, kde#132138, kde#146784)
+- simplify crystalsvg-icon-theme handling
+
 * Tue Dec 11 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> - 3.5.8-18
 - set include_crystalsvg to 0 on F9+ (it comes from kdeartwork now)