rpms/kdebase-runtime/F-8 .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/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15097

Modified Files:
	.cvsignore kdebase-runtime.spec sources 
Log Message:
kde-3.96.2kde-3.96.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/F-8/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	19 Nov 2007 18:18:21 -0000	1.2
+++ .cvsignore	3 Dec 2007 20:03:34 -0000	1.3
@@ -1 +1 @@
-kdebase-runtime-3.96.0.tar.bz2
+kdebase-runtime-3.96.2.tar.bz2


Index: kdebase-runtime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/F-8/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:18:21 -0000	1.1
+++ kdebase-runtime.spec	3 Dec 2007 20:03:34 -0000	1.2
@@ -1,7 +1,12 @@
 
+# kde3_desktop=1 -> kde3 is primary desktop, omit conflicting bits here
+%if 0%{?fedora} <= 8
+%define kde3_desktop 1
+%endif
+
 Name:          kdebase-runtime
 Summary:       K Desktop Environment - Runtime 
-Version:       3.96.0
+Version:       3.96.2
 Release:       3%{?dist}
 
 License:       GPLv2
@@ -42,8 +47,10 @@
 BuildRequires: soprano-devel >= 1.97.1
 BuildRequires: strigi-devel >= 0.5.7
 BuildRequires: xine-lib-devel
-# phonon-xine VideoWidget need xine-lib built with libxcb support
-BuildRequires: xine-lib-devel libxcb-devel
+# needed for phonon-xine VideoWidget, also need xine-lib built with libxcb support
+%if 0%{?fedora} >= 8
+BuildRequires:  libxcb-devel
+%endif
 # needed?
 BuildRequires: xorg-x11-font-utils
 BuildRequires: xorg-x11-proto-devel
@@ -51,8 +58,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 +86,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 +136,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 +144,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 +158,11 @@
 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
+%else
+# remove country flags because some people/countries forbid some other
+# people/countries' flags :-(
+rm -f %{buildroot}%{_kde4_datadir}/locale/l10n/*/flag.png
+%endif
 
 
 %clean
@@ -156,13 +171,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
@@ -182,9 +199,36 @@
 %{_libdir}/strigi/*
 %{_mandir}/man1/*
 
+%if 0%{?kde3_desktop} == 0
+%{_kde4_sysconfdir}/xdg/menus/kde-information.menu
+%{_kde4_datadir}/applications/kde4/Help.desktop
+%{_kde4_datadir}/applications/kde4/knetattach.desktop
+%{_kde4_configdir}/khotnewstuffrc
+%{_kde4_configdir}/kshorturifilterrc
+%{_kde4_datadir}/desktop-directories/kde-information.directory
+%{_kde4_datadir}/emoticons/kde4/
+%{_kde4_datadir}/locale/en_US/entry.desktop
+%{_kde4_datadir}/locale/l10n/*.desktop
+%{_kde4_datadir}/locale/l10n/*/entry.desktop
+%endif
+
 
 %changelog
-* Sun Nov 18 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.96-0-3
+* Sun Dec 02 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.96.2-3
+- build without libxcb in F7 as we STILL don't have it (see #373361)
+
+* Sat Dec 01 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.96.2-2
+- no longer set kde3_desktop on F9
+- update file list for !kde3_desktop (Sebastian Vahl)
+- don't ship country flags even for full version (as in kdebase 3)
+
+* Thu Nov 29 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.96.2-1
+- kde-3.96.2
+
+* 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/F-8/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	19 Nov 2007 18:18:21 -0000	1.2
+++ sources	3 Dec 2007 20:03:34 -0000	1.3
@@ -1 +1 @@
-51f9ca43f8a6f6632f774f588208268c  kdebase-runtime-3.96.0.tar.bz2
+e959ea15a5ad6b8de396e8dc83cacdc7  kdebase-runtime-3.96.2.tar.bz2