rpms/kdebase-workspace/devel kdebase-workspace.spec,1.257,1.258

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-workspace/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32319

Modified Files:
	kdebase-workspace.spec 
Log Message:
* Sat Aug 01 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-2
- move designer pluginsn to -devel, fixes
  Multilib conflicts for index.cache.bz2 (#515088)
- tighten -libs deps, using %{?_isa}
- %check: desktop-file-validate



Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.257
retrieving revision 1.258
diff -u -p -r1.257 -r1.258
--- kdebase-workspace.spec	29 Jul 2009 22:29:36 -0000	1.257
+++ kdebase-workspace.spec	1 Aug 2009 23:10:39 -0000	1.258
@@ -4,7 +4,7 @@ Summary: K Desktop Environment - Workspa
 Name: kdebase-workspace
 Version: 4.3.0
 
-Release: 1%{?dist}
+Release: 2%{?dist}
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
 License: GPLv2
 Group: User Interface/Desktops
@@ -31,6 +31,9 @@ Patch15: kdebase-workspace-4.2.0-kio_sys
 
 # trunk
 
+# moving to non-multilib hack
+Obsoletes: kdebase-workspace < 4.3.0-2
+
 Obsoletes: PolicyKit-kde < %{version}-100 
 Provides:  PolicyKit-kde = %{version}-100
 # This can be used by apps which want to use the PolicyKit
@@ -58,6 +61,7 @@ Obsoletes: guidance-power-manager < 4.3
 BuildRequires: akonadi-devel
 BuildRequires: bluez-libs-devel
 BuildRequires: ConsoleKit-devel
+BuildRequires: desktop-file-utils
 BuildRequires: google-gadgets-devel >= 0.10.5
 BuildRequires: glib2-devel
 BuildRequires: gpsd-devel
@@ -79,7 +83,7 @@ BuildRequires: qedje-devel >= 0.4.0
 # used for the Logitech mouse KCM, disabled until #399931 is fixed
 # BuildRequires: libusb-devel
 
-Requires: %{name}-libs = %{version}-%{release}
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
 
 # would much rather these deps be elsewhere,
@@ -134,7 +138,7 @@ Summary:  Development files for %{name}
 Obsoletes: PolicyKit-kde-devel < 4.2.85
 Provides:  PolicyKit-kde-devel = %{version}-%{release}
 Provides: solid-bluetooth-devel = 4.3-0.1
-Requires: %{name}-libs = %{version}-%{release}
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 Requires: kdelibs4-devel
 %description devel
 %{summary}.
@@ -256,6 +260,12 @@ ln -sf ../pics/users/%{default_face_icon
 popd
 
 
+%check
+for f in %{buildroot}%{_kde4_datadir}/applications/kde4/*.desktop ; do
+  desktop-file-validate $f
+done
+
+
 %clean
 rm -rf %{buildroot}
 
@@ -406,8 +416,6 @@ fi
 %{_kde4_libdir}/kde4/plasma_package*_*.so
 %{_kde4_libdir}/kde4/plasma_wallpaper_*.so
 %{_kde4_libdir}/kde4/solid_*.so
-%{_kde4_libdir}/kde4/plugins/designer/ksysguardwidgets.so
-%{_kde4_libdir}/kde4/plugins/designer/ksysguardlsofwidgets.so
 %{_kde4_libexecdir}/kcheckpass
 %{_kde4_libexecdir}/kcmdatetimehelper
 %{_kde4_libexecdir}/kfontprint
@@ -440,6 +448,8 @@ fi
 %defattr(-,root,root,-)
 %{_kde4_includedir}/*
 %{_kde4_libdir}/lib*.so
+%{_kde4_libdir}/kde4/plugins/designer/ksysguardwidgets.so
+%{_kde4_libdir}/kde4/plugins/designer/ksysguardlsofwidgets.so
 %{_kde4_appsdir}/cmake/modules/*.cmake
 %{_kde4_libdir}/cmake/KDE4Workspace-%{version}/
 %exclude %{_kde4_libdir}/libkdeinit*.so
@@ -447,7 +457,6 @@ fi
 %exclude %{_kde4_libdir}/libplasma_applet-system-monitor.so
 %exclude %{_kde4_libdir}/libsystemsettingsview.so
 
-
 %files wallpapers
 %defattr(-,root,root,-)
 %{_kde4_datadir}/wallpapers/*
@@ -503,6 +512,12 @@ fi
 
 
 %changelog
+* Sat Aug 01 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-2
+- move designer pluginsn to -devel, fixes
+  Multilib conflicts for index.cache.bz2 (#515088)
+- 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