rpms/kdeedu/devel kdeedu.spec,1.103,1.104

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/pkgs/rpms/kdeedu/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30810

Modified Files:
	kdeedu.spec 
Log Message:
* Thu May 08 2008 Rex Dieter <rdieter at fedoraproject.org> 4.0.72-2
- -kstars subpkg (#432317)



Index: kdeedu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeedu/devel/kdeedu.spec,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- kdeedu.spec	8 May 2008 14:15:51 -0000	1.103
+++ kdeedu.spec	8 May 2008 17:51:07 -0000	1.104
@@ -14,7 +14,7 @@
 Name:    kdeedu
 Summary: Educational/Edutainment applications 
 Version: 4.0.72
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv2
 Group:	 Amusements/Games
@@ -67,7 +67,9 @@
 #  Step also needs libqalculate-devel and gsl-devel which are already packaged.
 
 %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
-Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: %{name}-libs = %{version}-%{release}
+# kstars split, (temporary?) upgrade path -- Rex
+Requires: %{name}-kstars = %{version}-%{release}
 Requires(post): xdg-utils
 Requires(postun): xdg-utils
 
@@ -83,7 +85,6 @@
 * klettres: French alphabet tutor
 * kmplot: Mathematical Function Plotter
 * kpercentage: Excersie Percentages
-* kstars: Desktop Planetarium
 * ktouch: Touch Typing Tutor
 * kturtle: Logo Programming Environment
 * kvoctrain: Vocabulary Trainer
@@ -99,7 +100,7 @@
 %package devel
 Group:    Development/Libraries
 Summary:  Developer files for %{name} 
-Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: %{name}-libs = %{version}-%{release}
 Obsoletes: kdeedu4-devel < %{version}-%{release}
 Provides:  kdeedu4-devel = %{version}-%{release}
 # http://bugzilla.redhat.com/394011
@@ -109,7 +110,16 @@
 Requires: giflib-devel
 Requires: pcre-devel
 %description devel
-%{name}.
+%{summary}.
+
+%package kstars
+Group:   Amusements/Games
+Summary: Desktop Planetarium 
+Requires: %{name}-libs = %{version}-%{release}
+Requires(post): xdg-utils
+Requires(postun): xdg-utils
+%description kstars
+%{summary}.
 
 
 %prep
@@ -125,7 +135,8 @@
 popd
 
 # smp build busted?
-make -C %{_target_platform} VERBOSE=1
+make -k %{?_smp_mflags} -C %{_target_platform} VERBOSE=1 || \
+  make %{?_smp_mflags} -C %{_target_platform} VERBOSE=1
 
 
 %install
@@ -148,6 +159,14 @@
 
 %postun libs -p /sbin/ldconfig
 
+%post kstars
+xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
+
+%postun kstars
+xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
+
 
 %clean
 rm -rf %{buildroot}
@@ -169,6 +188,15 @@
 %{_kde4_libdir}/avogadro-kalzium/
 %{_datadir}/dbus-1/interfaces/*
 
+%exclude %{_kde4_bindir}/kstars
+%exclude %{_kde4_datadir}/applications/kde4/kstars.desktop
+%exclude %{_kde4_datadir}/config.kcfg/kstars.kcfg
+%exclude %{_kde4_configdir}/kstars.knsrc
+%exclude %{_kde4_docdir}/HTML/en/kstars/
+%exclude %{_kde4_appsdir}/kstars/
+%exclude %{_kde4_iconsdir}/hicolor/*/*/kstars.*
+%exclude %{_kde4_iconsdir}/oxygen/*/*/kstars.*
+
 %files libs 
 %defattr(-,root,root,-)
 %{_kde4_libdir}/lib*.so.*
@@ -180,8 +208,22 @@
 %{_kde4_libdir}/lib*.so
 %{_kde4_libdir}/libhtmesh.a
 
+%files kstars
+%defattr(-,root,root,-)
+%{_kde4_bindir}/kstars
+%{_kde4_datadir}/applications/kde4/kstars.desktop
+%{_kde4_datadir}/config.kcfg/kstars.kcfg
+%{_kde4_configdir}/kstars.knsrc
+%{_kde4_docdir}/HTML/en/kstars/
+%{_kde4_appsdir}/kstars/
+%{_kde4_iconsdir}/hicolor/*/*/kstars.*
+%{_kde4_iconsdir}/oxygen/*/*/kstars.*
+
 
 %changelog
+* Thu May 08 2008 Rex Dieter <rdieter at fedoraproject.org> 4.0.72-2
+- -kstars subpkg (#432317)
+
 * Thu May 08 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.0.72-1
 - update to 4.0.72
 - use pkgconfig for cfitsio patch now that cfitsio.pc has been fixed
@@ -516,4 +558,4 @@
 - automated rebuild
 
 * Sat May 25 2002 Bernhard Rosenkraenzer <bero at redhat.com>
-- initial RPM
+q initial RPM