rpms/kdebase4/devel kdebase4.spec, 1.5, 1.6 kdebase-3.94.0-dolphin-desktop.diff, 1.1, NONE

[Kevin Kofler (kkofler)]

Author: kkofler

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

Modified Files:
	kdebase4.spec 
Removed Files:
	kdebase-3.94.0-dolphin-desktop.diff 
Log Message:
- update to 3.96.0
- drop dolphin-desktop patch, fixed upstream
- don't list files which are now in kdebase-runtime
- add Requires: kdebase-runtime


Index: kdebase4.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase4/devel/kdebase4.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- kdebase4.spec	25 Oct 2007 03:01:55 -0000	1.5
+++ kdebase4.spec	19 Nov 2007 18:53:40 -0000	1.6
@@ -1,7 +1,7 @@
 
 Summary:       K Desktop Environment 4 - Core Files
-Version:       3.94.0
-Release:       2%{?dist}
+Version:       3.96.0
+Release:       1%{?dist}
 
 %if 0%{?fedora} > 9
 Name:          kdebase
@@ -18,7 +18,6 @@
 Group:         User Interface/Desktops
 URL:           http://www.kde.org/
 Source0:       ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdebase-%{version}.tar.bz2
-Patch0:        kdebase-3.94.0-dolphin-desktop.diff
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: kde-filesystem
@@ -27,6 +26,7 @@
 Requires(postun): /sbin/ldconfig xdg-utils
 Requires: kdelibs4 >= %{version}
 Requires: kdepimlibs >= %{version}
+Requires: kdebase-runtime >= %{version}
 %ifnarch s390 s390x
 Requires: eject
 %endif
@@ -34,6 +34,7 @@
 # should not conflict with d3lphin, but does with old Dolphin
 Conflicts:     dolphin <= 0.8.2
 
+# FIXME: remove BRs which are only needed for stuff now in -runtime
 BuildRequires: alsa-lib-devel
 BuildRequires: bzip2-devel
 # needed?
@@ -101,7 +102,6 @@
 
 %prep
 %setup -q -n kdebase-%{version}
-%patch0 -p1
 
 
 %build
@@ -123,6 +123,7 @@
 find %{buildroot}%{_kde4_iconsdir}/oxygen/scalable -name "*.svgz" | xargs --no-run-if-empty rm -fv 
 
 # remove files which conflict with KDE 3
+# FIXME: remove the rm commands for stuff which isn't there to remove in the first place so we see what actually still conflicts
 rm -rf %{buildroot}%{_kde4_iconsdir}/hicolor
 rm -rf %{buildroot}%{_kde4_iconsdir}/crystalsvg
 rm -rf %{buildroot}%{_datadir}/emoticons
@@ -232,19 +233,17 @@
 %{_kde4_bindir}/*
 %{_kde4_datadir}/applications/kde4/*
 %{_kde4_appsdir}/*
-%{_kde4_datadir}/config.kcfg/
+%{_kde4_datadir}/config.kcfg/*
 %{_datadir}/dbus-1/interfaces/*
-%{_datadir}/dbus-1/services/*
-%{_kde4_iconsdir}/oxygen/
 %{_kde4_datadir}/kde4/services/*
 %{_kde4_datadir}/kde4/servicetypes/*
-%{_kde4_datadir}/sounds/*
-%{_kde4_docdir}/HTML/en/
+%{_kde4_docdir}/HTML/en/*
 %{_kde4_libdir}/lib*.so.*
 %{_kde4_libdir}/libkdeinit4_*.so
 %{_kde4_libdir}/kde4/*
 %exclude %{_kde4_libdir}/kde4/devel/
 
+
 %files devel
 %defattr(-,root,root,-)
 %{_kde4_includedir}/*
@@ -252,6 +251,12 @@
 
 
 %changelog
+* Mon Nov 19 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.96.0-1
+- update to 3.96.0
+- drop dolphin-desktop patch, fixed upstream
+- don't list files which are now in kdebase-runtime
+- add Requires: kdebase-runtime
+
 * Thu Oct 25 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.94.0-2
 - patch dolphin.desktop to get Dolphin to start from the menu
 


--- kdebase-3.94.0-dolphin-desktop.diff DELETED ---