[kdebase-workspace] update %files python scriptengine disabled (for now?) drop old PolicyKit bits

Rex Dieter rdieter at fedoraproject.org
Sun Nov 21 03:55:17 UTC 2010


commit 930f4a9bdbed54406c140332c145f3d594d30dd7
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sat Nov 20 21:55:28 2010 -0600

    update %files
    python scriptengine disabled (for now?)
    drop old PolicyKit bits

 kdebase-workspace.spec |   67 +++++------------------------------------------
 1 files changed, 8 insertions(+), 59 deletions(-)
---
diff --git a/kdebase-workspace.spec b/kdebase-workspace.spec
index cf895a7..4b87ddc 100644
--- a/kdebase-workspace.spec
+++ b/kdebase-workspace.spec
@@ -75,6 +75,9 @@ Patch54: kdebase-workspace-4.5.1-kfontview_dt_validate.patch
 
 ## trunk patches
 
+# python scriptengine temporarily(?) disabled
+Obsoletes: kdebase-workspace-python-applet < 4.5.80
+
 # moving to non-multilib hack
 Obsoletes: kdebase-workspace < 4.3.0-2
 
@@ -87,13 +90,6 @@ Requires: polkit-kde
 Requires: PolicyKit-authentication-agent
 %endif
 
-%if 0%{?polkit_1} && 0%{fedora} < 13
-# polkit-kde has the Obsoletes on F13+
-Obsoletes: PolicyKit-kde < %{version}-%{release}
-# if/when we actually create this one:
-#Obsoletes: PolicyKit-kde-libs < %{version}-%{release}
-%endif
-
 %if ! 0%{?akonadi_subpkg}
 Obsoletes: %{name}-akonadi < %{version}-%{release}
 Provides:  %{name}-akonadi = %{version}-%{release}
@@ -115,7 +111,8 @@ BuildRequires: dbusmenu-qt-devel
 BuildRequires: desktop-file-utils
 %if 0%{?fedora}
 BuildRequires: google-gadgets-devel >= 0.10.5
-BuildRequires: qedje-devel >= 0.4.0
+## disabled?  double check on future releases -- Rex
+#BuildRequires: qedje-devel >= 0.4.0
 BuildRequires: gpsd-devel
 BuildRequires: libcaptury-devel
 %endif
@@ -245,27 +242,6 @@ 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
-# when -libs was born
-#Obsoletes: PolicyKit-kde < 4.3.1-4
-#Requires: PolicyKit-kde-libs%{?_isa} = %{version}-%{release}
-%description -n PolicyKit-kde
-This package provides a PolicyKit Authentication Frontend for KDE
-
-# maybe for 4.3.1-4 ? -- Rex
-%package -n PolicyKit-kde-libs
-Summary: Runtime libraries for PolicyKit-kde 
-Group:   System Environment/Libraries
-Requires: kdelibs4%{?_isa} >= %{version}
-Requires: PolicyKit-kde = %{version}-%{release}
-%description -n PolicyKit-kde-libs
-%{summary}.
-
 %package googlegadgets
 Summary: Google Desktop Gadgets
 Group: User Interface/Desktops
@@ -395,10 +371,6 @@ fi
 
 %postun libs -p /sbin/ldconfig
 
-%post -n PolicyKit-kde -p /sbin/ldconfig
-
-%postun -n PolicyKit-kde -p /sbin/ldconfig
-
 
 %files
 %defattr(-,root,root,-)
@@ -436,7 +408,6 @@ fi
 %{_kde4_bindir}/plasmoidviewer
 %{_kde4_bindir}/plasmawallpaperviewer
 %{_kde4_bindir}/solid-action-desktop-gen
-%{_kde4_bindir}/solid-bluetooth
 %{_kde4_bindir}/solid-network
 %{_kde4_bindir}/solid-powermanagement
 %{_kde4_bindir}/startkde
@@ -521,14 +492,12 @@ fi
 %{_kde4_libdir}/kde4/kded_*.so
 %{_kde4_libdir}/kde4/keyboard_layout_widget.so
 %{_kde4_libdir}/kde4/krunner_*.so
-%{_kde4_libdir}/kde4/kstyle_keramik_config.so
 %{_kde4_libdir}/kde4/kstyle_oxygen_config.so
 %{_kde4_libdir}/kde4/kwin*_*.so
 %{_kde4_libdir}/kde4/plasma_animator_default.so
 %{_kde4_libdir}/kde4/plasma_applet_*.so
 %{_kde4_libdir}/kde4/plasma_containmentactions_*.so
 %if 0%{?fedora}
-%{_kde4_libdir}/kde4/plasma_appletscript_qedje.so
 %{_kde4_libdir}/kde4/plasma-geolocation-gps.so
 %endif
 %{_kde4_libdir}/kde4/plasma_appletscriptengine_dashboard.so
@@ -563,7 +532,7 @@ fi
 %exclude %{_kde4_datadir}/kde4/services/*googlegadgets.desktop
 %endif
 # python widget
-%exclude %{_kde4_datadir}/kde4/services/plasma-scriptengine*python.desktop
+#exclude %{_kde4_datadir}/kde4/services/plasma-scriptengine*python.desktop
 %if 0%{?akonadi_subpkg}
 %exclude %{_kde4_libdir}/kde4/plasma_engine_akonadi.so
 %exclude %{_kde4_datadir}/kde4/services/plasma-engine-akonadi.desktop
@@ -586,13 +555,6 @@ fi
 %{_kde4_appsdir}/kfontview/
 %{_kde4_appsdir}/konqsidebartng/virtual_folders/services/fonts.desktop
 
-%if 0%{?polkit_09}
-# PolicyKit-kde
-%exclude %{_kde4_sharedir}/kde4/services/kcm_pkk_authorization.desktop
-%exclude %{_kde4_datadir}/dbus-1/services/org.kde.PolicyKit.service
-%exclude %{_kde4_datadir}/dbus-1/services/kde-org.freedesktop.PolicyKit.AuthenticationAgent.service
-%exclude %{_kde4_libdir}/kde4/kcm_pkk_authorization.so
-%endif
 
 %files libs
 %defattr(-,root,root,-)
@@ -663,26 +625,13 @@ fi
 %{_kde4_datadir}/kde4/services/*googlegadgets.desktop
 %endif
 
-%if 0%{?polkit_09}
-%files -n PolicyKit-kde
-%defattr(-,root,root,-)
-%{_kde4_bindir}/polkit-kde-authorization
-%{_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*
-%endif
-
+%if 0
 %files python-applet
 %defattr(-,root,root,-)
 %{python_sitearch}/PyKDE4/plasmascript.py*
 %{_kde4_appsdir}/plasma_scriptengine_python
 %{_kde4_datadir}/kde4/services/plasma-scriptengine*python.desktop
+%endif
 
 %if 0%{?akonadi_subpkg}
 %files akonadi


More information about the scm-commits mailing list