rpms/kdeedu/devel kdeedu.spec,1.167,1.168

[Rex Dieter]

Author: rdieter

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

Modified Files:
	kdeedu.spec 
Log Message:
-marble: Requires: kdeedu-libs ... (f10-, #487550)



Index: kdeedu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeedu/devel/kdeedu.spec,v
retrieving revision 1.167
retrieving revision 1.168
diff -u -r1.167 -r1.168
--- kdeedu.spec	24 Mar 2009 17:12:16 -0000	1.167
+++ kdeedu.spec	25 Mar 2009 14:20:05 -0000	1.168
@@ -117,6 +117,13 @@
 %package marble 
 Summary: A World Atlas
 Group:   Amusements/Games
+%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
 Provides:  marble = 1:0.7-%{release}
@@ -447,6 +454,7 @@
 
 %changelog
 * Tue Mar 24 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.1-2
+- -marble: Requires: kdeedu-libs ... (f10-, #487550)
 - libanalitza should go into-math subpkg (#491867)
 - include designer plugins in runtime (not -devel)
 - optimize scriptlets