rpms/kdebase-workspace/devel kdebase-workspace.spec,1.223,1.224

[Rex Dieter]

Author: rdieter

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

Modified Files:
	kdebase-workspace.spec 
Log Message:
* Wed May 27 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.85-2
- upgrade path broken (F-11+), Obsoletes: guidance-power-manager (#502892)
- drop < F-10 crud, have_bluez3



Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.223
retrieving revision 1.224
diff -u -p -r1.223 -r1.224
--- kdebase-workspace.spec	16 May 2009 23:10:28 -0000	1.223
+++ kdebase-workspace.spec	27 May 2009 16:33:20 -0000	1.224
@@ -1,14 +1,10 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
-%if 0%{?fedora} <= 9
-%define have_bluez3 1
-%endif
-
 Summary: K Desktop Environment - Workspace
 Name: kdebase-workspace
 Version: 4.2.85
 
-Release: 1%{?dist}
+Release: 2%{?dist}
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
 License: GPLv2
 Group: User Interface/Desktops
@@ -55,7 +51,7 @@ Obsoletes: kdmtheme < 1.3
 # -> powerdevil upgrade path
 Obsoletes: kpowersave < 0.7.3-10
 # -> powerdevel upgrade path
-Obsoletes: guidance-power-manager < 4.2.0-10
+Obsoletes: guidance-power-manager < 4.3
 %endif
 
 BuildRequires: bluez-libs-devel
@@ -129,11 +125,7 @@ Group:    Development/Libraries
 Summary:  Development files for %{name}
 Obsoletes: PolicyKit-kde-devel < 4.2.85
 Provides:  PolicyKit-kde-devel = %{version}-%{release}
-%if 0%{?have_bluez3}
-Provides: solid-bluetooth-devel = 4.1.4-1
-%else
 Provides: solid-bluetooth-devel = 4.3-0.1
-%endif
 Requires: %{name}-libs = %{version}-%{release}
 Requires: kdelibs4-devel
 %description devel
@@ -142,11 +134,7 @@ Requires: kdelibs4-devel
 %package libs
 Summary: Runtime libraries for %{name}
 Group:   System Environment/Libraries
-%if 0%{?have_bluez3}
-Provides: solid-bluetooth = 4.1.4-1
-%else
 Provides: solid-bluetooth = 4.3-0.1
-%endif
 Requires: kdelibs4%{?_isa} >= %{version}
 Requires: %{name} = %{version}-%{release}
 %description libs
@@ -355,9 +343,6 @@ fi
 %{_kde4_appsdir}/plasma_scriptengine_ruby/
 %{_kde4_appsdir}/powerdevil/
 %{_kde4_appsdir}/solid/
-%if 0%{?have_bluez3}
-%{_kde4_appsdir}/solidfakebluetoothbackend/
-%endif
 %{_kde4_appsdir}/solidfakenetbackend/
 %{_kde4_appsdir}/systemsettings/
 
@@ -508,6 +493,10 @@ fi
 
 
 %changelog
+* Wed May 27 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.85-2
+- upgrade path broken (F-11+), Obsoletes: guidance-power-manager (#502892)
+- drop < F-10 crud, have_bluez3
+
 * Mon May 11 2009 Than Ngo <than at redhat.com> 4.2.85-1
 - 4.2.85
 - Obsoletes/Provides: PolicyKit-kde(-devel)