rpms/kdeedu/F-9 .cvsignore,1.51,1.52 kdeedu.spec,1.118,1.119
Rex Dieter
rdieter at fedoraproject.org
Wed Mar 25 14:25:47 UTC 2009
Author: rdieter
Update of /cvs/pkgs/rpms/kdeedu/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1559
Modified Files:
.cvsignore kdeedu.spec
Log Message:
* Tue Mar 24 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.1-2
- -marble: Requires: kdeedu-libs ... (f10-, #487550)
- libanalitza should go into-math subpkg (#491867)
- include designer plugins in runtime (not -devel)
- optimize scriptlets
- -math: move 'Obsoletes/Provides: kalgebra' here
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdeedu/F-9/.cvsignore,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- .cvsignore 5 Feb 2009 14:04:56 -0000 1.51
+++ .cvsignore 25 Mar 2009 14:25:17 -0000 1.52
@@ -1 +1 @@
-kdeedu-4.2.0.tar.bz2
+kdeedu-4.2.1.tar.bz2
Index: kdeedu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeedu/F-9/kdeedu.spec,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -r1.118 -r1.119
--- kdeedu.spec 27 Feb 2009 16:44:21 -0000 1.118
+++ kdeedu.spec 25 Mar 2009 14:25:17 -0000 1.119
@@ -14,7 +14,7 @@
Name: kdeedu
Summary: Educational/Edutainment applications
Version: 4.2.1
-Release: 1%{?dist}
+Release: 2%{?dist}
License: GPLv2
Group: Amusements/Games
@@ -25,10 +25,6 @@
Patch1: kdeedu-4.2.0-indi_nodrivers.patch
Patch2: kdeedu-4.2.0-gcc44.patch
-# http://bugzilla.redhat.com/371121
-Obsoletes: kalgebra < 1:0.7-7
-Provides: kalgebra = 1:0.7-7
-
Obsoletes: kdeedu4 < %{version}-%{release}
Provides: kdeedu4 = %{version}-%{release}
@@ -75,9 +71,6 @@
Requires: dustin-dustismo-roman-fonts
Requires: dustin-domestic-manners-fonts
-Requires(post): xdg-utils
-Requires(postun): xdg-utils
-
%description
Educational/Edutainment applications:
* blinken: Simon Says Game
@@ -118,29 +111,31 @@
Group: Amusements/Games
Summary: Desktop Planetarium
Requires: %{name}-libs = %{version}-%{release}
-Requires(post): xdg-utils
-Requires(postun): xdg-utils
%description kstars
%{summary}.
%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
+# 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}
-Requires(post): xdg-utils
-Requires(postun): xdg-utils
%description marble
%{summary}.
-
%package math
Group: Amusements/Games
Summary: Math applications
-Requires: %{name}-libs = %{version}-%{release}
-Requires(post): xdg-utils
-Requires(postun): xdg-utils
+# http://bugzilla.redhat.com/371121
+Obsoletes: kalgebra < 1:0.7-7
+Provides: kalgebra = 1:0.7-7
Provides: kdeedu4-math = %{version}-%{release}
%description math
Educational/Edutainment Math applications:
@@ -172,7 +167,7 @@
# #unpackaged files
# omit stuff for which there isn't a clear public API
-rm -f %{buildroot}%{_kde4_libdir}/lib{SatLib,analitza,compoundviewer,htmesh,sbigudrv}.{a,so}
+rm -f %{buildroot}%{_kde4_libdir}/lib{SatLib,analitza,avogadro-kalzium,compoundviewer,htmesh,sbigudrv}.{a,so}
# omit dustismo roman font
rm -f %{buildroot}%{_kde4_appsdir}/khangman/fonts/Dustismo_Roman.ttf
@@ -183,38 +178,66 @@
%post
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
-xdg-desktop-menu forceupdate 2> /dev/null || :
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null ||:
+
+%posttrans
+update-desktop-database -q &> /dev/null ||:
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null ||:
%postun
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
-xdg-desktop-menu forceupdate 2> /dev/null || :
+if [ $1 -eq 0 ] ; then
+ update-desktop-database -q &> /dev/null ||:
+ touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+ touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null ||:
+ gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+ gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null ||:
+fi
%post libs -p /sbin/ldconfig
%postun libs -p /sbin/ldconfig
%post kstars
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+
+%posttrans kstars
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
%postun kstars
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+if [ $1 -eq 0 ] ; then
+ touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+ gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+fi
%post marble
/sbin/ldconfig
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+
+%posttrans marble
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
%postun marble
/sbin/ldconfig
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+if [ $1 -eq 0 ] ; then
+ touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+ gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+fi
%post math
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+
+%posttrans math
+update-desktop-database -q &> /dev/null
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
%postun math
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+if [ $1 -eq 0 ] ; then
+ update-desktop-database -q &> /dev/null ||:
+ touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+ gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+fi
%clean
@@ -262,18 +285,16 @@
%{_kde4_datadir}/kde4/services/plasma-dataengine-kalzium.desktop
%{_kde4_datadir}/kde4/services/plasma_didyouknow.desktop
-%{_kde4_libdir}/kde4/plasma_applet_kalgebra.so
%{_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
-# kalgebra
-%{_kde4_libdir}/libanalitza.so.*
# kalzium
%{_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
@@ -355,13 +376,11 @@
%{_kde4_includedir}/libkdeedu/
%{_kde4_includedir}/libkiten/
%{_includedir}/marble/
-%{_kde4_libdir}/libavogadro-kalzium.so
%{_kde4_libdir}/libkdeedu*.so
%{_kde4_libdir}/libkeduvocdocument.so
%{_kde4_libdir}/libkiten.so
%{_kde4_libdir}/libscience.so
%{_kde4_libdir}/libmarble*.so
-%{_kde4_libdir}/kde4/plugins/designer/kalziumuiwidgets.so
%files kstars
%defattr(-,root,root,-)
@@ -388,7 +407,7 @@
%{_kde4_libdir}/kde4/libmarble_part.so
%{_kde4_libdir}/kde4/plugins/marble/
%{_kde4_iconsdir}/hicolor/*/*/marble.*
-# worldclock links against libmarblewidget, hack, include here
+# worldclock links against libmarblewidget, include here
%{_kde4_libdir}/kde4/plasma_applet_worldclock.so
%{_kde4_datadir}/kde4/services/plasma-applet-kworldclock.desktop
@@ -403,6 +422,8 @@
%{_kde4_bindir}/pykig.*
%{_kde4_libdir}/kde4/kigpart.*
%{_kde4_libdir}/kde4/libkmplotpart.*
+%{_kde4_libdir}/kde4/plasma_applet_kalgebra.so
+%{_kde4_libdir}/libanalitza.so.*
%{_kde4_datadir}/applications/kde4/kalgebra.desktop
%{_kde4_datadir}/applications/kde4/kbruch.desktop
%{_kde4_datadir}/applications/kde4/kig.desktop
@@ -432,7 +453,14 @@
%changelog
-* Fri Feb 27 2009 Lukáš Tinkl <ltinkl at redhat.com> - 4.2.1-1
+* Tue Mar 24 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.1-2
+- -marble: Requires: kdeedu-libs ... (f10-, #487550)
+- libanalitza should go into-math subpkg (#491867)
+- include designer plugins in runtime (not -devel)
+- optimize scriptlets
+- -math: move 'Obsoletes/Provides: kalgebra' here
+
+* Fri Feb 27 2009 Than Ngo <than at redhat.com> - 4.2.1-1
- 4.2.1
* Thu Feb 26 2009 Than Ngo <than at redhat.com> 4.2.0-9
More information about the fedora-extras-commits
mailing list