rpms/kdebase-workspace/devel kdebase-workspace.spec,1.287,1.288
Kevin Kofler
kkofler at fedoraproject.org
Mon Sep 14 18:36:37 UTC 2009
Author: kkofler
Update of /cvs/pkgs/rpms/kdebase-workspace/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18534/devel
Modified Files:
kdebase-workspace.spec
Log Message:
* Mon Sep 14 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.1-4
- drop PolicyKit 0.9 support (PolicyKit-kde) on F12+/EL
Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.287
retrieving revision 1.288
diff -u -p -r1.287 -r1.288
--- kdebase-workspace.spec 12 Sep 2009 22:43:45 -0000 1.287
+++ kdebase-workspace.spec 14 Sep 2009 18:36:36 -0000 1.288
@@ -1,3 +1,6 @@
+%if 0%{?fedora} && 0%{?fedora} < 12
+%define with_polkit_09 1
+%endif
%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
@@ -5,7 +8,7 @@ Summary: K Desktop Environment - Workspa
Name: kdebase-workspace
Version: 4.3.1
-Release: 3%{?dist}
+Release: 4%{?dist}
Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
License: GPLv2
Group: User Interface/Desktops
@@ -37,7 +40,12 @@ Patch16: kdebase-workspace-4.3.0-battery
# moving to non-multilib hack
Obsoletes: kdebase-workspace < 4.3.0-2
+%if 0%{?with_polkit_09}
Requires: PolicyKit-authentication-agent
+%else
+Obsoletes: PolicyKit-kde < %{version}-%{release}
+#Obsoletes: PolicyKit-kde-libs < %{version}-%{release}
+%endif
# kdmtheme's functionality is now provided by kdebase-workspace itself
Obsoletes: kdmtheme < 1.3
@@ -67,7 +75,9 @@ BuildRequires: lm_sensors-devel
%endif
BuildRequires: NetworkManager-devel
BuildRequires: pam-devel
+%if 0%{?with_polkit_09}
BuildRequires: polkit-qt-devel
+%endif
BuildRequires: qimageblitz-devel
BuildRequires: soprano-devel
BuildRequires: python-devel
@@ -543,6 +553,7 @@ fi
%{_kde4_datadir}/kde4/services/plasma-applet-ggl*
%{_kde4_datadir}/kde4/services/*googlegadgets.desktop
+%if 0%{?with_polkit_09}
%files -n PolicyKit-kde
%defattr(-,root,root,-)
%{_kde4_bindir}/polkit-kde-authorization
@@ -555,6 +566,7 @@ fi
#files -n PolicyKit-kde-libs
#defattr(-,root,root,-)
%{_kde4_libdir}/libpolkitkdeprivate.so.4*
+%endif
%files python-applet
%defattr(-,root,root,-)
@@ -571,6 +583,9 @@ fi
%changelog
+* Mon Sep 14 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.1-4
+- drop PolicyKit 0.9 support (PolicyKit-kde) on F12+/EL
+
* Sat Sep 12 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-3
- -python-applet: Provides: plasma-scriptengine-python
- Requires: system-ksplash-theme (f12+,rhel6+)
More information about the fedora-extras-commits
mailing list