rpms/bluez-gnome/devel .cvsignore, 1.10, 1.11 bluez-gnome-remove-class.patch, 1.1, 1.2 bluez-gnome.spec, 1.27, 1.28 sources, 1.10, 1.11 bluez-gnome-new-sendto-1.patch, 1.1, NONE

[Bastien Nocera (hadess)]

Author: hadess

Update of /cvs/pkgs/rpms/bluez-gnome/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30860

Modified Files:
	.cvsignore bluez-gnome-remove-class.patch bluez-gnome.spec 
	sources 
Removed Files:
	bluez-gnome-new-sendto-1.patch 
Log Message:
* Wed Feb 06 2008 - Bastien Nocera <bnocera at redhat.com> - 0.16-1
- Update to 0.16



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bluez-gnome/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	16 Jan 2008 13:17:04 -0000	1.10
+++ .cvsignore	6 Feb 2008 10:23:04 -0000	1.11
@@ -1 +1 @@
-bluez-gnome-0.15.tar.gz
+bluez-gnome-0.16.tar.gz

bluez-gnome-remove-class.patch:

Index: bluez-gnome-remove-class.patch
===================================================================
RCS file: /cvs/pkgs/rpms/bluez-gnome/devel/bluez-gnome-remove-class.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- bluez-gnome-remove-class.patch	16 Jan 2008 13:17:04 -0000	1.1
+++ bluez-gnome-remove-class.patch	6 Feb 2008 10:23:04 -0000	1.2
@@ -1,30 +1,11 @@
-Index: applet/main.c
-===================================================================
-RCS file: /cvsroot/bluez/gnome/applet/main.c,v
-retrieving revision 1.95
-diff -u -p -r1.95 main.c
---- applet/main.c	22 Dec 2007 00:09:15 -0000	1.95
-+++ applet/main.c	16 Jan 2008 12:56:41 -0000
-@@ -1271,7 +1271,10 @@ static char *get_form_factor(void)
- 	libhal_ctx_shutdown(ctx, NULL);
- 	libhal_ctx_free(ctx);
- 
--	if (strcmp(formfactor, "laptop") && strcmp(formfactor, "desktop")) {
-+	if (strcmp(formfactor, "laptop")
-+	    && strcmp(formfactor, "desktop")
-+	    && strcmp (formfactor, "server")
-+	    && strcmp (formfactor, "handheld")) {
- 		/* We don't know anything else */
- 		g_free(formfactor);
- 		formfactor = g_strdup("uncategorized");
 Index: properties/adapter.c
 ===================================================================
 RCS file: /cvsroot/bluez/gnome/properties/adapter.c,v
-retrieving revision 1.17
-diff -u -p -r1.17 adapter.c
---- properties/adapter.c	29 Aug 2007 15:41:49 -0000	1.17
-+++ properties/adapter.c	16 Jan 2008 12:56:41 -0000
-@@ -208,36 +208,6 @@ static gboolean focus_callback(GtkWidget
+retrieving revision 1.19
+diff -u -p -r1.19 adapter.c
+--- properties/adapter.c	2 Feb 2008 04:09:43 -0000	1.19
++++ properties/adapter.c	6 Feb 2008 10:13:39 -0000
+@@ -208,42 +208,6 @@ static gboolean focus_callback(GtkWidget
  	return FALSE;
  }
  
@@ -47,6 +28,12 @@
 -	case 2:
 -		minor = "laptop";
 -		break;
+-	case 3:
+-		minor = "server";
+-		break;
+-	case 4:
+-		minor = "handheld";
+-		break;
 -	default:
 -		return;
 -	}
@@ -61,7 +48,7 @@
  static void update_buttons(struct adapter_data *adapter, gboolean bonded,
  					gboolean trusted, gboolean connected)
  {
-@@ -523,7 +493,6 @@ static void create_adapter(struct adapte
+@@ -529,7 +493,6 @@ static void create_adapter(struct adapte
  	GtkWidget *button;
  	GtkWidget *scale;
  	GtkWidget *entry;
@@ -69,7 +56,7 @@
  	GtkWidget *buttonbox;
  	GtkWidget *scrolled;
  	GtkWidget *tree;
-@@ -531,7 +500,6 @@ static void create_adapter(struct adapte
+@@ -537,7 +500,6 @@ static void create_adapter(struct adapte
  	GtkTreeSelection *selection;
  	GSList *group = NULL;
  	gdouble value;
@@ -77,13 +64,10 @@
  
  	object = dbus_g_proxy_new_for_name(connection, "org.bluez",
  					adapter->path, "org.bluez.Adapter");
-@@ -695,37 +663,6 @@ static void create_adapter(struct adapte
- 	vbox = gtk_vbox_new(FALSE, 6);
- 	gtk_box_pack_start(GTK_BOX(hbox), vbox, FALSE, FALSE, 0);
+@@ -704,42 +666,6 @@ static void create_adapter(struct adapte
+ 	label = create_label(_("Class of device"));
+ 	gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
  
--	label = create_label(_("Class of device"));
--	gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
--
 -	combobox = gtk_combo_box_new_text();
 -	gtk_combo_box_append_text(GTK_COMBO_BOX(combobox),
 -						_("Unspecified"));
@@ -91,6 +75,10 @@
 -						_("Desktop workstation"));
 -	gtk_combo_box_append_text(GTK_COMBO_BOX(combobox),
 -						_("Laptop computer"));
+-	gtk_combo_box_append_text(GTK_COMBO_BOX(combobox),
+-						_("Server-class computer"));
+-	gtk_combo_box_append_text(GTK_COMBO_BOX(combobox),
+-						_("Handheld device"));
 -	gtk_box_pack_start(GTK_BOX(vbox), combobox, FALSE, FALSE, 0);
 -
 -	if (major && minor && g_ascii_strcasecmp(major, "computer") == 0) {
@@ -100,6 +88,10 @@
 -			index = 1;
 -		else if (g_ascii_strcasecmp(minor, "laptop") == 0)
 -			index = 2;
+-		else if (g_ascii_strcasecmp(minor, "server") == 0)
+-			index = 3;
+-		else if (g_ascii_strcasecmp(minor, "handheld") == 0)
+-			index = 4;
 -		else
 -			index = -1;
 -
@@ -118,10 +110,10 @@
 Index: properties/general.c
 ===================================================================
 RCS file: /cvsroot/bluez/gnome/properties/general.c,v
-retrieving revision 1.2
-diff -u -p -r1.2 general.c
---- properties/general.c	29 Jul 2007 11:28:48 -0000	1.2
-+++ properties/general.c	16 Jan 2008 12:56:41 -0000
+retrieving revision 1.3
+diff -u -p -r1.3 general.c
+--- properties/general.c	2 Feb 2008 04:09:43 -0000	1.3
++++ properties/general.c	6 Feb 2008 10:13:39 -0000
 @@ -116,17 +116,6 @@ static void autoauth_callback(GtkWidget 
  	gconf_client_set_bool(gconf, PREF_AUTO_AUTHORIZE, value, NULL);
  }


Index: bluez-gnome.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bluez-gnome/devel/bluez-gnome.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- bluez-gnome.spec	21 Jan 2008 20:21:10 -0000	1.27
+++ bluez-gnome.spec	6 Feb 2008 10:23:04 -0000	1.28
@@ -1,6 +1,6 @@
 Name:		bluez-gnome
-Version:	0.15
-Release:	3%{?dist}
+Version:	0.16
+Release:	1%{?dist}
 Summary:	Bluetooth pairing and control applet
 
 Group:		Applications/System
@@ -8,8 +8,6 @@
 URL:		http://www.bluez.org/
 Source0:	http://bluez.sf.net/download/%{name}-%{version}.tar.gz
 Patch1:		bluez-gnome-remove-class.patch
-# http://thread.gmane.org/gmane.linux.bluez.devel/14989/focus=15005
-Patch2:		bluez-gnome-new-sendto-1.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -19,8 +17,6 @@
 BuildRequires:	dbus-glib-devel perl-XML-Parser
 BuildRequires:	desktop-file-utils gettext
 BuildRequires:	hal-devel
-# For patch2
-BuildRequires:	automake
 
 Obsoletes:	bluez-pin
 Provides:	dbus-bluez-pin-helper
@@ -50,12 +46,8 @@
 %prep
 %setup -q
 %patch1 -p0 -b .remove-class
-pushd sendto
-%patch2 -p0 -b .sendto
-popd
 
 %build
-automake
 %configure --disable-mime-update --disable-desktop-update
 make %{?_smp_mflags}
 
@@ -82,8 +74,6 @@
         --dir=$RPM_BUILD_ROOT%{_datadir}/applications		\
         $RPM_BUILD_ROOT%{_datadir}/applications/bluetooth-analyzer.desktop
 
-cp -a sendto/bluetooth-sendto $RPM_BUILD_ROOT%{_bindir}/
-
 %find_lang bluetooth-manager
 
 %clean
@@ -128,6 +118,7 @@
 %{_datadir}/man/man1/bluetooth-properties.1.gz
 %{_datadir}/applications/bluetooth-properties.desktop
 %{_datadir}/mime/packages/bluetooth-manager.xml
+%{_mandir}/man1/bluetooth-sendto.1.gz
 %doc README COPYING AUTHORS ChangeLog
 
 %files analyzer
@@ -136,6 +127,9 @@
 %{_datadir}/man/man1/bluetooth-analyzer.1.gz
 
 %changelog
+* Wed Feb 06 2008 - Bastien Nocera <bnocera at redhat.com> - 0.16-1
+- Update to 0.16
+
 * Mon Jan 21 2008 - Bastien Nocera <bnocera at redhat.com> - 0.15-3
 - Add requires on obex-data-server for bluetooth-sendto
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bluez-gnome/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	16 Jan 2008 13:17:04 -0000	1.10
+++ sources	6 Feb 2008 10:23:04 -0000	1.11
@@ -1 +1 @@
-c1fef5de75cc4f9bdb1a21541ecb0f39  bluez-gnome-0.15.tar.gz
+7e428ee4ab20f1484a8a2366f95a177d  bluez-gnome-0.16.tar.gz


--- bluez-gnome-new-sendto-1.patch DELETED ---