rpms/kdebase-runtime/F-11 kdebase-runtime.spec,1.122,1.123

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-runtime/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8167/F-11

Modified Files:
	kdebase-runtime.spec 
Log Message:
* Wed Oct 14 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.2-3
- Conflicts: kdebase < 6:4.3.0
- Requires: oxygen-icon-theme >= %{version}



Index: kdebase-runtime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/F-11/kdebase-runtime.spec,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -p -r1.122 -r1.123
--- kdebase-runtime.spec	8 Oct 2009 16:57:56 -0000	1.122
+++ kdebase-runtime.spec	15 Oct 2009 18:32:23 -0000	1.123
@@ -5,7 +5,7 @@
 Name:          kdebase-runtime
 Summary:       K Desktop Environment - Runtime
 Version:       4.3.2
-Release:       2%{?dist}
+Release:       3%{?dist}
 
 # http://techbase.kde.org/Policies/Licensing_Policy
 License:       LGPLv2+
@@ -30,6 +30,11 @@ Patch5:        kdebase-runtime-4.3.1-man
 Conflicts: kdebase3 < 3.5.10-4
 %endif
 
+%if 0%{?fedora} < 12
+# kcm_filetypes moved to here
+Conflicts: kdebase < 6:4.3.0
+%endif
+
 Provides:  kdebase4-runtime = %{version}-%{release}
 Obsoletes: kdebase4-runtime < %{version}-%{release}
 
@@ -41,6 +46,10 @@ Requires: %{name}-libs%{?_isa} = %{versi
 # KHelpcenter requires htdig for building search indices
 Requires: htdig
 
+# ensure default/fallback icon theme present
+# beware of bootstrapping, there be dragons
+Requires: oxygen-icon-theme >= %{version}
+
 BuildRequires: kde-filesystem
 BuildRequires: alsa-lib-devel
 BuildRequires: bzip2-devel
@@ -214,6 +223,10 @@ fi
 
 
 %changelog
+* Wed Oct 14 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.2-3
+- Conflicts: kdebase < 6:4.3.0
+- Requires: oxygen-icon-theme >= %%{version}
+
 * Tue Oct 06 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.2-2
 - BR: bzip2-devel xz-devel
 - -libs: move Requires: kdepimlibs... here