rpms/kdeedu/devel kdeedu.spec,1.195,1.196

[Rex Dieter]

Author: rdieter

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

Modified Files:
	kdeedu.spec 
Log Message:
* Sat Aug 01 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.0-2
- move kalziumuiwidgets.so designer plugin to -libs
- tighten -libs deps using %?_isa
- %check: desktop-file-validate



Index: kdeedu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeedu/devel/kdeedu.spec,v
retrieving revision 1.195
retrieving revision 1.196
diff -u -p -r1.195 -r1.196
--- kdeedu.spec	29 Jul 2009 22:51:49 -0000	1.195
+++ kdeedu.spec	1 Aug 2009 23:52:25 -0000	1.196
@@ -7,7 +7,7 @@
 Name:    kdeedu
 Summary: Educational/Edutainment applications
 Version: 4.3.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv2
 Group:	 Amusements/Games
@@ -54,7 +54,7 @@ BuildRequires: xplanet
 #Experimental Python binding support for the Marble library. To activate it pass -DEXPERIMENTAL_PYTHON_BINDINGS=TRUE to cmake.
 
 %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
-Requires: %{name}-libs = %{version}-%{release}
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 # split pkgs, (temporary?) upgrade path -- Rex
 Requires: %{name}-kstars = %{version}-%{release}
 %if 0%{?fedora} < 12
@@ -91,9 +91,9 @@ Group:   System Environment/Libraries
 %package devel
 Group:    Development/Libraries
 Summary:  Developer files for %{name}
-Requires: %{name}-libs = %{version}-%{release}
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 # libmarble
-Requires: %{name}-marble = %{version}-%{release}
+Requires: %{name}-marble%{?_isa} = %{version}-%{release}
 Obsoletes: kdeedu4-devel < %{version}-%{release}
 Provides:  kdeedu4-devel = %{version}-%{release}
 # http://bugzilla.redhat.com/394011
@@ -106,7 +106,7 @@ Requires: kdelibs4-devel
 %package kstars
 Group:   Amusements/Games
 Summary: Desktop Planetarium
-Requires: %{name}-libs = %{version}-%{release}
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 #Requires(hint): xplanet
 %description kstars
 %{summary}.
@@ -174,6 +174,12 @@ rm -f %{buildroot}%{_kde4_appsdir}/khang
 rm -f %{buildroot}%{_kde4_appsdir}/blinken/fonts/steve.ttf
 
 
+%check
+for f in %{buildroot}%{_kde4_datadir}/applications/kde4/*.desktop ; do
+  desktop-file-validate $f
+done
+
+
 %post
 touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
 touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null ||:
@@ -291,7 +297,6 @@ rm -rf %{buildroot}
 %{_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
@@ -366,6 +371,9 @@ rm -rf %{buildroot}
 %{_kde4_libdir}/libkeduvocdocument.so.*
 %{_kde4_libdir}/libkiten.so.*
 %{_kde4_libdir}/libscience.so.*
+# needed here for multilib'd runtime
+%{_kde4_libdir}/kde4/plugins/designer/kalziumuiwidgets.so
+
 
 %files devel
 %defattr(-,root,root,-)
@@ -450,6 +458,11 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sat Aug 01 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.0-2
+- move kalziumuiwidgets.so designer plugin to -libs
+- tighten -libs deps using %%?_isa
+- %%check: desktop-file-validate
+
 * Thu Jul 30 2009 Than Ngo <than at redhat.com> - 4.3.0-1
 - 4.3.0