rpms/kdebase-workspace/devel kdebase-workspace.spec,1.324,1.325

[Rex Dieter]

Author: rdieter

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

Modified Files:
	kdebase-workspace.spec 
Log Message:
* Wed Dec 09 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.80-3
- BR: polkit-qt-devel (f13)
- Obsoletes: polkit-qt (f12 only)



Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.324
retrieving revision 1.325
diff -u -p -r1.324 -r1.325
--- kdebase-workspace.spec	9 Dec 2009 22:06:32 -0000	1.324
+++ kdebase-workspace.spec	9 Dec 2009 23:09:51 -0000	1.325
@@ -7,7 +7,7 @@
 Summary: K Desktop Environment - Workspace
 Name: kdebase-workspace
 Version: 4.3.80
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
 License: GPLv2
@@ -55,11 +55,11 @@ Requires: PolicyKit-authentication-agent
 
 %if ! 0%{?with_polkit_09}
 Obsoletes: PolicyKit-kde < %{version}-%{release}
-# if/when we actually create this one:
-#Obsoletes: PolicyKit-kde-libs < %{version}-%{release}
+%if 0%{?fedora} == 12
 Obsoletes: polkit-qt < 0.10
 Obsoletes: polkit-qt-examples < 0.10
 %endif
+%endif
 
 # kdmtheme's functionality is now provided by kdebase-workspace itself
 Obsoletes: kdmtheme < 1.3
@@ -94,9 +94,7 @@ 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: shared-desktop-ontologies-devel
 BuildRequires: soprano-devel
@@ -618,6 +616,10 @@ fi
 
 
 %changelog
+* Wed Dec 09 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.80-3
+- BR: polkit-qt-devel (f13)
+- Obsoletes: polkit-qt (f12 only)
+
 * Wed Dec 09 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.80-2
 - BR: shared-desktop-ontologies-devel