rpms/kdeedu/devel kdeedu.spec,1.186,1.187

Ben Boeckel mathstuf at fedoraproject.org
Wed Jun 17 22:44:02 UTC 2009


Author: mathstuf

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

Modified Files:
	kdeedu.spec 
Log Message:
Add conditional on Requires for upgrade paths to exclude in F12


Index: kdeedu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeedu/devel/kdeedu.spec,v
retrieving revision 1.186
retrieving revision 1.187
diff -u -p -r1.186 -r1.187
--- kdeedu.spec	5 Jun 2009 02:26:32 -0000	1.186
+++ kdeedu.spec	17 Jun 2009 22:43:31 -0000	1.187
@@ -57,8 +57,10 @@ BuildRequires: xplanet
 Requires: %{name}-libs = %{version}-%{release}
 # split pkgs, (temporary?) upgrade path -- Rex
 Requires: %{name}-kstars = %{version}-%{release}
+%if 0%{?fedora} < 12
 Requires: %{name}-marble = %{version}-%{release}
 Requires: %{name}-math = %{version}-%{release}
+%endif
 # blinken
 Requires: sj-stevehand-fonts
 # khangman
@@ -447,6 +449,8 @@ rm -rf %{buildroot}
 %{_mandir}/man1/kmplot.*
 
 
+# Wasn't rebuilt with this; append to next build entry
+# - Add conditional so that upgrade path Requires are only in F11 and lower
 %changelog
 * Thu Jun 04 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.90-1
 - KDE-4.3 beta2 (4.2.90)




More information about the fedora-extras-commits mailing list