rpms/kdebase4/F-7 .cvsignore, 1.3, 1.4 kdebase4.spec, 1.4, 1.5 sources, 1.3, 1.4 kdebase-3.94.0-dolphin-desktop.diff, 1.1, NONE

[Rex Dieter (rdieter)]

Author: rdieter

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

Modified Files:
	.cvsignore kdebase4.spec sources 
Removed Files:
	kdebase-3.94.0-dolphin-desktop.diff 
Log Message:
kde-3.96.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase4/F-7/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	24 Oct 2007 15:27:40 -0000	1.3
+++ .cvsignore	3 Dec 2007 02:36:42 -0000	1.4
@@ -1,3 +1 @@
-kdebase-3.92.0.tar.bz2
-kdebase-3.93.0.tar.bz2
-kdebase-3.94.0.tar.bz2
+kdebase-3.96.2.tar.bz2


Index: kdebase4.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase4/F-7/kdebase4.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- kdebase4.spec	25 Oct 2007 03:05:29 -0000	1.4
+++ kdebase4.spec	3 Dec 2007 02:36:42 -0000	1.5
@@ -1,9 +1,9 @@
 
 Summary:       K Desktop Environment 4 - Core Files
-Version:       3.94.0
-Release:       2%{?dist}
+Version:       3.96.2
+Release:       1%{?dist}
 
-%if 0%{?fedora} > 9
+%if 0%{?fedora} > 8
 Name:          kdebase
 Epoch:         6
 
@@ -18,15 +18,15 @@
 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
+BuildRequires: kde-filesystem >= 4
 %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
 Requires(post): /sbin/ldconfig xdg-utils
 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?
@@ -81,8 +82,6 @@
 Core runtime requirements and applications for the K Desktop Environment 4.
 This package does not include the KDE 4 versions of applications which are
 provided by KDE 3 because of file and configuration setting conflicts.
-WARNING: This is a beta version. It probably has many bugs left.
-Also, the API and ABI are NOT fully stable yet (soft freeze only).
 
 %package devel
 Group:    Development/Libraries
@@ -95,13 +94,10 @@
 Requires: kdelibs4-devel kdepimlibs4-devel
 %description devel
 Header files for developing applications using %{name}.
-WARNING: This is a beta version. It probably has many bugs left.
-Also, the API and ABI are NOT fully stable yet (soft freeze only).
 
 
 %prep
 %setup -q -n kdebase-%{version}
-%patch0 -p1
 
 
 %build
@@ -122,7 +118,9 @@
 # omit gigantic oxygen scalable/svg icons, for now -- Rex
 find %{buildroot}%{_kde4_iconsdir}/oxygen/scalable -name "*.svgz" | xargs --no-run-if-empty rm -fv 
 
+%if "%{name}" != "kdebase"
 # 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
@@ -134,6 +132,7 @@
 rm -rf %{buildroot}%{_kde4_datadir}/config
 rm -f %{buildroot}%{_kde4_datadir}/config.kcfg/k*.kcfg %{buildroot}%{_kde4_datadir}/config.kcfg/mediamanagersettings.kcfg
 rm -f %{buildroot}%{_kde4_datadir}/sounds/KDE_*.ogg
+rm -rf %{buildroot}%{_kde4_datadir}/templates
 # binaries: conflict with kdebase
 rm -f %{buildroot}%{_kde4_bindir}/drkonqi
 rm -f %{buildroot}%{_kde4_bindir}/kbookmarkmerger
@@ -193,6 +192,7 @@
 rm -f %{buildroot}%{_kde4_datadir}/applications/kde4/Home.desktop
 rm -f %{buildroot}%{_kde4_datadir}/applications/kde4/k*.desktop
 rm -f %{buildroot}%{_kde4_datadir}/applications/kde4/quick-access-konsole.desktop
+%endif
 
 # move devel symlinks
 mkdir -p %{buildroot}%{_kde4_libdir}/kde4/devel
@@ -219,11 +219,17 @@
 %post
 /sbin/ldconfig ||:
 %{_bindir}/xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
+%if "%{name}" == "kdebase"
+%{_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+%endif
 %{_bindir}/xdg-desktop-menu forceupdate 2> /dev/null || :
 
 %postun
 /sbin/ldconfig ||:
 %{_bindir}/xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
+%if "%{name}" == "kdebase"
+%{_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+%endif
 %{_bindir}/xdg-desktop-menu forceupdate 2> /dev/null || :
 
 
@@ -232,19 +238,26 @@
 %{_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_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/
 
+%if "%{name}" == "kdebase"
+%{_kde4_datadir}/autostart/*
+%{_kde4_configdir}/*
+%{_kde4_datadir}/templates/*
+%{_kde4_datadir}/templates/.source/*
+%{_kde4_iconsdir}/hicolor/*/*/*
+%{_kde4_libdir}/libkdeinit4_*.so
+%endif
+
+
 %files devel
 %defattr(-,root,root,-)
 %{_kde4_includedir}/*
@@ -252,6 +265,29 @@
 
 
 %changelog
+* Sat Dec 01 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.96.2-1
+- merge changes from Sebastian Vahl's version:
+  - update to 3.96.2, remove beta warnings
+  - BR: kde-filesystem >= 4
+  - only remove conflicts when building as kdebase4, update file list
+  - run xdg-icon-resource forceupdate for hicolor when building as kdebase
+- make this the default kdebase for F9 again
+
+* Mon Nov 19 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.96.0-4
+- don't list libkdeinit4_*.so, we remove all of them as conflicts
+
+* Mon Nov 19 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.96.0-3
+- remove new directory/files %{_kde4_datadir}/templates (conflict with KDE 3)
+
+* Mon Nov 19 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.96.0-2
+- (re)add %{_kde4_iconsdir}/oxygen/*/*/* to file list
+
+* 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
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase4/F-7/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	24 Oct 2007 15:27:40 -0000	1.3
+++ sources	3 Dec 2007 02:36:42 -0000	1.4
@@ -1,2 +1 @@
-869c6ff7d9b9c359b31753306ba4c57c  kdebase-3.93.0.tar.bz2
-0b21e7ca02d272a52847df7355a161d5  kdebase-3.94.0.tar.bz2
+590e9d99f96b85f008e5aa327c17ac2a  kdebase-3.96.2.tar.bz2


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