rpms/kdebluetooth/devel kdebluetooth-hex.patch, NONE, 1.1 kdebluetooth-obexpush.patch, NONE, 1.1 kdebluetooth-services.patch, NONE, 1.1 kdebluetooth.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

[Gilboa Davara (gilboa)]

Author: gilboa

Update of /cvs/pkgs/rpms/kdebluetooth/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11525/devel

Modified Files:
	.cvsignore sources 
Added Files:
	kdebluetooth-hex.patch kdebluetooth-obexpush.patch 
	kdebluetooth-services.patch kdebluetooth.spec 
Log Message:


kdebluetooth-hex.patch:

--- NEW FILE kdebluetooth-hex.patch ---
diff -ruN kdebluetooth/kdebluetooth/kbluemon/main.cpp kdebluetooth.working/kdebluetooth/kbluemon/main.cpp
--- kdebluetooth/kdebluetooth/kbluemon/main.cpp	2007-06-11 04:27:17.000000000 -0700
+++ kdebluetooth.working/kdebluetooth/kbluemon/main.cpp	2007-06-13 08:45:20.000000000 -0700
@@ -28,6 +28,7 @@
 #include <klocale.h>
 #include <kdebug.h>
 #include <qapplication.h>
+#include <kapp.h>
 
 
 #include "monitor.h"
@@ -52,10 +53,12 @@
     KCmdLineArgs::init( argc, argv, &aboutData );
     KCmdLineArgs::addCmdLineOptions( options );
 
-    QApplication a(argc, argv); 
+//    QApplication a(argc, argv); 
+    KApplication a(argc, argv);
    
     Monitor mon;
     
+
     return mon.exec();
 
 }
diff -ruN kdebluetooth/kdebluetooth/libkbluetooth/servicerecord.cpp kdebluetooth.working/kdebluetooth/libkbluetooth/servicerecord.cpp
--- kdebluetooth/kdebluetooth/libkbluetooth/servicerecord.cpp	2007-04-30 15:22:04.000000000 -0700
+++ kdebluetooth.working/kdebluetooth/libkbluetooth/servicerecord.cpp	2007-06-13 08:32:55.000000000 -0700
@@ -24,6 +24,7 @@
  */
 
 #include "servicerecord.h"
+#include <kdebug.h>
 
 namespace KBluetooth
 {
@@ -38,6 +39,8 @@
 
 	for(QDomNode n = docElement.firstChild(); !n.isNull(); n = n.nextSibling() ) {
    		QDomElement e = n.toElement();
+
+		kdDebug() << e.text() << endl;
 		
 		if ( e.attribute("id") == "0x0001" ) {
 			mUuid = parseAttributeUuid(e);
@@ -64,7 +67,20 @@
 	kdDebug() << k_funcinfo << mXml << endl;
 	QDomNodeList list = e.elementsByTagName("text");
 	QString serviceName = list.item(0).toElement().attribute("value");
+	if (list.item(0).toElement().attribute("encoding") == "hex") {
+		QString localValue = list.item(0).toElement().attribute("value");
+		QString a = localValue.mid(0, 2);
+		bool ok;
+
+		serviceName.insert(0, (char) a.toInt(&ok, 16));
+		for (uint i=2; i < localValue.length(); i = i + 2) {
+			a = localValue.mid(i, 2);
+			serviceName.insert(i/2, (char) a.toInt(&ok, 16));
+		}
+		serviceName.setLength(localValue.length()/2 - 1);
+	}
 
+	kdDebug() << "serviceName: " << serviceName << endl;
 	return serviceName;
 }
 

kdebluetooth-obexpush.patch:

--- NEW FILE kdebluetooth-obexpush.patch ---
--- kdebluetooth/kioslave/sdp/btsdp.old	2007-07-08 16:41:27.000000000 +0300
+++ kdebluetooth/kioslave/sdp/btsdp.cpp	2007-07-08 16:41:58.000000000 +0300
@@ -246,7 +247,7 @@
             // save dialog. In konqueror, kbtobexclient is started.
             // In the file save dialog, kio_obex will be used.
             KURL obexPushURL;
-            obexPushURL.setProtocol("obex");
+            obexPushURL.setProtocol("obex2");
             obexPushURL.setHost(mAddress);
             if (record.rfcommChannel() > 0) {
                 obexPushURL.setPort(record.rfcommChannel());

kdebluetooth-services.patch:

--- NEW FILE kdebluetooth-services.patch ---
--- kdebluetooth/kbluetooth/trayicon.old	2007-07-08 14:54:32.000000000 +0300
+++ kdebluetooth/kbluetooth/trayicon.cpp	2007-07-08 14:55:28.000000000 +0300
@@ -63,6 +63,11 @@
     connect(inputConfigAction, SIGNAL(activated()), this, SLOT(slotInputConfig()));
     configActionMenu->insert(inputConfigAction);
 
+#if 0
+	// Gilboa Davara.
+	// lotServiceConfig is empty in B3.
+	// Remove the menu entry.
+
     // Service configuration
     serviceConfigAction = new KAction(i18n("Configure &Services..."),
         KGlobal::iconLoader()->loadIcon("configure", KIcon::Small, 16),
@@ -70,6 +75,8 @@
     connect(serviceConfigAction, SIGNAL(activated()), this, SLOT(slotServiceConfig()));
     configActionMenu->insert(serviceConfigAction);
 
+#endif
+
     // Bluetooth Device configuration
     deviceConfigAction = new KAction(i18n("&Devices..."),
         KGlobal::iconLoader()->loadIcon("configure", KIcon::Small, 16),


--- NEW FILE kdebluetooth.spec ---
%define reltype	beta3

Summary:		The KDE Bluetooth Framework
Name:			kdebluetooth
Version:		1.0 
Release:		0.28.%{reltype}%{?dist}
License:		GPL
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)
BuildRequires:	gettext
BuildRequires:	desktop-file-utils
BuildRequires:	lockdev-devel
BuildRequires:	xmms-devel
BuildRequires:	bluez-libs-devel
BuildRequires:	kdelibs-devel
BuildRequires:	kdepim-devel
BuildRequires:	openobex-devel >= 1.1
BuildRequires:	libusb-devel
BuildRequires:	pkgconfig
Buildrequires:	libidn-devel
Buildrequires:	dbus-qt-devel
BuildRequires:	obexftp-devel
Requires:		kdebase

Patch0:			kdebluetooth-hex.patch
Patch1:			kdebluetooth-services.patch
Patch2:			kdebluetooth-obexpush.patch


%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 devel
Summary: Development files for %{name}
Group:	 Development/Libraries
Requires: qt-devel
Requires: bluez-libs-devel
Requires: %{name} = %{version}-%{release}


%description devel
Development headers for the KDE Bluetooth Framework.


%prep
%setup -q -n %{name}-%{version}-%{reltype}
%patch0 -p1 -b .hex
%patch1 -p0 -b .services
%patch2 -p0 -b .obexpush


%build
unset QTDIR || : ; . /etc/profile.d/qt.sh
%configure \
	--with-bluetooth-libraries=%{_libdir}	\
	--disable-rpath							\
	--disable-gcc-hidden-visibility			\
	--enable-new-ldflags					\
	--disable-debug							\
	--disable-dependency-tracking			\
	--enable-final
make %{?_smp_mflags} 


%install
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"
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
#rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
#rm -f $RPM_BUILD_ROOT/%{_libdir}/kde3/*.la


%clean
rm -rf $RPM_BUILD_ROOT


%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
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING INSTALL README
%{_bindir}/kblue*
%{_bindir}/kinputwizard
%{_libdir}/*.la
%{_libdir}/*.so.*
%{_libdir}/kde3/*.so
%{_libdir}/kde3/*.la
%{_datadir}/applications/kde/*.desktop
%{_datadir}/apps/konqsidebartng/virtual_folders/services/*.desktop
%{_datadir}/apps/*/*
%{_datadir}/autostart/*
%{_datadir}/desktop-directories/*
%{_datadir}/icons/hicolor/*/*/*
%{_datadir}/mimelnk/bluetooth/
%{_datadir}/service*/*


%files devel
%defattr(-,root,root,-)
%{_includedir}/*
%{_libdir}/*.so


%changelog
* Sun Jul 15 2007 Gilboa Davara <gilboad[AT]gmail.com> 1-0.0-28.beta3
- Fix %%dist... again...

* Thu Jul 12 2007 Gilboa Davara <gilboad[AT]gmail.com> 1-0.0-27.beta3
- Add missing touch /icon/hicolor.
- Menu items: Remove only-in-KDE.
- BR: Remove libutempter-devel.
- Fix project URL and source URL.
- Add missing %%dist.

* Sun Jul 08 2007 Gilboa Davara <gilboad[AT]gmail.com> 1-0.0-26.beta3
- Remove the Nokia N70 patch. (Doesn't seem to work.)
- OBEX Object push fix.

* Sun Jul 08 2007 Gilboa Davara <gilboad[AT]gmail.com> 1-0.0-25.beta3
- Adopted Ville Skyttä b2 patch to b3. (Hopefully) re-enable Nokia N7x obex support.
- Patch out "Configure services". (Disabled in B3)

* Mon Jun 25 2007 Gilboa Davara <gilboad[AT]gmail.com> 1-0.0-24.beta3
- Added hex encoding patch by Thomas Davis.
- Removed --enable-irmcsynckonnector (deprecated in b3)
- Add missing docs. (Removed by mistake in b23)
- Known issue - services menu doesn't seem to work. (Requires debugging / upstream )

* Tue Jun 12 2007 Gilboa Davara <gilboad[AT]gmail.com> 1-0.0-23.beta3
- Beta3.
- Remove pin-helper. (No longer needed - beta3 has dbus support.)
- Added BR dbus-qt.
- Added BR obexftp-devel.
- Remove b2 patches.

* Sat May 26 2007 Gilboa Davara <gilboad[AT]gmail.com> 1-0-0.22.beta2
- Use the bluez_pinhelper wrapper instead of modified bluez-utils.
- Remove %%dist.
- *rc should not be marked as config.
- Prevent RPM from owning Network/Peripherals.

* Mon Apr 23 2007 Gilboa Davara <gilboad[AT]gmail.com> 1-0-0.21.beta2
- Patch list clean-up.
- Add Nokia obex detection patch.
- Fix 64bit compile due to bad default in configure. (with_bluetooth_dir)
- Missing BR: libtempter-devel.
- Missing BT: libidn-devel.
- Added: kbluepin wrapper - configure kbluepin as the old-style pin helper.

* Wed Apr 04 2007 Gilboa Davara <gilboad[AT]gmail.com> 1-0-0.20.beta2
- Re-merge Ville Skytta's latest .spec. (Got dropped by mistake)
- Summery, description clean-up.

* Thu Mar 29 2007 Gilboa Davara <gilboad[AT]gmail.com> 1.0-0.19.beta2
- Spec file clean-up.

* Fri Oct 20 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.0-0.18.beta2
- BR: gettext
- include locales

* Tue Oct 17 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.0-0.17.beta2
- kdebluetooth-1.0_beta2

* Fri Sep 08 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.0-0.16.20060908svn
- kdebluetoooth-20060908svn

* Thu Jul 13 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.0-0.15.20060621svn
- put svn at end of Release tag (per packaging guidelines)

* Wed Jun 21 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.0-0.14.svn20060621
- kdebluetooth-20060621svn, fixes
	compile error kdebluetooth libkobex obex.h not found (kde bug #94572)

* Tue Jun 20 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.0-0.13.svn20060620
- kdebluetooth-svn20060620, (re)fixes
	konqueror bluetooth:/ returns error "Bad URL" (kde bug #123607)
- --disable-dependency-tracking
- own %%_datadir/applnk/Settings/Network

* Mon Jun 19 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.0-0.12.svn20060619
- document svn tarball creation
- Requires: kdebase (for kcm bits, applnk dir ownership)
- desktop-file-install --add-only-show-in=KDE

* Mon Jun 19 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.0-0.11.svn20060619
- kdebluetooth-svn20060619, making most patches obsolete

* Fri Apr 28 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.0-0.10.beta1
- -devel: Requires: qt-devel bluez-libs-devel
- include libirmcsynckonnector.so in main pkg
- .desktop: --remove-category=Network --add-category=System
- remove zero length files
- fix default hcid start/top command

* Mon Apr 17 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.0-0.9.beta1
- konqueror bluetooth:/ returns error "Bad URL" (kde bug #123607)

* Tue Mar 28 2006 Rex Dieter 1.0-0.8.beta1
- BR: kdepim-devel (for kitchensync)
- kdebluetooth-1.0_beta1-gcc41.patch

* Thu Mar 23 2006 Rex Dieter 1.0-0.7.beta1
- cleanup openobex patch
- fixup .desktop file(s)

* Wed Mar 22 2006 Rex Dieter 1.0-0.6.beta1
- cleanup for Extras
- %%post: ldconfig, fdo icon spec

* Mon Mar 06 2006 Rex Dieter 1.0-0.5.beta1
- respin

* Mon Mar 21 2005 Rex Dieter 1.0-0.3.beta1
- --enable-irmcsynckonnector

* Mon Mar 21 2005 Rex Dieter 1.0-0.1.beta1
- 1.0_beta1

* Wed Dec 29 2004 Rex Dieter <rexdieter[AT]users.sf.net> 0.0-0.1.cvs20050110
- first try



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdebluetooth/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	15 Jul 2007 19:23:45 -0000	1.1
+++ .cvsignore	30 Jul 2007 10:37:23 -0000	1.2
@@ -0,0 +1 @@
+kdebluetooth-1.0-beta3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdebluetooth/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	15 Jul 2007 19:23:45 -0000	1.1
+++ sources	30 Jul 2007 10:37:23 -0000	1.2
@@ -0,0 +1 @@
+fd1c45a393b8724fbb0de493e923bcd8  kdebluetooth-1.0-beta3.tar.bz2