rpms/kdeedu/F-10 .cvsignore, 1.62, 1.63 kdeedu.spec, 1.151, 1.152 sources, 1.64, 1.65

Wed Aug 5 02:53:20 UTC 2009

Author: rdieter

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

Modified Files:
	.cvsignore kdeedu.spec sources 
Log Message:
kde-4.3.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdeedu/F-10/.cvsignore,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -p -r1.62 -r1.63

--- .cvsignore	30 May 2009 11:25:52 -0000	1.62
+++ .cvsignore	5 Aug 2009 02:53:20 -0000	1.63
@@ -1 +1,5 @@
-kdeedu-4.2.4.tar.bz2
+kdeedu-4.2.90.tar.bz2
+kdeedu-4.2.95.tar.bz2
+kdeedu-4.2.96.tar.bz2
+kdeedu-4.2.98.tar.bz2
+kdeedu-4.3.0.tar.bz2


Index: kdeedu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeedu/F-10/kdeedu.spec,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -p -r1.151 -r1.152
--- kdeedu.spec	30 May 2009 11:25:52 -0000	1.151
+++ kdeedu.spec	5 Aug 2009 02:53:20 -0000	1.152
@@ -1,28 +1,23 @@
 # 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.4
-Release: 1%{?dist}
+Version: 4.3.0
+Release: 2%{?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)
 
+Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdeedu-%{version}.tar.bz2
+
 Patch1: kdeedu-4.2.0-indi_nodrivers.patch
+## upstream patches
 
 Obsoletes: kdeedu4 < %{version}-%{release}
 Provides:  kdeedu4 = %{version}-%{release}
@@ -32,8 +27,7 @@ BuildRequires: boost-devel
 # CFITSIO Library is needed by KStars for many INDI drivers & for KStars FITS Viewer.
 BuildRequires: cfitsio-devel
 BuildRequires: desktop-file-utils
-BuildRequires: eigen-devel
-BuildRequires: gmm-devel
+BuildRequires: eigen2-devel >= 2.0.3
 BuildRequires: gpsd-devel
 BuildRequires: gsl-devel
 BuildRequires: kdelibs4-devel >= %{version}
@@ -51,7 +45,8 @@ BuildRequires: ocaml-facile-devel
 BuildRequires: openbabel-devel >= 2.2.0-0.4.b5
 BuildRequires: python-devel python
 BuildRequires: readline-devel
-BuildRequires: python-devel
+BuildRequires: xplanet
+
 
 ## BR's FIXME/TODO:
 #-- The following OPTIONAL packages could NOT be located on your system.
@@ -59,16 +54,18 @@ BuildRequires: python-devel
 #Experimental Python binding support for the Marble library. To activate it pass -DEXPERIMENTAL_PYTHON_BINDINGS=TRUE to cmake.
 
 %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
-Requires: %{name}-libs = %{version}-%{release}
+Requires: %{name}-libs%{?_isa} = %{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
 Requires: dustin-dustismo-roman-fonts
-Requires: dustin-domestic-manners-fonts 
+Requires: dustin-domestic-manners-fonts
 
 %description
 Educational/Edutainment applications:
@@ -94,9 +91,9 @@ Group:   System Environment/Libraries
 %package devel
 Group:    Development/Libraries
 Summary:  Developer files for %{name}
-Requires: %{name}-libs = %{version}-%{release}
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 # libmarble
-Requires: %{name}-marble = %{version}-%{release}
+Requires: %{name}-marble%{?_isa} = %{version}-%{release}
 Obsoletes: kdeedu4-devel < %{version}-%{release}
 Provides:  kdeedu4-devel = %{version}-%{release}
 # http://bugzilla.redhat.com/394011
@@ -109,24 +106,25 @@ Requires: kdelibs4-devel
 %package kstars
 Group:   Amusements/Games
 Summary: Desktop Planetarium
-Requires: %{name}-libs = %{version}-%{release}
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
+#Requires(hint): xplanet
 %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
@@ -156,7 +154,7 @@ pushd %{_target_platform}
 %{cmake_kde4} ..
 popd
 
-make %{?_smp_mflags} -C %{_target_platform}
+make -C %{_target_platform}
 
 
 %install
@@ -167,6 +165,8 @@ make install/fast DESTDIR=%{buildroot} -
 # #unpackaged files
 # omit stuff for which there isn't a clear public API
 rm -f %{buildroot}%{_kde4_libdir}/lib{SatLib,analitza,avogadro-kalzium,compoundviewer,htmesh,sbigudrv}.{a,so}
+# oxygen-icon-theme conflict
+rm -fv %{buildroot}%{_kde4_iconsdir}/oxygen/22x22/actions/pointer.png
 
 # omit dustismo roman font
 rm -f %{buildroot}%{_kde4_appsdir}/khangman/fonts/Dustismo_Roman.ttf
@@ -176,6 +176,12 @@ rm -f %{buildroot}%{_kde4_appsdir}/khang
 rm -f %{buildroot}%{_kde4_appsdir}/blinken/fonts/steve.ttf
 
 
+%check
+for f in %{buildroot}%{_kde4_datadir}/applications/kde4/*.desktop ; do
+  desktop-file-validate $f
+done
+
+
 %post
 touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
 touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null ||:
@@ -210,14 +216,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 ||:
@@ -293,7 +299,6 @@ rm -rf %{buildroot}
 %{_kde4_libdir}/avogadro-kalzium/
 %{_kde4_libdir}/libavogadro-kalzium.so.*
 %{_kde4_libdir}/libcompoundviewer.so.*
-%{_kde4_libdir}/kde4/plugins/designer/kalziumuiwidgets.so
 
 %{_kde4_datadir}/applications/kde4/blinken.desktop
 %{_kde4_datadir}/applications/kde4/kalzium.desktop
@@ -321,13 +326,13 @@ rm -rf %{buildroot}
 %{_kde4_datadir}/config.kcfg/languagesettings.kcfg
 %{_kde4_datadir}/config.kcfg/parley.kcfg
 %{_kde4_datadir}/config.kcfg/step.kcfg
-%{_kde4_datadir}/config/kalzium.knsrc
-%{_kde4_datadir}/config/kanagram.knsrc
-%{_kde4_datadir}/config/khangman.knsrc
-%{_kde4_datadir}/config/klettres.knsrc
-%{_kde4_datadir}/config/kwordquiz.knsrc
-%{_kde4_datadir}/config/parley.knsrc
-%{_kde4_datadir}/config/step.knsrc
+%{_kde4_configdir}/kalzium.knsrc
+%{_kde4_configdir}/kanagram.knsrc
+%{_kde4_configdir}/khangman.knsrc
+%{_kde4_configdir}/klettres.knsrc
+%{_kde4_configdir}/kwordquiz.knsrc
+%{_kde4_configdir}/parley.knsrc
+%{_kde4_configdir}/step.knsrc
 
 %{_kde4_docdir}/HTML/en/blinken/
 %{_kde4_docdir}/HTML/en/kalzium/
@@ -368,6 +373,9 @@ rm -rf %{buildroot}
 %{_kde4_libdir}/libkeduvocdocument.so.*
 %{_kde4_libdir}/libkiten.so.*
 %{_kde4_libdir}/libscience.so.*
+# needed here for multilib'd runtime
+%{_kde4_libdir}/kde4/plugins/designer/kalziumuiwidgets.so
+
 
 %files devel
 %defattr(-,root,root,-)
@@ -452,11 +460,47 @@ rm -rf %{buildroot}
 
 
 %changelog
-* Sat May 30 2009 Lukáš Tinkl <ltinkl at redhat.com> - 4.2.4-1
-- KDE 4.2.4
+* Sat Aug 01 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.0-2
+- move kalziumuiwidgets.so designer plugin to -libs
+- tighten -libs deps using %%?_isa
+- %%check: desktop-file-validate
+- fix conflict with oxygen-icons
+
+* Thu Jul 30 2009 Than Ngo <than at redhat.com> - 4.3.0-1
+- 4.3.0
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.2.98-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Wed Jul 22 2009 Than Ngo <than at redhat.com> - 4.2.98-1
+- 4.3rc3
+
+* Fri Jul 10 2009 Than Ngo <than at redhat.com> - 4.2.96-1
+- 4.3rc2
+
+* Tue Jul 07 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.95-3
+- rebuild against fixed libqalculate to purge cln dep
+
+* Mon Jul 06 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.95-2
+- rebuild for cln(libqalculate), see also rhbz#509840
+
+* Fri Jun 26 2009 Than Ngo <than at redhat.com> - 4.2.95-1
+- 4.3rc1
+
+* Thu Jun 04 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.90-1
+- KDE-4.3 beta2 (4.2.90)
+
+* 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)
+
+* Mon May 18 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.85-2
+- Drop BR gmm-devel, no longer needed (replaced by Eigen2)
 
-* Sun May 03 2009 Than Ngo <than at redhat.com> - 4.2.3-1
-- 4.2.3
+* Wed May 13 2009 Lukáš Tinkl <ltinkl at redhat.com> - 4.2.85-1
+- KDE 4.3 beta 1
 
 * Tue Mar 31 2009 Lukáš Tinkl <ltinkl at redhat.com> - 4.2.2-1
 - KDE 4.2.2
@@ -496,7 +540,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
@@ -540,7 +584,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


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdeedu/F-10/sources,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- sources	30 May 2009 11:25:52 -0000	1.64
+++ sources	5 Aug 2009 02:53:20 -0000	1.65
@@ -1 +1 @@
-007f3fd746e4a20dec255b8b5bae6023  kdeedu-4.2.4.tar.bz2
+4c309bcdc47274cea6f61206a42ef638  kdeedu-4.3.0.tar.bz2


