rpms/kdepim/devel kdepim.spec,1.228,1.229

[Rex Dieter]

Author: rdieter

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

Modified Files:
	kdepim.spec 
Log Message:
* Sat Aug 08 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-2
- -libs: move designer plugins here
- %check: desktop-file-validate
- don't own %{_kde4_appsdir}/kconf_update/



Index: kdepim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/devel/kdepim.spec,v
retrieving revision 1.228
retrieving revision 1.229
diff -u -p -r1.228 -r1.229
--- kdepim.spec	30 Jul 2009 08:44:49 -0000	1.228
+++ kdepim.spec	9 Aug 2009 04:17:38 -0000	1.229
@@ -6,7 +6,7 @@ Name:    kdepim
 Summary: PIM (Personal Information Manager) applications
 Epoch:   6
 Version: 4.3.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv2
 Group:   Applications/Productivity
@@ -22,7 +22,7 @@ Requires: %{name}-libs = %{?epoch:%{epoc
 
 # Upgrade path
 %if 0%{?fedora} < 12
-Requires: kdepim-runtime >= %{version}
+Requires: kdepim-runtime%{?_isa} >= %{version}
 %endif
 
 BuildRequires: akonadi-devel
@@ -73,7 +73,7 @@ Requires(hint): spambayes
 Summary: Development files for %{name}
 Group: Development/Libraries
 Provides: kdepim4-devel = %{version}-%{release}
-Requires: %{name}-libs = %{epoch}:%{version}-%{release}
+Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
 Requires: kdelibs4-devel
 %description devel
 %{summary}.
@@ -124,6 +124,12 @@ done
 popd
 
 
+%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 ||:
@@ -161,8 +167,26 @@ rm -rf %{buildroot}
 %endif
 %{_kde4_libdir}/kde4/*.so
 %{_kde4_libdir}/strigi/*.so
-%{_kde4_datadir}/applications/kde4/*
-%{_kde4_appsdir}/*
+%{_kde4_datadir}/applications/kde4/*.desktop
+%{_kde4_appsdir}/akregator/
+%{_kde4_appsdir}/kaddressbook/
+%{_kde4_appsdir}/kalarm/
+%{_kde4_appsdir}/kconf_update/*
+%{_kde4_appsdir}/kdepimwidgets/
+%{_kde4_appsdir}/kjots/
+%{_kde4_appsdir}/kleopatra/
+%{_kde4_appsdir}/kmail/
+%{_kde4_appsdir}/knode/
+%{_kde4_appsdir}/knotes/
+%{_kde4_appsdir}/konsolekalendar/
+%{_kde4_appsdir}/kontact/
+%{_kde4_appsdir}/korgac/
+%{_kde4_appsdir}/korganizer/
+%{_kde4_appsdir}/kpilot/
+%{_kde4_appsdir}/ktimetracker/
+%{_kde4_appsdir}/kwatchgnupg/
+%{_kde4_appsdir}/libkdepim/
+%{_kde4_appsdir}/libkleopatra/
 %{_datadir}/dbus-1/interfaces/*.xml
 %{_kde4_datadir}/autostart/*
 %{_kde4_datadir}/config/*rc
@@ -176,6 +200,7 @@ rm -rf %{buildroot}
 %files libs
 %defattr(-,root,root,-)
 %{_kde4_libdir}/lib*.so.*
+%{_kde4_libdir}/kde4/plugins/designer/*.so
 
 %files devel
 %defattr(-,root,root,-)
@@ -184,10 +209,14 @@ rm -rf %{buildroot}
 %if 0%{?_with_pilot_link:1}
 %exclude %{_kde4_libdir}/libkpilot_*.so
 %endif
-%{_kde4_libdir}/kde4/plugins/designer/*
 
 
 %changelog
+* Sat Aug 08 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-2
+- -libs: move designer plugins here
+- %%check: desktop-file-validate
+- don't own %%{_kde4_appsdir}/kconf_update/
+
 * Thu Jul 30 2009 Than Ngo <than at redhat.com> - 4.3.0-1
 - 4.3.0