rpms/kdeutils/devel kdeutils.spec,1.190,1.191

[Rex Dieter]

Author: rdieter

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

Modified Files:
	kdeutils.spec 
Log Message:
* Sat Aug 01 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-2
- -libs subpkg reborn: Multilib conflicts for index.cache.bz2 (#515087)
- %check: desktop-file-validate



Index: kdeutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeutils/devel/kdeutils.spec,v
retrieving revision 1.190
retrieving revision 1.191
diff -u -p -r1.190 -r1.191
--- kdeutils.spec	30 Jul 2009 10:16:27 -0000	1.190
+++ kdeutils.spec	1 Aug 2009 22:54:55 -0000	1.191
@@ -4,7 +4,7 @@
 Name:           kdeutils
 Epoch:          6
 Version:        4.3.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        K Desktop Environment - Utilities
 
 Group:          Applications/System
@@ -22,7 +22,8 @@ Patch1:         kdeutils-4.2.85-pykde4.p
 
 
 # FIXME/TODO: Tpctl is needed for klaptopdaemon
-BuildRequires:  kdelibs-experimental-devel
+BuildRequires:  desktop-file-utils
+BuildRequires:  kdelibs-experimental-devel >= %{version}
 BuildRequires:  kdepimlibs-devel >= %{version}
 BuildRequires:  plasma-devel >= %{version}
 BuildRequires:  gmp-devel
@@ -32,10 +33,6 @@ BuildRequires:  python-devel python
 BuildRequires:  qca2-devel
 BuildRequires:  qimageblitz-devel
 
-Requires(post): /sbin/ldconfig
-Requires(postun): /sbin/ldconfig
-Requires: kdelibs4 >= %{version}
-
 %if 0%{?printer_applet}
 %if 0%{?fedora} < 11
 # upgrade path so it doesn't get lost
@@ -49,8 +46,10 @@ Provides:       okteta = 0.1.0-1
 Obsoletes:      okteta < 0.1.0-1
 
 Obsoletes: kdeutils-extras < 6:4.0.0
-Obsoletes: kdeutils-libs < 6:4.0.0
 Obsoletes: kdeutils-devel < 6:4.0.0
+Obsoletes: kdeutils < 6:4.3.0-2
+
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 
 %description
 Utilities for the K Desktop Environment.
@@ -69,6 +68,14 @@ Includes:
   * superkaramba
   * sweeper: clean unwanted traces the user leaves on the system
 
+%package libs
+Summary: Runtime libraries for %{name}
+Group:   System Environment/Libraries
+Requires: %{name} = %{version}-%{release}
+Requires: kdelibs4%{?_isa} >= %{version}
+%description libs
+%{summary}.
+
 %package printer-applet
 Summary:  KDE printer applet
 Group:    Applications/System
@@ -111,12 +118,17 @@ rm -f %{buildroot}%{_kde4_libdir}/libkmi
 rm -f %{buildroot}%{_kde4_libdir}/libsuperkaramba.so
 
 
+%check
+for f in %{buildroot}%{_kde4_datadir}/applications/kde4/*.desktop ; do
+  desktop-file-validate $f
+done
+
+
 %clean
 rm -rf %{buildroot}
 
 
 %post
-/sbin/ldconfig
 touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
 touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null ||:
 
@@ -126,7 +138,6 @@ gtk-update-icon-cache %{_kde4_iconsdir}/
 gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null ||:
 
 %postun
-/sbin/ldconfig
 if [ $1 -eq 0 ] ; then
   touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
   touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null ||:
@@ -135,6 +146,10 @@ if [ $1 -eq 0 ] ; then
   update-desktop-database -q &> /dev/null ||:
 fi
 
+%post libs -p /sbin/ldconfig
+
+%postun libs -p /sbin/ldconfig
+
 
 %files
 %defattr(-,root,root,-)
@@ -169,7 +184,7 @@ fi
 %{_kde4_appsdir}/sweeper/
 %{_kde4_datadir}/kde4/services/*
 %{_kde4_datadir}/kde4/servicetypes/*
-%{_kde4_datadir}/applications/kde4/*
+%{_kde4_datadir}/applications/kde4/*.desktop
 %{_kde4_docdir}/HTML/en/*
 %{_kde4_iconsdir}/hicolor/*/apps/*
 %{_kde4_iconsdir}/oxygen/*/*/*
@@ -178,11 +193,14 @@ fi
 %{_kde4_datadir}/autostart/irkick.desktop
 %{_kde4_datadir}/autostart/kgpg.desktop
 %{_kde4_configdir}/*
-%{_kde4_libdir}/lib*.so.*
 %{_kde4_libdir}/libkdeinit*.so
 %{_kde4_libdir}/kde4/*.so
 %{_mandir}/man1/*
 
+%files libs
+%defattr(-,root,root,-)
+%{_kde4_libdir}/lib*.so.*
+
 %if 0%{?printer_applet}
 %files printer-applet
 %defattr(-,root,root,-)
@@ -193,6 +211,10 @@ fi
 
 
 %changelog
+* Sat Aug 01 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-2
+- -libs subpkg reborn: Multilib conflicts for index.cache.bz2 (#515087)
+- %%check: desktop-file-validate
+
 * Thu Jul 30 2009 Than Ngo <than at redhat.com> - 4.3.0-1
 - 4.3.0