rpms/kdelibs/devel kdelibs.spec, 1.223.2.14, 1.223.2.15 kdelibs-3.92.0-conflict-kde3.patch, 1.1.2.1, NONE kdelibs-3.92.0-kde4home.diff, 1.1.2.1, NONE

[Kevin Kofler (kkofler)]

Author: kkofler

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

Modified Files:
      Tag: kdelibs-kde4-branch
	kdelibs.spec 
Removed Files:
      Tag: kdelibs-kde4-branch
	kdelibs-3.92.0-conflict-kde3.patch 
	kdelibs-3.92.0-kde4home.diff 
Log Message:
- update to 3.93.0
- drop kde4home patch (no longer applied)
- drop kdeprint soversion conflict patch (fixed upstream)
- remove icon-related code, pics/ is now in kdebase-runtime
- BR strigi-devel >= 0.5.5 due to API changes
- package hicolor presence_* icons which are not in hicolor-icon-theme
- don't list non-existing ksvgtopng in devel binaries (now in kdebase-runtime)


Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.223.2.14
retrieving revision 1.223.2.15
diff -u -r1.223.2.14 -r1.223.2.15
--- kdelibs.spec	16 Aug 2007 16:05:09 -0000	1.223.2.14
+++ kdelibs.spec	9 Sep 2007 06:34:13 -0000	1.223.2.15
@@ -1,10 +1,10 @@
 
 # TODO:
-# 1. package some noarch bits separately: apidocs, oxygen(icons).
+# 1. package some noarch bits separately: apidocs.
 
 Summary: K Desktop Environment 4 - Libraries
-Version: 3.92.0
-Release: 4%{?dist}
+Version: 3.93.0
+Release: 1%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -32,11 +32,6 @@
 Requires: shared-mime-info
 #Requires: kde4-settings
 
-# use ~/.kde4 instead of ~/.kde
-Patch0: kdelibs-%{version}-kde4home.diff
-# purpose of this patch?  -- Rex
-Patch1: kdelibs-3.92.0-conflict-kde3.patch
-
 Source1: kde4.sh
 Source2: kde4.csh
 
@@ -68,7 +63,7 @@
 BuildRequires: pcre-devel
 BuildRequires: shared-mime-info
 BuildRequires: soprano-devel
-BuildRequires: strigi-devel >= 0.5.3
+BuildRequires: strigi-devel >= 0.5.5
 BuildRequires: zlib-devel
 
 %description
@@ -105,9 +100,6 @@
 %prep
 %setup -q -n kdelibs-%{version}
 
-#patch0 -p1 -b .kde4home
-%patch1 -p1 -b .conflict-kde3
-
 
 %build
 
@@ -131,23 +123,15 @@
 mv %{buildroot}%{_kde4_sysconfdir}/xdg/menus/applications.menu \
    %{buildroot}%{_kde4_sysconfdir}/xdg/menus/kde4-applications.menu
 
-## unpackaged files
-rm -rf %{buildroot}%{_kde4_iconsdir}/hicolor
-# omit gigantic oxygen scalable/svg icons, for now -- Rex
-#rm -f %{buildroot}%{_kde4_iconsdir}/oxygen/scalable/*/*  ||:
-find %{buildroot}%{_kde4_iconsdir}/oxygen/scalable -name "*.svgz" | xargs --no-run-if-empty rm -fv 
-# omit emoticons, which conflict with kdelibs3 (for now) -- Rex
-rm -rf %{buildroot}%{_datadir}/emoticons
-
 
 %post
 /sbin/ldconfig ||:
-%{_kde4_bindir}/xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
+%{_kde4_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
 %{_kde4_bindir}/xdg-desktop-menu forceupdate 2> /dev/null || :
 
 %postun 
 /sbin/ldconfig ||:
-%{_kde4_bindir}/xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
+%{_kde4_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
 %{_kde4_bindir}/xdg-desktop-menu forceupdate 2> /dev/null || :
 
 
@@ -162,7 +146,6 @@
 %{_kde4_bindir}/*
 %exclude %{_kde4_bindir}/checkXML
 %exclude %{_kde4_bindir}/kconfig_compiler
-%exclude %{_kde4_bindir}/ksvgtopng
 %exclude %{_kde4_bindir}/kunittestmodrunner
 %{_kde4_appsdir}/*
 # kdewidgets
@@ -174,11 +157,10 @@
 %{_kde4_configdir}/*
 %{_datadir}/dbus-1/interfaces/*
 %{_kde4_datadir}/mime/packages/*
-%{_kde4_iconsdir}/oxygen/
-#{_kde4_sharedir}/emoticons/*
 %{_kde4_sharedir}/locale/all_languages/
 %{_kde4_sharedir}/kde4/services/*
 %{_kde4_sharedir}/kde4/servicetypes/*
+%{_kde4_sharedir}/icons/hicolor/*/actions/presence_*
 %{_kde4_docdir}/HTML/en/*
 %{_kde4_libdir}/lib*.so.*
 %{_kde4_libdir}/libkdeinit4_*.so
@@ -190,7 +172,6 @@
 %doc KDE4PORTING.html
 %{_kde4_bindir}/checkXML
 %{_kde4_bindir}/kconfig_compiler
-%{_kde4_bindir}/ksvgtopng
 %{_kde4_bindir}/kunittestmodrunner
 %{_kde4_bindir}/makekdewidgets
 %{_kde4_bindir}/makekdewidgets
@@ -205,6 +186,15 @@
 
 
 %changelog
+* Sun Sep 9 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.93.0-1
+- update to 3.93.0
+- drop kde4home patch (no longer applied)
+- drop kdeprint soversion conflict patch (fixed upstream)
+- remove icon-related code, pics/ is now in kdebase-runtime
+- BR strigi-devel >= 0.5.5 due to API changes
+- package hicolor presence_* icons which are not in hicolor-icon-theme
+- don't list non-existing ksvgtopng in devel binaries (now in kdebase-runtime)
+
 * Tue Aug 14 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.92.0-4
 - -devel: omit most (hopefully) extraneous Requires:
 - use macros.kde4


--- kdelibs-3.92.0-conflict-kde3.patch DELETED ---


--- kdelibs-3.92.0-kde4home.diff DELETED ---