rpms/kdebase-workspace/devel kdebase-workspace.spec,1.273,1.274

[Rex Dieter]

Author: rdieter

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

Modified Files:
	kdebase-workspace.spec 
Log Message:
* Thu Aug 27 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-12
- PolicyKit-kde subpkg (#519172, #519654)



Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.273
retrieving revision 1.274
diff -u -p -r1.273 -r1.274
--- kdebase-workspace.spec	26 Aug 2009 14:55:14 -0000	1.273
+++ kdebase-workspace.spec	27 Aug 2009 14:18:30 -0000	1.274
@@ -5,7 +5,7 @@ Summary: K Desktop Environment - Workspa
 Name: kdebase-workspace
 Version: 4.3.0
 
-Release: 11%{?dist}
+Release: 12%{?dist}
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
 License: GPLv2
 Group: User Interface/Desktops
@@ -37,11 +37,7 @@ Patch16: kdebase-workspace-4.3.0-battery
 # moving to non-multilib hack
 Obsoletes: kdebase-workspace < 4.3.0-2
 
-Obsoletes: PolicyKit-kde < 4.3.0-100
-Provides:  PolicyKit-kde = %{version}-100
-# This can be used by apps which want to use the PolicyKit
-# frontend implementation of the desktop they are running under
-Provides: PolicyKit-authentication-agent
+Requires: PolityKit-authentication-agent
 
 # FIXME: Should we restore this now that kdebase no longer depends on kdebase-workspace?
 %if 0%{?fedora} == 9
@@ -198,6 +194,15 @@ BuildArch: noarch
 %description -n oxygen-cursor-themes
 %{summary}.
 
+%package -n PolicyKit-kde
+Summary: PolicyKit integration for the KDE desktop
+Group: System Environment/Libraries
+# This can be used by apps which want to use the PolicyKit
+# frontend implementation of the desktop they are running under
+Provides: PolicyKit-authentication-agent
+%description -n PolicyKit-kde
+This package provides a PolicyKit Authentication Frontend for KDE
+
 %package googlegadgets
 Summary: Google Desktop Gadgets
 Group: User Interface/Desktops
@@ -279,6 +284,9 @@ pushd %{buildroot}%{_kde4_appsdir}/kdm/f
 ln -sf ../pics/users/%{default_face_icon} .default.face.icon
 popd
 
+## unpackaged files
+rm -fv %{buildroot}%{_kde4_libdir}/libpolkitkdeprivate*.so
+
 
 %check
 for f in %{buildroot}%{_kde4_datadir}/applications/kde4/*.desktop ; do
@@ -312,6 +320,10 @@ fi
 
 %postun libs -p /sbin/ldconfig
 
+%post -n PolicyKit-kde -p /sbin/ldconfig
+
+%postun -n PolicyKit-kde -p /sbin/ldconfig
+
 
 %files
 %defattr(-,root,root,-)
@@ -340,7 +352,6 @@ fi
 %{_kde4_bindir}/ksystraycmd
 %{_kde4_bindir}/kwin*
 %{_kde4_bindir}/kxkb
-%{_kde4_bindir}/polkit-kde-authorization
 %{_kde4_bindir}/plasma-desktop
 %{_kde4_bindir}/plasma-overlay
 %{_kde4_bindir}/plasmaengineexplorer
@@ -391,6 +402,7 @@ fi
 
 %{_kde4_datadir}/kde4/services/*
 %exclude %{_kde4_datadir}/kde4/services/kdm.desktop
+%exclude %{_kde4_sharedir}/kde4/services/kcm_pkk_authorization.desktop
 %{_kde4_datadir}/kde4/servicetypes/*
 %{_kde4_datadir}/sounds/pop.wav
 %{_kde4_datadir}/autostart/klipper.desktop
@@ -400,6 +412,8 @@ fi
 %{_kde4_datadir}/applications/kde4/*
 %{_datadir}/dbus-1/interfaces/*.xml
 %{_datadir}/dbus-1/services/*.service
+%exclude %{_kde4_datadir}/dbus-1/services/org.kde.PolicyKit.service
+%exclude %{_kde4_datadir}/dbus-1/services/kde-org.freedesktop.PolicyKit.AuthenticationAgent.service
 %{_kde4_datadir}/config.kcfg/*
 %{_datadir}/xsessions/*.desktop
 %{_kde4_docdir}/HTML/en/kcontrol/
@@ -407,7 +421,6 @@ fi
 %{_kde4_docdir}/HTML/en/kmenuedit/
 %{_kde4_docdir}/HTML/en/ksysguard/
 %{_kde4_docdir}/HTML/en/kxkb/
-%{_kde4_docdir}/HTML/en/PolicyKit-kde/
 %{_kde4_docdir}/HTML/en/plasma/
 %{_kde4_docdir}/HTML/en/systemsettings/
 %{_kde4_iconsdir}/hicolor/*/*/*
@@ -418,6 +431,7 @@ fi
 %{_kde4_libdir}/kde4/ion_*.so
 %{_kde4_libdir}/kde4/kcm_*.so
 %exclude %{_kde4_libdir}/kde4/kcm_kdm.so
+%exclude %{_kde4_libdir}/kde4/kcm_pkk_authorization.so
 %{_kde4_libdir}/kde4/kded_*.so
 %{_kde4_libdir}/kde4/kfontviewpart.so
 %{_kde4_libdir}/kde4/kio_fonts.so
@@ -442,7 +456,6 @@ fi
 %{_kde4_libexecdir}/kio_fonts_helper
 %{_kde4_libexecdir}/krootimage
 %{_kde4_libexecdir}/kscreenlocker
-%{_kde4_libexecdir}/polkit-kde-manager
 %{_kde4_libexecdir}/test_kcm_xinerama
 %{_libdir}/strigi/
 %{_kde4_libdir}/libkdeinit*.so
@@ -467,6 +480,7 @@ fi
 %files libs
 %defattr(-,root,root,-)
 %{_kde4_libdir}/lib*.so.*
+%exclude %{_kde4_libdir}/libpolkitkdeprivate.so.4*
 %{_kde4_libdir}/libplasma_applet-system-monitor.so
 %{_kde4_libdir}/kde4/plugins/designer/ksysguardwidgets.so
 %{_kde4_libdir}/kde4/plugins/designer/ksysguardlsofwidgets.so
@@ -502,7 +516,6 @@ fi
 %{_kde4_appsdir}/kdm/
 %{_kde4_datadir}/kde4/services/kdm.desktop
 
-
 %files -n ksysguardd
 %defattr(-,root,root,-)
 %config(noreplace) %{_kde4_sysconfdir}/ksysguarddrc
@@ -529,6 +542,20 @@ fi
 %{_kde4_datadir}/kde4/services/plasma-applet-ggl*
 %{_kde4_datadir}/kde4/services/*googlegadgets.desktop
 
+%files -n PolicyKit-kde
+%defattr(-,root,root,-)
+%{_kde4_bindir}/polkit-kde-authorization
+%{_kde4_libdir}/libpolkitkdeprivate.so.4*
+%{_kde4_libdir}/kde4/kcm_pkk_authorization.so
+%{_kde4_libexecdir}/polkit-kde-manager
+%{_kde4_datadir}/dbus-1/services/org.kde.PolicyKit.service
+%{_kde4_datadir}/dbus-1/services/kde-org.freedesktop.PolicyKit.AuthenticationAgent.service
+%{_kde4_sharedir}/kde4/services/kcm_pkk_authorization.desktop
+%{_kde4_docdir}/HTML/en/PolicyKit-kde/
+#files -n PolicyKit-kde-libs
+#defattr(-,root,root,-)
+%{_kde4_libdir}/libpolkitkdeprivate.so.4*
+
 %files python-applet
 %defattr(-,root,root,-)
 %{python_sitearch}/PyKDE4/plasmascript.py*
@@ -544,6 +571,9 @@ fi
 
 
 %changelog
+* Thu Aug 27 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-12
+- PolicyKit-kde subpkg (#519172, #519654)
+
 * Wed Aug 26 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-11
 - Requires: system-backgrounds-kde (f12+)