rpms/kdeedu/devel kdeedu.spec,1.184,1.185

[Lorenzo Villani]

Author: arbiter

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

Modified Files:
	kdeedu.spec 
Log Message:
- Drop old Fedora < 8 conditionals



Index: kdeedu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeedu/devel/kdeedu.spec,v
retrieving revision 1.184
retrieving revision 1.185
diff -u -p -r1.184 -r1.185
--- kdeedu.spec	23 May 2009 00:51:40 -0000	1.184
+++ kdeedu.spec	2 Jun 2009 14:04:15 -0000	1.185
@@ -1,29 +1,22 @@
 # The Kalzium solver needs OCaml with native compilation support (ocamlopt) and
 # ocaml-facile.
-%if 0%{?fedora} > 8
 %ifarch alpha %{ix86} ia64 x86_64 ppc ppc64 sparc sparcv9
 %define with_facile 1
 %endif
-%endif
-%if 0%{?fedora} == 8
-%ifarch alpha %{ix86} ia64 x86_64 ppc sparc sparcv9
-%define with_facile 1
-%endif
-%endif
 
 Name:    kdeedu
 Summary: Educational/Edutainment applications
 Version: 4.2.85
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 License: GPLv2
 Group:	 Amusements/Games
 URL:     http://www.kde.org/
-Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdeedu-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Patch1: kdeedu-4.2.0-indi_nodrivers.patch
+Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdeedu-%{version}.tar.bz2
 
+Patch1: kdeedu-4.2.0-indi_nodrivers.patch
 ## upstream patches
 Patch100: kdeedu-4.2.85-kalzium_eigen2.patch
 
@@ -71,7 +64,7 @@ Requires: %{name}-math = %{version}-%{re
 Requires: sj-stevehand-fonts
 # khangman
 Requires: dustin-dustismo-roman-fonts
-Requires: dustin-domestic-manners-fonts 
+Requires: dustin-domestic-manners-fonts
 
 %description
 Educational/Edutainment applications:
@@ -117,20 +110,20 @@ Requires: %{name}-libs = %{version}-%{re
 %description kstars
 %{summary}.
 
-%package marble 
+%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 
+# 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}
-%description marble 
+%description marble
 %{summary}.
 
 %package math
@@ -216,14 +209,14 @@ if [ $1 -eq 0 ] ; then
   gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
 fi
 
-%post marble 
+%post marble
 /sbin/ldconfig
 touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
 
 %posttrans marble
 gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
 
-%postun marble 
+%postun marble
 /sbin/ldconfig
 if [ $1 -eq 0 ] ; then
   touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
@@ -458,6 +451,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Jun 02 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 4.2.85-4
+- Drop old Fedora < 8 conditionals
+
 * Sat May 23 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.85-3
 - Rebuild for new OCaml (3.11.1 rc0)
 
@@ -505,7 +501,7 @@ rm -rf %{buildroot}
 - -marble: move geodatatest, drop Req: -libs
 
 * Wed Feb 04 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.0-3
-- move worldclock applet to -marble 
+- move worldclock applet to -marble
 
 * Sat Jan 24 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.0-2
 - Requires: dustin-dustismo-roman-fonts
@@ -549,7 +545,7 @@ rm -rf %{buildroot}
 - Rebuild for Python 2.6
 
 * Tue Dec 02 2008 Steven M. Parrish <smparrish at shallowcreek.net> 4.1.80-7
-- rebuild for gmm 3.1 
+- rebuild for gmm 3.1
 
 * Mon Dec 01 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.80-6
 - rebuild for Python 2.6