rpms/kdebase-workspace/devel kdebase-workspace.spec,1.334,1.335

[Kevin Kofler]

Author: kkofler

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

Modified Files:
	kdebase-workspace.spec 
Log Message:
* Tue Jan 05 2010 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.85-3
- F13+: don't Obsoletes: PolicyKit-kde, let polkit-kde obsolete it
- F13+: explicitly require polkit-kde instead of PolicyKit-authentication-agent


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.334
retrieving revision 1.335
diff -u -p -r1.334 -r1.335
--- kdebase-workspace.spec	3 Jan 2010 05:25:25 -0000	1.334
+++ kdebase-workspace.spec	5 Jan 2010 15:20:19 -0000	1.335
@@ -10,7 +10,7 @@
 Summary: KDE Workspace
 Name:    kdebase-workspace
 Version: 4.3.85
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: GPLv2
 Group:   User Interface/Desktops
@@ -53,10 +53,14 @@ Patch51: kdebase-workspace-4.3.85-bright
 # moving to non-multilib hack
 Obsoletes: kdebase-workspace < 4.3.0-2
 
-# replace with polkit-kde when it's ready
+%if 0%{?polkit1} && 0%{fedora} > 12
+Requires: polkit-kde
+%else
 Requires: PolicyKit-authentication-agent
+%endif
 
-%if 0%{?polkit1}
+%if 0%{?polkit1} && 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}
@@ -634,6 +638,10 @@ fi
 
 
 %changelog
+* Tue Jan 05 2010 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.85-3
+- F13+: don't Obsoletes: PolicyKit-kde, let polkit-kde obsolete it
+- F13+: explicitly require polkit-kde instead of PolicyKit-authentication-agent
+
 * Sat Jan 02 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.3.85-2
 - startkde: disable MALLOC_CHECK_