rpms/kdeedu/devel kdeedu.spec,1.159,1.160

[Rex Dieter]

Author: rdieter

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

Modified Files:
	kdeedu.spec 
Log Message:
* Wed Feb 04 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.0-4
- main: move libs compoundviewer/avogadro-kalzium, analitza
- -marble: move geodatatest, drop Req: -libs



Index: kdeedu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeedu/devel/kdeedu.spec,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -r1.159 -r1.160
--- kdeedu.spec	4 Feb 2009 20:21:34 -0000	1.159
+++ kdeedu.spec	5 Feb 2009 01:48:38 -0000	1.160
@@ -14,7 +14,7 @@
 Name:    kdeedu
 Summary: Educational/Edutainment applications
 Version: 4.2.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 License: GPLv2
 Group:	 Amusements/Games
@@ -123,7 +123,6 @@
 # http://bugzilla.redhat.com/394011
 Obsoletes: marble < 1:0.5.1-1
 Provides:  marble = 1:0.7-%{release}
-Requires: %{name}-libs = %{version}-%{release}
 Requires(post): xdg-utils
 Requires(postun): xdg-utils
 %description marble 
@@ -150,13 +149,12 @@
 
 
 %build
-
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
 %{cmake_kde4} ..
 popd
 
-make %{?_smp_mflags} -C %{_target_platform} VERBOSE=1
+make %{?_smp_mflags} -C %{_target_platform}
 
 
 %install
@@ -168,7 +166,7 @@
 # omit stuff for which there isn't a clear public API
 rm -f %{buildroot}%{_kde4_libdir}/lib{SatLib,analitza,compoundviewer,htmesh,sbigudrv}.{a,so}
 
-# omti dustismo roman font
+# omit dustismo roman font
 rm -f %{buildroot}%{_kde4_appsdir}/khangman/fonts/Dustismo_Roman.ttf
 
 
@@ -215,7 +213,6 @@
 %defattr(-,root,root,-)
 # FIXME/TODO : sort file list into per-app sections. ? -- Rex
 %{_kde4_bindir}/blinken
-%{_kde4_bindir}/geodatatest
 %{_kde4_bindir}/kalzium
 %{_kde4_bindir}/kanagram
 %{_kde4_bindir}/kgeography
@@ -259,6 +256,13 @@
 %{_kde4_libdir}/kde4/plasma_applet_didyouknow.so
 %{_kde4_libdir}/kde4/plasma_engine_kalzium.so
 
+# kalgebra
+%{_kde4_libdir}/libanalitza.so.*
+# kalzium
+%{_kde4_libdir}/avogadro-kalzium/
+%{_kde4_libdir}/libavogadro-kalzium.so.*
+%{_kde4_libdir}/libcompoundviewer.so.*
+
 %{_kde4_datadir}/applications/kde4/blinken.desktop
 %{_kde4_datadir}/applications/kde4/kalzium.desktop
 %{_kde4_datadir}/applications/kde4/kanagram.desktop
@@ -327,9 +331,6 @@
 %files libs
 %defattr(-,root,root,-)
 %doc COPYING README
-%{_kde4_libdir}/libanalitza.so.*
-%{_kde4_libdir}/avogadro-kalzium/
-%{_kde4_libdir}/libavogadro-kalzium.so.*
 %{_kde4_appsdir}/libkdeedu/
 %{_kde4_libdir}/libkdeedu*.so.*
 %{_kde4_libdir}/libkeduvocdocument.so.*
@@ -366,11 +367,11 @@
 %{_kde4_appsdir}/marble/
 %{_kde4_appsdir}/marble_part/
 %{_kde4_bindir}/marble
+%{_kde4_bindir}/geodatatest
 %{_kde4_datadir}/applications/kde4/marble.desktop
 %{_kde4_datadir}/config.kcfg/marble.kcfg
 %{_kde4_datadir}/kde4/services/marble_part.desktop
 %{_kde4_docdir}/HTML/en/marble/
-%{_kde4_libdir}/libcompoundviewer.so.*
 %{_kde4_libdir}/libmarble*.so.*
 %{_kde4_libdir}/kde4/libmarble_part.so
 %{_kde4_libdir}/kde4/plugins/marble/
@@ -419,8 +420,12 @@
 
 
 %changelog
+* Wed Feb 04 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.0-4
+- main: move libs compoundviewer/avogadro-kalzium, analitza
+- -marble: move geodatatest, drop Req: -libs
+
 * Wed Feb 04 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.0-3
-- -marble: move worldclock applet here
+- move worldclock applet to -marble 
 
 * Sat Jan 24 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.0-2
 - Requires: dustin-dustismo-roman-fonts