rpms/kdeedu/F-10 .cvsignore,1.58,1.59 kdeedu.spec,1.145,1.146

[Rex Dieter]

Author: rdieter

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

Modified Files:
	.cvsignore kdeedu.spec 
Log Message:
* Wed Mar 25 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.1-2.1
- -marble: Conflicts: kdeedu-libs < 4.2.0 (f10-, #487550)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdeedu/F-10/.cvsignore,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- .cvsignore	25 Mar 2009 14:22:16 -0000	1.58
+++ .cvsignore	25 Mar 2009 16:35:59 -0000	1.59
@@ -1,2 +1 @@
-kdeedu-4.2.0.tar.bz2
 kdeedu-4.2.1.tar.bz2


Index: kdeedu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeedu/F-10/kdeedu.spec,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -r1.145 -r1.146
--- kdeedu.spec	25 Mar 2009 14:22:17 -0000	1.145
+++ kdeedu.spec	25 Mar 2009 16:35:59 -0000	1.146
@@ -14,7 +14,7 @@
 Name:    kdeedu
 Summary: Educational/Edutainment applications
 Version: 4.2.1
-Release: 2%{?dist}
+Release: 2%{?dist}.1
 
 License: GPLv2
 Group:	 Amusements/Games
@@ -119,10 +119,10 @@
 Group:   Amusements/Games
 %if 0%{?fedora} < 11
 # http://bugzilla.redhat.com/487550
-#Conflicts: kdeedu-libs < 4.2.0
+Conflicts: kdeedu-libs < 4.2.0
 # this should avoid conflict too, even though kdeedu-libs isn't 
 # strictly required.
-Requires: %{name}-libs = %{version}-%{release}
+#Requires: %{name}-libs = %{version}-%{release}
 %endif
 # http://bugzilla.redhat.com/394011
 Obsoletes: marble < 1:0.5.1-1
@@ -453,8 +453,10 @@
 
 
 %changelog
+* Wed Mar 25 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.1-2.1
+- -marble: Conflicts: kdeedu-libs < 4.2.0 (f10-, #487550)
+
 * 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