rpms/kdeedu/devel kdeedu.spec,1.200,1.201

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/kdeedu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32562

Modified Files:
	kdeedu.spec 
Log Message:
* Thu Aug 20 2009 Rex Dieter <rdieter at fedoraproject.org. 4.3.0-5
- add Obsoletes to help multilib upgrades)
- -marble-libs: move marble plugins here



Index: kdeedu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeedu/devel/kdeedu.spec,v
retrieving revision 1.200
retrieving revision 1.201
diff -u -p -r1.200 -r1.201
--- kdeedu.spec	9 Aug 2009 17:07:01 -0000	1.200
+++ kdeedu.spec	20 Aug 2009 12:52:05 -0000	1.201
@@ -7,7 +7,7 @@
 Name:    kdeedu
 Summary: Educational/Edutainment applications
 Version: 4.3.0
-Release: 4%{?dist}
+Release: 5%{?dist}
 
 License: GPLv2
 Group:	 Amusements/Games
@@ -54,6 +54,8 @@ BuildRequires: xplanet
 #Experimental Python binding support for the Marble library. To activate it pass -DEXPERIMENTAL_PYTHON_BINDINGS=TRUE to cmake.
 
 %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
+# help multilib upgrades 
+Obsoletes: kdeedu < 4.3.0-3
 Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 # split pkgs, (temporary?) upgrade path -- Rex
 Requires: %{name}-kstars = %{version}-%{release}
@@ -114,8 +116,8 @@ Requires: %{name}-libs%{?_isa} = %{versi
 Summary: A World Atlas
 Group:   Amusements/Games
 Requires: %{name}-marble-libs%{?_isa} = %{version}-%{release}
-# multilib, when marble-libs was introduced
-Obsoletes: %{name}-marble < 4.3.0-3
+# help multilib upgrades 
+Obsoletes: kdeedu-marble < 4.3.0-5
 %if 0%{?fedora} < 11
 # http://bugzilla.redhat.com/487550
 Conflicts: kdeedu-libs < 4.2.0
@@ -379,10 +381,8 @@ rm -rf %{buildroot}
 %{_kde4_libdir}/libkeduvocdocument.so.4*
 %{_kde4_libdir}/libkiten.so.4*
 %{_kde4_libdir}/libscience.so.4*
-# needed here for multilib'd runtime
 %{_kde4_libdir}/kde4/plugins/designer/kalziumuiwidgets.so
 
-
 %files devel
 %defattr(-,root,root,-)
 %{_kde4_appsdir}/cmake/modules
@@ -416,7 +416,6 @@ rm -rf %{buildroot}
 %{_kde4_datadir}/config.kcfg/marble.kcfg
 %{_kde4_datadir}/kde4/services/marble_part.desktop
 %{_kde4_docdir}/HTML/en/marble/
-%{_kde4_libdir}/kde4/plugins/marble/
 %{_kde4_iconsdir}/hicolor/*/*/marble.*
 # worldclock links against libmarblewidget, include here
 %{_kde4_libdir}/kde4/plasma_applet_worldclock.so
@@ -426,6 +425,7 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %{_kde4_libdir}/libmarble*.so.*
 %{_kde4_libdir}/kde4/libmarble_part.so
+%{_kde4_libdir}/kde4/plugins/marble/
 
 %files math
 %defattr(-,root,root,-)
@@ -469,6 +469,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Aug 20 2009 Rex Dieter <rdieter at fedoraproject.org. 4.3.0-5
+- add Obsoletes to help multilib upgrades)
+- -marble-libs: move marble plugins here
+
 * Sun Aug 09 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.0-4
 - *really* make -marble-libs