rpms/kdebase-workspace/devel kdebase-workspace.spec,1.332,1.333

[Rex Dieter]

Author: rdieter

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

Modified Files:
	kdebase-workspace.spec 
Log Message:
polkit_09 buildfixes



Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.332
retrieving revision 1.333
diff -u -p -r1.332 -r1.333
--- kdebase-workspace.spec	19 Dec 2009 05:17:19 -0000	1.332
+++ kdebase-workspace.spec	27 Dec 2009 10:47:51 -0000	1.333
@@ -1,6 +1,8 @@
 
-%if 0%{?fedora} && 0%{?fedora} < 12
-%define with_polkit_09 1
+%if 0%{?fedora} > 11 ||  0%{?rhel} > 5 
+%define polkit_1 1
+%else
+%define polkit_09 1
 %endif
 
 %{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
@@ -53,7 +55,7 @@ Obsoletes: kdebase-workspace < 4.3.0-2
 # replace with polkit-kde when it's ready
 Requires: PolicyKit-authentication-agent
 
-%if ! 0%{?with_polkit_09}
+%if 0%{?polkit1}
 Obsoletes: PolicyKit-kde < %{version}-%{release}
 # if/when we actually create this one:
 #Obsoletes: PolicyKit-kde-libs < %{version}-%{release}
@@ -92,7 +94,7 @@ BuildRequires: lm_sensors-devel
 %endif
 BuildRequires: NetworkManager-devel
 BuildRequires: pam-devel
-%if 0%{?with_polkit_09}
+%if 0%{?polkit_09}
 BuildRequires: polkit-qt-devel
 %endif
 BuildRequires: qimageblitz-devel
@@ -490,6 +492,7 @@ fi
 %{_kde4_libdir}/libsystemsettingsview.so
 %{_kde4_libdir}/kconf_update_bin/*
 %{_mandir}/man1/plasmaengineexplorer.1*
+
 %if 0%{?fedora}
 # googlegadgets
 %exclude %{_kde4_libdir}/kde4/plasma_package_ggl.so
@@ -505,7 +508,23 @@ fi
 %exclude %{_kde4_datadir}/kde4/services/plasma-engine-akonadi.desktop
 %exclude %{_kde4_libdir}/kde4/plasma_engine_calendar.so
 %exclude %{_kde4_datadir}/kde4/services/plasma-dataengine-calendar.desktop
-%if 0%{?with_polkit_09}
+%if 0%{?polkit_09}
+%{_kde4_bindir}/kfontinst
+%{_kde4_bindir}/kfontview
+%{_kde4_libdir}/kde4/fontthumbnail.so
+%{_kde4_libdir}/kde4/kfontviewpart.so
+%{_kde4_libdir}/kde4/kio_fonts.so
+%{_kde4_libdir}/strigi/strigita_font.so
+%{_kde4_libexecdir}/fontinst
+%{_kde4_libexecdir}/fontinst_x11
+%{_kde4_libexecdir}/kfontprint
+%{_datadir}/PolicyKit/policy/org.kde.fontinst.policy
+%{_datadir}/PolicyKit/policy/org.kde.kcontrol.kcmclock.policy
+%{_datadir}/PolicyKit/policy/org.kde.ksysguard.processlisthelper.policy
+%{_kde4_appsdir}/kfontinst/
+%{_kde4_appsdir}/kfontview/
+%{_kde4_appsdir}/konqsidebartng/virtual_folders/services/fonts.desktop
+
 # PolicyKit-kde
 %exclude %{_kde4_sharedir}/kde4/services/kcm_pkk_authorization.desktop
 %exclude %{_kde4_datadir}/dbus-1/services/org.kde.PolicyKit.service
@@ -516,7 +535,7 @@ fi
 %files libs
 %defattr(-,root,root,-)
 %{_kde4_libdir}/lib*.so.*
-%if 0%{?with_polkit_09}
+%if 0%{?polkit_09}
 %exclude %{_kde4_libdir}/libpolkitkdeprivate.so.4*
 %endif
 %{_kde4_libdir}/libplasma_applet-system-monitor.so
@@ -583,7 +602,7 @@ fi
 %{_kde4_datadir}/kde4/services/*googlegadgets.desktop
 %endif
 
-%if 0%{?with_polkit_09}
+%if 0%{?polkit_09}
 %files -n PolicyKit-kde
 %defattr(-,root,root,-)
 %{_kde4_bindir}/polkit-kde-authorization