rpms/kdebluetooth/F-8 kdebluetooth.spec,1.9,1.10

[Gilboa Davara (gilboa)]

Author: gilboa

Update of /cvs/pkgs/rpms/kdebluetooth/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4481/F-8

Modified Files:
	kdebluetooth.spec 
Log Message:



Index: kdebluetooth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebluetooth/F-8/kdebluetooth.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- kdebluetooth.spec	7 Oct 2007 21:49:54 -0000	1.9
+++ kdebluetooth.spec	8 Nov 2007 07:01:12 -0000	1.10
@@ -3,12 +3,25 @@
 Summary:		The KDE Bluetooth Framework
 Name:			kdebluetooth
 Version:		1.0 
-Release:		0.34.%{reltype}%{?dist}
+Release:		0.35.%{reltype}%{?dist}
 License:		GPLv2+
 Group:			Applications/Communications
 URL:			http://bluetooth.kmobiletools.org/
 Source0:		http://downloads.sourceforge.net/kde-bluetooth/%{name}-%{version}_%{reltype}.tar.bz2
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Requires:		%{name}-libs = %{version}-%{release}
+
+
+%description
+The KDE Bluetooth Framework is a set of tools built on top of Linux'
+Bluetooth (Bluez) stack. The goal is to provide easy access to the most
+common Bluetooth profiles and to make data exchange with Bluetooth
+enabled devices as straightforward as possible.
+
+
+%package libs
+Summary: Base libraries for %{name}
+Group:	 System Environment/Libraries
 BuildRequires:	gettext
 BuildRequires:	desktop-file-utils
 BuildRequires:	lockdev-devel
@@ -23,17 +36,15 @@
 Buildrequires:	dbus-qt-devel
 BuildRequires:	obexftp-devel
 Requires:		kdebase
+Obsoletes:		%{name} < %{version}-%{release}
 
 %if 0%{?fedora} >= 8
 Provides:		dbus-bluez-pin-helper
 %endif
 
 
-%description
-The KDE Bluetooth Framework is a set of tools built on top of Linux'
-Bluetooth (Bluez) stack. The goal is to provide easy access to the most
-common Bluetooth profiles and to make data exchange with Bluetooth
-enabled devices as straightforward as possible.
+%description libs
+KDE Bluetooth framework libraries.
 
 
 %package devel
@@ -41,11 +52,11 @@
 Group:	 Development/Libraries
 Requires: qt-devel
 Requires: bluez-libs-devel
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}-libs = %{version}-%{release}
 
 
 %description devel
-Development headers for the KDE Bluetooth Framework.
+KDE Bluetooth framework development libraries and headers.
 
 
 %prep
@@ -114,11 +125,6 @@
 %{_bindir}/kbtobexclient
 %{_bindir}/kioobex_start
 %{_bindir}/kinputwizard
-%{_libdir}/*.la
-%{_libdir}/*.so.*
-%{_libdir}/kde3/*.so
-%{_libdir}/kde3/*.la
-%{_libdir}/kdebluetooth/
 %{_datadir}/applications/kde/*.desktop
 %{_datadir}/applnk/.hidden/*.desktop
 %{_datadir}/apps/konqsidebartng/virtual_folders/services/*.desktop
@@ -141,6 +147,15 @@
 %lang(sv) %{_docdir}/HTML/sv/kdebluetooth/
 
 
+%files libs
+%defattr(-,root,root,-)
+%{_libdir}/*.la
+%{_libdir}/*.so.*
+%{_libdir}/kde3/*.so
+%{_libdir}/kde3/*.la
+%{_libdir}/kdebluetooth/
+
+
 %files devel
 %defattr(-,root,root,-)
 %{_includedir}/*
@@ -148,6 +163,9 @@
 
 
 %changelog
+* Wed Nov 07 2007 Gilboa Davara <gilboad[AT]gmail.com> 1-0.0-35.beta8
+- Fix multi-lib conflicts (#341731).
+
 * Sat Oct 06 2007 Gilboa Davara <gilboad[AT]gmail.com> 1-0.0-34.beta8
 - Beta8. (First official release since beta3)
 - Remove redundant beta3 patches.