rpms/kdeedu/devel kdeedu-4.2.85-kalzium_eigen2.patch, NONE, 1.1 kdeedu.spec, 1.180, 1.181 kdeedu-4.2.85-nokalzium.patch, 1.1, NONE

Sun May 17 19:39:41 UTC 2009

Author: rdieter

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

Modified Files:
	kdeedu.spec 
Added Files:
	kdeedu-4.2.85-kalzium_eigen2.patch 
Removed Files:
	kdeedu-4.2.85-nokalzium.patch 
Log Message:
re-enable kalzium, spin++


kdeedu-4.2.85-kalzium_eigen2.patch:

--- NEW FILE kdeedu-4.2.85-kalzium_eigen2.patch ---
diff -up kdeedu-4.2.85/kalzium/KalziumConfigureChecks.cmake.eigen2 kdeedu-4.2.85/kalzium/KalziumConfigureChecks.cmake
--- kdeedu-4.2.85/kalzium/KalziumConfigureChecks.cmake.eigen2	2008-11-19 04:18:42.000000000 -0600
+++ kdeedu-4.2.85/kalzium/KalziumConfigureChecks.cmake	2009-05-17 14:26:39.427948162 -0500
@@ -6,19 +6,10 @@ macro_optional_find_package(Libfacile)
 macro_optional_find_package(OpenBabel2)
 macro_optional_find_package(OpenGL)
 
-# Since Kalzium's old snapshot of libavogadro is the last remaining piece of code using eigen1,
-# we remove eigen1 from kdesupport and instead add a copy of it in our snapshot of libavogadro.
-# Yes, this is very ugly. But eigen1 is much smaller than libavogadro anyway. So this doesn't make
-# things much worse. The real big problem is that we use a snapshot of libavogadro in the first place.
-# I really want this to go away in 4.3, normally by relying directly on libavogadro (which should at last
-# make a stable release), or else we just move the 3D molecular editor to playground/.
-# macro_optional_find_package(Eigen)
-set(EIGEN_FOUND TRUE)
-
 macro_bool_to_01(LIBFACILE_FOUND HAVE_FACILE)
 macro_bool_to_01(OPENBABEL2_FOUND HAVE_OPENBABEL2)
 macro_bool_to_01(OPENGL_FOUND HAVE_OPENGL)
-macro_bool_to_01(EIGEN_FOUND HAVE_EIGEN)
+macro_bool_to_01(EIGEN2_FOUND HAVE_EIGEN)
 
 # at the end, output the configuration
 configure_file(


Index: kdeedu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeedu/devel/kdeedu.spec,v
retrieving revision 1.180
retrieving revision 1.181
diff -u -p -r1.180 -r1.181
--- kdeedu.spec	17 May 2009 18:40:49 -0000	1.180
+++ kdeedu.spec	17 May 2009 19:39:10 -0000	1.181
@@ -23,9 +23,9 @@ Source0: ftp://ftp.kde.org/pub/kde/stabl
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch1: kdeedu-4.2.0-indi_nodrivers.patch
-# kalzium is busted, omit for now
-#define kalzium 1
-Patch2: kdeedu-4.2.85-nokalzium.patch
+
+## upstream patches
+Patch100: kdeedu-4.2.85-kalzium_eigen2.patch
 
 Obsoletes: kdeedu4 < %{version}-%{release}
 Provides:  kdeedu4 = %{version}-%{release}
@@ -77,7 +77,7 @@ Requires: dustin-domestic-manners-fonts 
 %description
 Educational/Edutainment applications:
 * blinken: Simon Says Game
-%{?kalzium:* kalzium: A periodic table of the elements}
+* kalzium: A periodic table of the elements
 * kanagram: Anagram game
 * kgeography: Learn geography
 * khangman: Hangman Game
@@ -154,9 +154,7 @@ Educational/Edutainment Math application
 
 %patch1 -p1 -b .indi_nodrivers
 
-%if ! 0%{?kalzium}
-%patch2 -p1 -b .nokalzium
-%endif
+%patch100 -p1 -b .kalzium_eigen2
 
 
 %build
@@ -256,7 +254,7 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 # FIXME/TODO : sort file list into per-app sections. ? -- Rex
 %{_kde4_bindir}/blinken
-%{?kalzium:%{_kde4_bindir}/kalzium}
+%{_kde4_bindir}/kalzium
 %{_kde4_bindir}/kanagram
 %{_kde4_bindir}/kgeography
 %{_kde4_bindir}/khangman
@@ -274,7 +272,7 @@ rm -rf %{buildroot}
 # FIXME?
 %{_kde4_appsdir}/desktoptheme/
 %{_kde4_appsdir}/blinken/
-%{?kalzium:%{_kde4_appsdir}/kalzium/}
+%{_kde4_appsdir}/kalzium/
 %{_kde4_appsdir}/kanagram/
 %{_kde4_appsdir}/kgeography/
 %{_kde4_appsdir}/khangman/
@@ -290,24 +288,22 @@ rm -rf %{buildroot}
 
 %{_kde4_datadir}/kde4/services/plasma-dataengine-parley.desktop
 %{_kde4_datadir}/kde4/services/plasma_parley.desktop
-%{?kalzium:%{_kde4_datadir}/kde4/services/plasma-dataengine-kalzium.desktop}
+%{_kde4_datadir}/kde4/services/plasma-dataengine-kalzium.desktop
 %{_kde4_datadir}/kde4/services/plasma_didyouknow.desktop
 
 %{_kde4_libdir}/kde4/plasma_applet_parley.so
 %{_kde4_libdir}/kde4/plasma_engine_parley.so
 %{_kde4_libdir}/kde4/plasma_applet_didyouknow.so
-%{?kalzium:%{_kde4_libdir}/kde4/plasma_engine_kalzium.so}
+%{_kde4_libdir}/kde4/plasma_engine_kalzium.so
 
-%if 0%{?kalzium}
 # kalzium
 %{_kde4_libdir}/avogadro-kalzium/
 %{_kde4_libdir}/libavogadro-kalzium.so.*
 %{_kde4_libdir}/libcompoundviewer.so.*
 %{_kde4_libdir}/kde4/plugins/designer/kalziumuiwidgets.so
-%endif
 
 %{_kde4_datadir}/applications/kde4/blinken.desktop
-%{?kalzium:%{_kde4_datadir}/applications/kde4/kalzium.desktop}
+%{_kde4_datadir}/applications/kde4/kalzium.desktop
 %{_kde4_datadir}/applications/kde4/kanagram.desktop
 %{_kde4_datadir}/applications/kde4/kgeography.desktop
 %{_kde4_datadir}/applications/kde4/khangman.desktop
@@ -321,7 +317,7 @@ rm -rf %{buildroot}
 
 %{_kde4_datadir}/config.kcfg/blinken.kcfg
 %{_kde4_datadir}/config.kcfg/documentsettings.kcfg
-%{?kalzium:%{_kde4_datadir}/config.kcfg/kalzium.kcfg}
+%{_kde4_datadir}/config.kcfg/kalzium.kcfg
 %{_kde4_datadir}/config.kcfg/kanagram.kcfg
 %{_kde4_datadir}/config.kcfg/kgeography.kcfg
 %{_kde4_datadir}/config.kcfg/khangman.kcfg
@@ -332,16 +328,16 @@ rm -rf %{buildroot}
 %{_kde4_datadir}/config.kcfg/languagesettings.kcfg
 %{_kde4_datadir}/config.kcfg/parley.kcfg
 %{_kde4_datadir}/config.kcfg/step.kcfg
-%{?kalzium:%{_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/
-%{?kalzium:%{_kde4_docdir}/HTML/en/kalzium/}
+%{_kde4_docdir}/HTML/en/kalzium/
 %{_kde4_docdir}/HTML/en/kanagram/
 %{_kde4_docdir}/HTML/en/kgeography/
 %{_kde4_docdir}/HTML/en/khangman/
@@ -354,7 +350,7 @@ rm -rf %{buildroot}
 %{_kde4_docdir}/HTML/en/step/
 
 %{_kde4_iconsdir}/hicolor/*/*/blinken.*
-%{?kalzium:%{_kde4_iconsdir}/hicolor/*/*/kalzium.*}
+%{_kde4_iconsdir}/hicolor/*/*/kalzium.*
 %{_kde4_iconsdir}/hicolor/*/*/kanagram.*
 %{_kde4_iconsdir}/hicolor/*/*/kgeography.*
 %{_kde4_iconsdir}/hicolor/*/*/khangman.*
@@ -367,7 +363,7 @@ rm -rf %{buildroot}
 %{_kde4_iconsdir}/hicolor/*/*/step.*
 %{_kde4_iconsdir}/oxygen/*/*/*
 
-%{?kalzium:%{_mandir}/man1/kalzium.*}
+%{_mandir}/man1/kalzium.*
 %{_mandir}/man1/ktouch.*
 %{_mandir}/man6/khangman.*
 


--- kdeedu-4.2.85-nokalzium.patch DELETED ---


