rpms/kdebase-runtime/devel kdebase-runtime.spec,1.107,1.108

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-runtime/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25523

Modified Files:
	kdebase-runtime.spec 
Log Message:
* Wed Apr 01 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-3
- -flags subpkg
- koji/noarch hacks dropped



Index: kdebase-runtime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/devel/kdebase-runtime.spec,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -r1.107 -r1.108
--- kdebase-runtime.spec	1 Apr 2009 14:43:22 -0000	1.107
+++ kdebase-runtime.spec	1 Apr 2009 15:21:26 -0000	1.108
@@ -2,10 +2,7 @@
 # # kde3_desktop=1 -> kde3 is primary desktop, omit conflicting bits here
 %global kde3_desktop 1
 %else
-# curently broken due to noarch build of oxygen-icon-theme
-# when oxygen-icon-theme review is done, they can be omitted from 
-# here, and flags be re-enabled.
-#define flags 1
+%define flags 1 
 %endif
 
 Name:          kdebase-runtime
@@ -27,15 +24,18 @@
 
 ## Upstream patches
 
-%ifarch noarch
-%define icons 1
-%define icons_svg 1
-%else
+#ifarch noarch
+## icons now provided by standalone oxygen-icon-theme
+#define icons 1
+#define icons_svg 1
+#else
 %define rest 1
-%endif
+#endif
 
 # when kdesu was removed, this is/should-be only temporary
+%if 0%{?fedora} < 10
 Conflicts: kdebase3 < 3.5.10-4
+%endif
 
 Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 #Â KHelpcenter requires htdig for building search indices
@@ -92,9 +92,9 @@
 Summary: Geopolitical flags
 Group: User Interface/Desktops
 Requires: %{name} = %{version}-%{release}
-#if 0%{?fedora} > 9
-#BuildArch: noarch
-#endif
+%if 0%{?fedora} > 9
+BuildArch: noarch
+%endif
 %description flags 
 %{summary}.
 
@@ -102,6 +102,9 @@
 Summary: Oxygen icon theme
 Group: User Interface/Desktops
 %{?!icons_svg:Obsoletes: oxygen-icon-theme-scalable < %{version}-%{release}}
+%if 0%{?fedora} > 9
+BuildArch: noarch
+%endif
 %description -n oxygen-icon-theme
 %{summary}.
 
@@ -109,6 +112,9 @@
 Summary: Oxygen icon theme, scalable(svg) icons
 Group: User Interface/Desktops
 Requires: oxygen-icon-theme = %{version}-%{release}
+%if 0%{?fedora} > 9
+BuildArch: noarch
+%endif
 %description -n oxygen-icon-theme-scalable
 %{summary}.
 
@@ -380,6 +386,10 @@
 
 
 %changelog
+* Wed Apr 01 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-3
+- -flags subpkg
+- koji/noarch hacks dropped
+
 * Wed Apr 01 2009 Than Ngo <than at redhat.com> - 4.2.2-2
 - drop kdebase-runtime-4.2.1-pulseaudio-cmake.patch