rpms/kdebase-runtime/devel kdebase-runtime.spec,1.3,1.4

[Kevin Kofler (kkofler)]

Author: kkofler

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

Modified Files:
	kdebase-runtime.spec 
Log Message:
- 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)


Index: kdebase-runtime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/devel/kdebase-runtime.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- kdebase-runtime.spec	29 Nov 2007 21:10:33 -0000	1.3
+++ kdebase-runtime.spec	1 Dec 2007 20:48:34 -0000	1.4
@@ -1,13 +1,13 @@
 
 # kde3_desktop=1 -> kde3 is primary desktop, omit conflicting bits here
-%if 0%{?fedora} <= 9
+%if 0%{?fedora} <= 8
 %define kde3_desktop 1
 %endif
 
 Name:          kdebase-runtime
 Summary:       K Desktop Environment - Runtime 
 Version:       3.96.2
-Release:       1%{?dist}
+Release:       2%{?dist}
 
 License:       GPLv2
 Group:         User Interface/Desktops
@@ -156,6 +156,10 @@
 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
 
 
@@ -193,8 +197,26 @@
 %{_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
+* 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