rpms/kdebase-runtime/devel .cvsignore, 1.2, 1.3 kdebase-runtime.spec, 1.1, 1.2 sources, 1.2, 1.3

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-runtime/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14939

Modified Files:
	.cvsignore kdebase-runtime.spec sources 
Log Message:
* Tue Nov 27 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.96.1-1
- kde-3.96.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	19 Nov 2007 18:16:31 -0000	1.2
+++ .cvsignore	27 Nov 2007 15:18:16 -0000	1.3
@@ -1 +1,2 @@
 kdebase-runtime-3.96.0.tar.bz2
+kdebase-runtime-3.96.1.tar.bz2


Index: kdebase-runtime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/devel/kdebase-runtime.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kdebase-runtime.spec	19 Nov 2007 18:16:31 -0000	1.1
+++ kdebase-runtime.spec	27 Nov 2007 15:18:16 -0000	1.2
@@ -1,8 +1,13 @@
 
+# kde3_desktop=1 -> kde3 is primary desktop, omit conflicting bits here
+%if 0%{?fedora} <= 9
+%define kde3_desktop 1
+%endif
+
 Name:          kdebase-runtime
 Summary:       K Desktop Environment - Runtime 
-Version:       3.96.0
-Release:       3%{?dist}
+Version:       3.96.1
+Release:       1%{?dist}
 
 License:       GPLv2
 Group:         User Interface/Desktops
@@ -51,8 +56,10 @@
 
 %description
 Core runtime for the K Desktop Environment 4.
+%if 0%{?kde3_desktop}
 This package does not include the KDE 4 versions of applications which are
 provided by KDE 3 because of file and configuration setting conflicts.
+%endif
 
 
 %prep
@@ -77,8 +84,11 @@
 # omit gigantic oxygen scalable/svg icons, for now -- Rex
 find %{buildroot}%{_kde4_iconsdir}/oxygen/scalable -name "*.svgz" | xargs --no-run-if-empty rm -fv 
 
-# remove files which conflict with KDE 3
+## Unpackaged files
 rm -rf %{buildroot}%{_kde4_iconsdir}/hicolor
+
+%if 0%{?kde3_desktop}
+# remove files which conflict with KDE 3
 rm -rf %{buildroot}%{_kde4_iconsdir}/crystalsvg
 rm -rf %{buildroot}%{_datadir}/emoticons
 rm -rf %{buildroot}%{_kde4_datadir}/locale
@@ -124,7 +134,6 @@
 rm -f %{buildroot}%{_kde4_bindir}/nspluginscan
 rm -f %{buildroot}%{_kde4_bindir}/nspluginviewer
 # binaries: conflict with kdelibs
-rm -f %{buildroot}%{_kde4_bindir}/kcmshell
 rm -f %{buildroot}%{_kde4_bindir}/kfile
 rm -f %{buildroot}%{_kde4_bindir}/khotnewstuff
 rm -f %{buildroot}%{_kde4_bindir}/kinstalltheme
@@ -133,7 +142,6 @@
 # binaries: conflict with kdebase-extras
 rm -f %{buildroot}%{_kde4_bindir}/kappfinder
 # do not strictly conflict, but we removed the corresponding binaries:
-rm -f %{buildroot}%{_kde4_libdir}/libkdeinit4_kcmshell.so
 rm -f %{buildroot}%{_kde4_libdir}/libkdeinit4_keditbookmarks.so
 rm -f %{buildroot}%{_kde4_libdir}/libkdeinit4_kfmclient.so
 rm -f %{buildroot}%{_kde4_libdir}/libkdeinit4_khelpcenter.so
@@ -148,6 +156,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
 
 
 %clean
@@ -156,13 +165,15 @@
 
 %post
 /sbin/ldconfig ||:
-%{_bindir}/xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
-%{_bindir}/xdg-desktop-menu forceupdate 2> /dev/null || :
+%{!?kde3_desktop:xdg-icon-resource forceupdate --theme crystalsvg 2> /dev/null || : }
+xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
+xdg-desktop-menu forceupdate 2> /dev/null || :
 
 %postun
 /sbin/ldconfig ||:
-%{_bindir}/xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
-%{_bindir}/xdg-desktop-menu forceupdate 2> /dev/null || :
+%{!?kde3_desktop:xdg-icon-resource forceupdate --theme crystalsvg 2> /dev/null || : }
+xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
+xdg-desktop-menu forceupdate 2> /dev/null || :
 
 
 %files
@@ -184,7 +195,10 @@
 
 
 %changelog
-* Sun Nov 18 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.96-0-3
+* Tue Nov 27 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.96.1-1
+- kde-3.96.1
+
+* Sun Nov 18 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.96.0-3
 - fix %%files (unpackaged %%_libdir/strigi/strigiindex_sopranobackend.so)
 
 * Sat Nov 17 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.96.0-2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	19 Nov 2007 18:16:31 -0000	1.2
+++ sources	27 Nov 2007 15:18:16 -0000	1.3
@@ -1 +1 @@
-51f9ca43f8a6f6632f774f588208268c  kdebase-runtime-3.96.0.tar.bz2
+fb21d021d4ca8e217a6a84c1bbc2c39f  kdebase-runtime-3.96.1.tar.bz2