rpms/kdebase-workspace/F-12 kdebase-workspace.spec,1.328,1.329

[Kevin Kofler]

Author: kkofler

Update of /cvs/pkgs/rpms/kdebase-workspace/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22826/F-12

Modified Files:
	kdebase-workspace.spec 
Log Message:
Sync from devel:

* Fri Feb 19 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.4.0-7
- version solid-bluetooth(-devel) better

* Fri Feb 19 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.4.0-6
- solid-bluetooth and Requires: bluez ... pulls unwanted baggage (#566306)


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/F-12/kdebase-workspace.spec,v
retrieving revision 1.328
retrieving revision 1.329
diff -u -p -r1.328 -r1.329
--- kdebase-workspace.spec	16 Feb 2010 22:40:06 -0000	1.328
+++ kdebase-workspace.spec	21 Feb 2010 02:52:47 -0000	1.329
@@ -22,7 +22,7 @@
 Summary: KDE Workspace
 Name:    kdebase-workspace
 Version: 4.4.0
-Release: 5%{?dist}.1
+Release: 7%{?dist}
 
 License: GPLv2
 Group:   User Interface/Desktops
@@ -177,12 +177,15 @@ Requires: kio_sysinfo
 
 # needed for solid-bluetooth - bluez-libs BRs are not enough, bluez provides DBus 
 # interface and solid-bluetooth access this interface directly over DBus
-Requires: bluez
-%if 0%{?fedora} && 0%{?fedora} < 13
+# 
+# moving deps to kbluetooth for now, see https://bugzilla.redhat.com/566306
+#
+#Requires: bluez
+#if 0%{?fedora} && 0%{?fedora} < 13
 # to help upgraders get the right dbus-bluez-pin-helper, else, will likely 
 # end up with 'blueman' and all it's gnome deps
-Requires: kbluetooth
-%endif
+#Requires: kbluetooth
+#endif
 
 %description
 The KDE Workspace consists of what is the desktop of the
@@ -204,7 +207,7 @@ This package contains:
 Group:    Development/Libraries
 Summary:  Development files for %{name}
 Obsoletes: PolicyKit-kde-devel < 4.3.0
-Provides: solid-bluetooth-devel = 4.3-0.1
+Provides: solid-bluetooth-devel = %{version}-%{release} 
 Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 Requires: kdelibs4-devel
 %description devel
@@ -213,7 +216,7 @@ Requires: kdelibs4-devel
 %package libs
 Summary: Runtime libraries for %{name}
 Group:   System Environment/Libraries
-Provides: solid-bluetooth = 4.3-0.1
+Provides: solid-bluetooth = %{version}-%{release} 
 Requires: kdelibs4%{?_isa} >= %{version}
 Requires: %{name} = %{version}-%{release}
 %description libs
@@ -681,6 +684,12 @@ fi
 
 
 %changelog
+* Fri Feb 19 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.4.0-7
+- version solid-bluetooth(-devel) better
+
+* Fri Feb 19 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.4.0-6
+- solid-bluetooth and Requires: bluez ... pulls unwanted baggage (#566306)
+
 * Tue Feb 16 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.4.0-5.1
 - Requires: kbluetooth (<f13)