rpms/kdebluetooth/F-9 .cvsignore, 1.3, 1.4 kdebluetooth.spec, 1.15, 1.16 sources, 1.3, 1.4

Sat Sep 20 22:08:58 UTC 2008

Author: gilboa

Update of /cvs/pkgs/rpms/kdebluetooth/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16417

Modified Files:
	.cvsignore kdebluetooth.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdebluetooth/F-9/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4

--- .cvsignore	7 Oct 2007 21:49:54 -0000	1.3
+++ .cvsignore	20 Sep 2008 22:08:27 -0000	1.4
@@ -1 +1 @@
-kdebluetooth-1.0_beta8.tar.bz2
+kdebluetooth4-0.2.tar.bz2


Index: kdebluetooth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebluetooth/F-9/kdebluetooth.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- kdebluetooth.spec	1 Apr 2008 20:06:30 -0000	1.15
+++ kdebluetooth.spec	20 Sep 2008 22:08:27 -0000	1.16
@@ -1,81 +1,33 @@
-%define reltype	beta8
-
 Summary:		The KDE Bluetooth Framework
 Name:			kdebluetooth
-Version:		1.0 
-Release:		0.41.%{reltype}%{?dist}
+Version:		0.2
+Release:		3%{?dist}
+Epoch:			1
 License:		GPLv2+
 Group:			Applications/Communications
 URL:			http://bluetooth.kmobiletools.org/
-Source0:		http://downloads.sourceforge.net/kde-bluetooth/%{name}-%{version}_%{reltype}.tar.bz2
-Patch0:			%{name}-1.0_beta8-gcc43.patch
+Source0:		http://downloads.sourceforge.net/kde-bluetooth/%{name}4-%{version}.tar.bz2
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	gettext
-BuildRequires:	desktop-file-utils
-BuildRequires:	lockdev-devel
-BuildRequires:	xmms-devel
-BuildRequires:	bluez-libs-devel
-BuildRequires:	kdelibs3-devel
-BuildRequires:	kdepim3-devel
-BuildRequires:	openobex-devel >= 1.1
-BuildRequires:	libusb-devel
-BuildRequires:	pkgconfig
-Buildrequires:	libidn-devel
-Buildrequires:	dbus-qt-devel
-BuildRequires:	obexftp-devel
-BuildRequires:	automake >= 1.6.1
-BuildRequires:	autoconf >= 2.52
-Requires:		%{name}-libs = %{version}-%{release}
-Requires:		%{_bindir}/kdesu
+
+BuildRequires:	kdebase-workspace-devel
+BuildRequires:	cmake
+Obsoletes:		%{name}-libs < 1:0.2
+Obsoletes:		%{name}-devel < 1:0.2
 
 
 %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
+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
-Obsoletes:		%{name} < %{version}-%{release}
-
-%if 0%{?fedora} >= 8
-Provides:		dbus-bluez-pin-helper
-%endif
-
-
-%description libs
-KDE Bluetooth framework libraries.
-
-
-%package devel
-Summary: Development files for %{name}
-Group:	 Development/Libraries
-Requires: kdelibs3-devel
-Requires: bluez-libs-devel
-Requires: %{name}-libs = %{version}-%{release}
-
-
-%description devel
-KDE Bluetooth framework development libraries and headers.
-
-
 %prep
-%setup -q -n %{name}-%{version}_%{reltype}
-%patch0 -p1
+%setup -n kdebluetooth4-%{version} -q
 
 
 %build
-unset QTDIR || : ; . /etc/profile.d/qt.sh
-%configure \
-	--with-bluetooth-libraries=%{_libdir}	\
-	--disable-rpath							\
-	--enable-new-ldflags					\
-	--disable-debug							\
-	--disable-dependency-tracking			\
-	--enable-final
+%cmake_kde4 -DCMAKE_VERBOSE_MAKEFILE=ON
 make %{?_smp_mflags} 
 
 
@@ -83,26 +35,14 @@
 rm -rf $RPM_BUILD_ROOT
 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												\
-		$RPM_BUILD_ROOT%{_datadir}/$DESK_PATH/*.desktop ||:
-done
-
-touch %{name}.lang
-PROG_LIST="kbluelock kbluemon kbluetooth kinputwizard
-			kcm_btpaired  kio_bluetooth kio_obex2 kio_sdp
-			libkbluetooth kdebluetooth"
-for PROG in $PROG_LIST ; do
-	%find_lang $PROG && cat $PROG.lang >> %{name}.lang	||:
-done
-
-rm -f $RPM_BUILD_ROOT/%{_datadir}/applnk/Settings/Network/Bluetooth/.directory
+desktop-file-install						\
+	--mode=644						\
+	--vendor=""						\
+	--dir=$RPM_BUILD_ROOT%{_datadir}/applications/kde4	\
+	--remove-category="Network"				\
+	--add-category="System"					\
+	--delete-original					\
+	$RPM_BUILD_ROOT%{_datadir}/applications/kde4/kdebluetooth4.desktop
 
 
 %clean
@@ -110,62 +50,36 @@
 
 
 %post
-/sbin/ldconfig
 touch --no-create %{_datadir}/icons/hicolor ||:
 gtk-update-icon-cache -qf %{_datadir}/icons/hicolor 2> /dev/null ||:
 
 
 %postun
-/sbin/ldconfig
 touch --no-create %{_datadir}/icons/hicolor ||:
 gtk-update-icon-cache -qf %{_datadir}/icons/hicolor 2> /dev/null ||:
 
 
-%files -f %{name}.lang
+%files
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING INSTALL README
-%{_bindir}/kblue*
-%{_bindir}/kbtobexclient
-%{_bindir}/kioobex_start
-%{_bindir}/kinputwizard
-%{_datadir}/applications/kde/*.desktop
-%{_datadir}/applnk/.hidden/*.desktop
-%{_datadir}/apps/konqsidebartng/virtual_folders/services/*.desktop
-%{_datadir}/apps/*/*
-%{_datadir}/autostart/*
-%{_datadir}/desktop-directories/*
-%{_datadir}/icons/hicolor/*/*/*
-%{_datadir}/mimelnk/bluetooth/
-%{_datadir}/service*/*
-%lang(ca) %{_docdir}/HTML/ca/kdebluetooth/
-%lang(da) %{_docdir}/HTML/da/kdebluetooth/
-%lang(en) %{_docdir}/HTML/en/kdebluetooth/
-%lang(es) %{_docdir}/HTML/es/kdebluetooth/
-%lang(et) %{_docdir}/HTML/et/kdebluetooth/
-%lang(fr) %{_docdir}/HTML/fr/kdebluetooth/
-%lang(it) %{_docdir}/HTML/it/kdebluetooth/
-%lang(nl) %{_docdir}/HTML/nl/kdebluetooth/
-%lang(pt) %{_docdir}/HTML/pt/kdebluetooth/
-%lang(ru) %{_docdir}/HTML/ru/kdebluetooth/
-%lang(sv) %{_docdir}/HTML/sv/kdebluetooth/
-
+%doc AUTHORS ChangeLog COPYING TODO
+%{_bindir}/kbluetooth4
+%{_bindir}/kbluetooth4-devicemanager
+%{_bindir}/kbluetooth4-inputwizard
+%{_datadir}/applications/kde4/kdebluetooth4.desktop
+%{_datadir}/icons/hicolor/*x*/apps/kbluetooth4.png
 
-%files libs
-%defattr(-,root,root,-)
-%{_libdir}/*.la
-%{_libdir}/*.so.*
-%{_libdir}/kde3/*.so
-%{_libdir}/kde3/*.la
-%{_libdir}/kdebluetooth/
 
+%changelog
+* Mon Sep 15 2008 Gilboa Davara <gilboad [AT] gmail.com> - 0.2-3
+- Use versioned obsoletes.
 
-%files devel
-%defattr(-,root,root,-)
-%{_includedir}/*
-%{_libdir}/*.so
+* Sun Sep 14 2008 Gilboa Davara <gilboad [AT] gmail.com> - 0.2-2
+- Use epoch instead of obsolete.
+- Revert to old kdebluetooth description. (Taken from kdebluetooth website)
 
+* Wed Sep 10 2008 Ville SkyttÃ¤ <ville.skytta at iki.fi> - 0.2-1
+- Update to kdebluetooth4 0.2.
 
-%changelog
 * Tue Apr  1 2008 Rex Dieter <rdieter at fedoraproject.org> - 1.0-0.41.beta8
 - -devel: Requires: kdelibs3-devel
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdebluetooth/F-9/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	7 Oct 2007 21:49:54 -0000	1.3
+++ sources	20 Sep 2008 22:08:27 -0000	1.4
@@ -1 +1 @@
-0b6aebf7d236894fc442d74425b13386  kdebluetooth-1.0_beta8.tar.bz2
+1d66e2c968b4ce1a6201ea294a35de76  kdebluetooth4-0.2.tar.bz2


