rpms/kdeedu/F-10 kdeedu.spec,1.152,1.153

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/kdeedu/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17064

Modified Files:
	kdeedu.spec 
Log Message:
* Sun Aug 09 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.0-4
- *really* make -marble-libs



Index: kdeedu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeedu/F-10/kdeedu.spec,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -p -r1.152 -r1.153
--- kdeedu.spec	5 Aug 2009 02:53:20 -0000	1.152
+++ kdeedu.spec	9 Aug 2009 18:50:01 -0000	1.153
@@ -7,7 +7,7 @@
 Name:    kdeedu
 Summary: Educational/Edutainment applications
 Version: 4.3.0
-Release: 2%{?dist}
+Release: 4%{?dist}
 
 License: GPLv2
 Group:	 Amusements/Games
@@ -92,8 +92,7 @@ Group:   System Environment/Libraries
 Group:    Development/Libraries
 Summary:  Developer files for %{name}
 Requires: %{name}-libs%{?_isa} = %{version}-%{release}
-# libmarble
-Requires: %{name}-marble%{?_isa} = %{version}-%{release}
+Requires: %{name}-marble-libs%{?_isa} = %{version}-%{release}
 Obsoletes: kdeedu4-devel < %{version}-%{release}
 Provides:  kdeedu4-devel = %{version}-%{release}
 # http://bugzilla.redhat.com/394011
@@ -114,12 +113,12 @@ Requires: %{name}-libs%{?_isa} = %{versi
 %package marble
 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
 %if 0%{?fedora} < 11
 # http://bugzilla.redhat.com/487550
 Conflicts: kdeedu-libs < 4.2.0
-# this should avoid conflict too, even though kdeedu-libs isn't
-# strictly required.
-#Requires: %{name}-libs = %{version}-%{release}
 %endif
 # http://bugzilla.redhat.com/394011
 Obsoletes: marble < 1:0.5.1-1
@@ -127,6 +126,13 @@ Provides:  marble = 1:0.7-%{release}
 %description marble
 %{summary}.
 
+%package marble-libs
+Summary: Runtime libraries for marble 
+Group:   System Environment/Libraries
+Requires: %{name}-marble = %{version}-%{release}
+%description marble-libs
+%{summary}.
+
 %package math
 Group:	 Amusements/Games
 Summary: Math applications
@@ -297,8 +303,6 @@ rm -rf %{buildroot}
 
 # kalzium
 %{_kde4_libdir}/avogadro-kalzium/
-%{_kde4_libdir}/libavogadro-kalzium.so.*
-%{_kde4_libdir}/libcompoundviewer.so.*
 
 %{_kde4_datadir}/applications/kde4/blinken.desktop
 %{_kde4_datadir}/applications/kde4/kalzium.desktop
@@ -369,10 +373,12 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %doc COPYING README
 %{_kde4_appsdir}/libkdeedu/
-%{_kde4_libdir}/libkdeedu*.so.*
-%{_kde4_libdir}/libkeduvocdocument.so.*
-%{_kde4_libdir}/libkiten.so.*
-%{_kde4_libdir}/libscience.so.*
+%{_kde4_libdir}/libavogadro-kalzium.so.0*
+%{_kde4_libdir}/libcompoundviewer.so.4*
+%{_kde4_libdir}/libkdeeduui.so.4*
+%{_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
 
@@ -410,14 +416,17 @@ rm -rf %{buildroot}
 %{_kde4_datadir}/config.kcfg/marble.kcfg
 %{_kde4_datadir}/kde4/services/marble_part.desktop
 %{_kde4_docdir}/HTML/en/marble/
-%{_kde4_libdir}/libmarble*.so.*
-%{_kde4_libdir}/kde4/libmarble_part.so
 %{_kde4_libdir}/kde4/plugins/marble/
 %{_kde4_iconsdir}/hicolor/*/*/marble.*
 # worldclock links against libmarblewidget, include here
 %{_kde4_libdir}/kde4/plasma_applet_worldclock.so
 %{_kde4_datadir}/kde4/services/plasma-applet-kworldclock.desktop
 
+%files marble-libs
+%defattr(-,root,root,-)
+%{_kde4_libdir}/libmarble*.so.*
+%{_kde4_libdir}/kde4/libmarble_part.so
+
 %files math
 %defattr(-,root,root,-)
 %doc COPYING README
@@ -460,6 +469,13 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sun Aug 09 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.0-4
+- *really* make -marble-libs
+
+* Sat Aug 08 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.0-3
+- -libs: move libavogadro-kalzium libcompoundviewer here
+- new -marble-libs pkg
+
 * Sat Aug 01 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.0-2
 - move kalziumuiwidgets.so designer plugin to -libs
 - tighten -libs deps using %%?_isa