rpms/kdebluetooth/devel kdebluetooth.spec,1.16,1.17

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/kdebluetooth/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5657

Modified Files:
	kdebluetooth.spec 
Log Message:
* Thu Sep 11 2008 Rex Dieter <rdieter at fedoraproject.org> - 1.0-0.43.beta8
- fix build (no kdepim3 on f10+)
- spec cosmetics
- drop multilib upgrade Obsoletes hack



Index: kdebluetooth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebluetooth/devel/kdebluetooth.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- kdebluetooth.spec	11 Sep 2008 14:32:31 -0000	1.16
+++ kdebluetooth.spec	11 Sep 2008 18:31:59 -0000	1.17
@@ -1,9 +1,14 @@
 %define reltype	beta8
 
+# no kdepim3 on f10+
+%if ! 0%{?fedora} > 9
+%define kdepim3 kdepim
+%endif
+
 Summary:		The KDE Bluetooth Framework
 Name:			kdebluetooth
 Version:		1.0 
-Release:		0.42.%{reltype}%{?dist}
+Release:		0.43.%{reltype}%{?dist}
 License:		GPLv2+
 Group:			Applications/Communications
 URL:			http://bluetooth.kmobiletools.org/
@@ -16,7 +21,7 @@
 BuildRequires:	xmms-devel
 BuildRequires:	bluez-libs-devel
 BuildRequires:	kdelibs3-devel
-BuildRequires:	kdepim3-devel
+%{?kdepim3:BuildRequires: %{kdepim3}-devel}
 BuildRequires:	openobex-devel >= 1.1
 BuildRequires:	libusb-devel
 BuildRequires:	pkgconfig
@@ -39,7 +44,7 @@
 %package libs
 Summary: Base libraries for %{name}
 Group:	 System Environment/Libraries
-Obsoletes:		%{name} < %{version}-%{release}
+Requires: %{name} = %{version}-%{release}
 
 %if 0%{?fedora} >= 8
 Provides:		dbus-bluez-pin-helper
@@ -70,12 +75,13 @@
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
 %configure \
-	--with-bluetooth-libraries=%{_libdir}	\
-	--disable-rpath							\
-	--enable-new-ldflags					\
-	--disable-debug							\
-	--disable-dependency-tracking			\
+	--with-bluetooth-libraries=%{_libdir} \
+	--disable-rpath	\
+	--enable-new-ldflags \
+	--disable-debug \
+	--disable-dependency-tracking \
 	--enable-final
+
 make %{?_smp_mflags} 
 
 
@@ -84,13 +90,13 @@
 make install DESTDIR=$RPM_BUILD_ROOT
 
 for DESK_PATH in applications/kde applnk/Utilities ; do
-	desktop-file-install												\
-		--mode=644														\
-		--vendor=""														\
-		--dir=$RPM_BUILD_ROOT%{_datadir}/applications/kde				\
-		--remove-category="Network"										\
-		--add-category="System"											\
-		--delete-original												\
+	desktop-file-install \
+		--mode=644 \
+		--vendor="" \
+		--dir=$RPM_BUILD_ROOT%{_datadir}/applications/kde \
+		--remove-category="Network" \
+		--add-category="System"	\
+		--delete-original \
 		$RPM_BUILD_ROOT%{_datadir}/$DESK_PATH/*.desktop ||:
 done
 
@@ -102,7 +108,7 @@
 	%find_lang $PROG && cat $PROG.lang >> %{name}.lang	||:
 done
 
-rm -f $RPM_BUILD_ROOT/%{_datadir}/applnk/Settings/Network/Bluetooth/.directory
+rm -f $RPM_BUILD_ROOT%{_datadir}/applnk/Settings/Network/Bluetooth/.directory
 
 
 %clean
@@ -129,7 +135,9 @@
 %{_bindir}/kioobex_start
 %{_bindir}/kinputwizard
 %{_datadir}/applications/kde/*.desktop
+# FIXME
 %{_datadir}/applnk/.hidden/*.desktop
+# FIXME: kde3-only
 %{_datadir}/apps/konqsidebartng/virtual_folders/services/*.desktop
 %{_datadir}/apps/*/*
 %{_datadir}/autostart/*
@@ -166,6 +174,11 @@
 
 
 %changelog
+* Thu Sep 11 2008 Rex Dieter <rdieter at fedoraproject.org> - 1.0-0.43.beta8
+- fix build (no kdepim3 on f10+)
+- spec cosmetics
+- drop multilib upgrade Obsoletes hack
+
 * Thu Sep 11 2008 - Bastien Nocera <bnocera at redhat.com> - 1.0-0.42.beta8
 - Rebuild