rpms/kdeedu/devel kdeedu-4.2.85-nokalzium.patch, NONE, 1.1 kdeedu.spec, 1.178, 1.179

Sun May 17 18:10:24 UTC 2009

Author: rdieter

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

Modified Files:
	kdeedu.spec 
Added Files:
	kdeedu-4.2.85-nokalzium.patch 
Log Message:
omit busted kalzium build, for now


kdeedu-4.2.85-nokalzium.patch:

--- NEW FILE kdeedu-4.2.85-nokalzium.patch ---
diff -up kdeedu-4.2.85/CMakeLists.txt.nokalzium kdeedu-4.2.85/CMakeLists.txt
--- kdeedu-4.2.85/CMakeLists.txt.nokalzium	2009-04-28 08:46:37.000000000 -0500
+++ kdeedu-4.2.85/CMakeLists.txt	2009-05-17 13:04:53.200948372 -0500
@@ -85,7 +85,7 @@ macro_optional_add_subdirectory(kalgebra
 
 macro_optional_find_package(Eigen2 2.0.51)
 macro_log_feature(EIGEN2_FOUND "Eigen2" "A generic C++ template library for dense and sparse matrices" "http://eigen.tuxfamily.org" FALSE "2.0.51" "Required to build Step.")
-macro_optional_add_subdirectory(kalzium)
+#macro_optional_add_subdirectory(kalzium)
 if (EIGEN2_FOUND AND NOT WIN32)
   macro_optional_add_subdirectory(step)
 endif (EIGEN2_FOUND AND NOT WIN32)


Index: kdeedu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeedu/devel/kdeedu.spec,v
retrieving revision 1.178
retrieving revision 1.179
diff -u -p -r1.178 -r1.179
--- kdeedu.spec	14 May 2009 20:58:40 -0000	1.178
+++ kdeedu.spec	17 May 2009 18:09:52 -0000	1.179
@@ -23,6 +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-nokalziuim.patch
 
 Obsoletes: kdeedu4 < %{version}-%{release}
 Provides:  kdeedu4 = %{version}-%{release}
@@ -32,7 +35,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: eigen2-devel
 BuildRequires: gmm-devel
 BuildRequires: gpsd-devel
 BuildRequires: gsl-devel
@@ -51,7 +54,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.
@@ -73,7 +77,7 @@ Requires: dustin-domestic-manners-fonts 
 %description
 Educational/Edutainment applications:
 * blinken: Simon Says Game
-* kalzium: A periodic table of the elements
+%{?kalzium:* kalzium: A periodic table of the elements}
 * kanagram: Anagram game
 * kgeography: Learn geography
 * khangman: Hangman Game
@@ -110,6 +114,7 @@ Requires: kdelibs4-devel
 Group:   Amusements/Games
 Summary: Desktop Planetarium
 Requires: %{name}-libs = %{version}-%{release}
+#Requires(hint): xplanet
 %description kstars
 %{summary}.
 
@@ -149,6 +154,10 @@ Educational/Edutainment Math application
 
 %patch1 -p1 -b .indi_nodrivers
 
+%if ! 0%{?kalzium}
+%patch2 -p1 -b .nokalzium
+%endif
+
 
 %build
 mkdir -p %{_target_platform}
@@ -247,7 +256,7 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 # FIXME/TODO : sort file list into per-app sections. ? -- Rex
 %{_kde4_bindir}/blinken
-%{_kde4_bindir}/kalzium
+%{?kalzium:%{_kde4_bindir}/kalzium}
 %{_kde4_bindir}/kanagram
 %{_kde4_bindir}/kgeography
 %{_kde4_bindir}/khangman
@@ -265,7 +274,7 @@ rm -rf %{buildroot}
 # FIXME?
 %{_kde4_appsdir}/desktoptheme/
 %{_kde4_appsdir}/blinken/
-%{_kde4_appsdir}/kalzium/
+%{?kalzium:%{_kde4_appsdir}/kalzium/}
 %{_kde4_appsdir}/kanagram/
 %{_kde4_appsdir}/kgeography/
 %{_kde4_appsdir}/khangman/
@@ -281,22 +290,24 @@ rm -rf %{buildroot}
 
 %{_kde4_datadir}/kde4/services/plasma-dataengine-parley.desktop
 %{_kde4_datadir}/kde4/services/plasma_parley.desktop
-%{_kde4_datadir}/kde4/services/plasma-dataengine-kalzium.desktop
+%{?kalzium:%{_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
-%{_kde4_libdir}/kde4/plasma_engine_kalzium.so
+%{?kalzium:%{_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
-%{_kde4_datadir}/applications/kde4/kalzium.desktop
+%{?kalzium:%{_kde4_datadir}/applications/kde4/kalzium.desktop}
 %{_kde4_datadir}/applications/kde4/kanagram.desktop
 %{_kde4_datadir}/applications/kde4/kgeography.desktop
 %{_kde4_datadir}/applications/kde4/khangman.desktop
@@ -310,7 +321,7 @@ rm -rf %{buildroot}
 
 %{_kde4_datadir}/config.kcfg/blinken.kcfg
 %{_kde4_datadir}/config.kcfg/documentsettings.kcfg
-%{_kde4_datadir}/config.kcfg/kalzium.kcfg
+%{?kalzium:%{_kde4_datadir}/config.kcfg/kalzium.kcfg}
 %{_kde4_datadir}/config.kcfg/kanagram.kcfg
 %{_kde4_datadir}/config.kcfg/kgeography.kcfg
 %{_kde4_datadir}/config.kcfg/khangman.kcfg
@@ -321,7 +332,7 @@ 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
+%{?kalzium:%{_kde4_datadir}/config/kalzium.knsrc}
 %{_kde4_datadir}/config/kanagram.knsrc
 %{_kde4_datadir}/config/khangman.knsrc
 %{_kde4_datadir}/config/klettres.knsrc
@@ -330,7 +341,7 @@ rm -rf %{buildroot}
 %{_kde4_datadir}/config/step.knsrc
 
 %{_kde4_docdir}/HTML/en/blinken/
-%{_kde4_docdir}/HTML/en/kalzium/
+%{?kalzium:%{_kde4_docdir}/HTML/en/kalzium/}
 %{_kde4_docdir}/HTML/en/kanagram/
 %{_kde4_docdir}/HTML/en/kgeography/
 %{_kde4_docdir}/HTML/en/khangman/
@@ -343,7 +354,7 @@ rm -rf %{buildroot}
 %{_kde4_docdir}/HTML/en/step/
 
 %{_kde4_iconsdir}/hicolor/*/*/blinken.*
-%{_kde4_iconsdir}/hicolor/*/*/kalzium.*
+%{?kalzium:%{_kde4_iconsdir}/hicolor/*/*/kalzium.*}
 %{_kde4_iconsdir}/hicolor/*/*/kanagram.*
 %{_kde4_iconsdir}/hicolor/*/*/kgeography.*
 %{_kde4_iconsdir}/hicolor/*/*/khangman.*
@@ -356,7 +367,7 @@ rm -rf %{buildroot}
 %{_kde4_iconsdir}/hicolor/*/*/step.*
 %{_kde4_iconsdir}/oxygen/*/*/*
 
-%{_mandir}/man1/kalzium.*
+%{?kalzium:%{_mandir}/man1/kalzium.*}
 %{_mandir}/man1/ktouch.*
 %{_mandir}/man6/khangman.*
 


