rpms/kdeedu/F-9 kdeedu.spec,1.119,1.120
Rex Dieter
rdieter at fedoraproject.org
Wed Mar 25 16:36:29 UTC 2009
Author: rdieter
Update of /cvs/pkgs/rpms/kdeedu/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4195/F-9
Modified Files:
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: kdeedu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeedu/F-9/kdeedu.spec,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -r1.119 -r1.120
--- kdeedu.spec 25 Mar 2009 14:25:17 -0000 1.119
+++ kdeedu.spec 25 Mar 2009 16:35:59 -0000 1.120
@@ -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
More information about the scm-commits
mailing list