From df62bd76a041aaa94bbc5f20b18d68d1d40df5b5 Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess@fedoraproject.org>
Date: Jun 30 2010 10:51:32 +0000
Subject: - Update to 2.90.0


---

diff --git a/.cvsignore b/.cvsignore
index 30d0b54..c45f952 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gnome-bluetooth-2.30.0.tar.bz2
+gnome-bluetooth-2.90.0.tar.bz2
diff --git a/gnome-bluetooth.spec b/gnome-bluetooth.spec
index 496f29f..ea6f822 100644
--- a/gnome-bluetooth.spec
+++ b/gnome-bluetooth.spec
@@ -1,6 +1,6 @@
 Name:		gnome-bluetooth
-Version:	2.30.0
-Release:	3%{?dist}
+Version:	2.90.0
+Release:	1%{?dist}
 Summary:	Bluetooth graphical utilities
 
 Group:		Applications/Communications
@@ -9,16 +9,15 @@ URL:		http://live.gnome.org/GnomeBluetooth
 Source0:	http://download.gnome.org/sources/gnome-bluetooth/2.28/gnome-bluetooth-%{version}.tar.bz2
 Source1:	61-gnome-bluetooth-rfkill.rules
 
-BuildRequires:	gtk2-devel
+BuildRequires:	gtk3-devel
 BuildRequires:	GConf2-devel
+BuildRequires:	control-center-devel
 BuildRequires:	dbus-glib-devel
-BuildRequires:	hal-devel
-BuildRequires:	unique-devel
 BuildRequires:	libnotify-devel
 BuildRequires:	mutter-moblin-devel
 BuildRequires:	libmx-devel
 BuildRequires:	gnome-doc-utils
-BuildRequires:	nautilus-sendto-devel
+BuildRequires:	nautilus-sendto-devel >= 2.90.0
 
 BuildRequires:	intltool desktop-file-utils gettext gtk-doc
 
@@ -36,6 +35,7 @@ Requires:	bluez >= 4.42
 Requires:	obexd
 Requires:	desktop-notification-daemon
 Requires:	pulseaudio-module-bluetooth
+Requires:	control-center
 
 Requires(post):		desktop-file-utils
 Requires(postun):	desktop-file-utils
@@ -80,7 +80,7 @@ This package contains the Moblin user interface for gnome-bluetooth.
 %setup -q
 
 %build
-%configure --disable-desktop-update --disable-icon-update
+%configure --disable-desktop-update --disable-icon-update --enable-nautilus-sendto=yes --disable-schemas-compile
 make %{?_smp_mflags}
 
 %install
@@ -88,7 +88,10 @@ rm -rf $RPM_BUILD_ROOT
 export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 make install DESTDIR=$RPM_BUILD_ROOT
 
-rm -f $RPM_BUILD_ROOT%{_libdir}/libgnome-bluetooth.la $RPM_BUILD_ROOT/%{_libdir}/gnome-bluetooth/plugins/*.la $RPM_BUILD_ROOT/%{_libdir}/nautilus-sendto/plugins/*.la
+rm -f $RPM_BUILD_ROOT%{_libdir}/libgnome-bluetooth.la \
+	   $RPM_BUILD_ROOT/%{_libdir}/gnome-bluetooth/plugins/*.la \
+	   $RPM_BUILD_ROOT/%{_libdir}/nautilus-sendto/plugins/*.la \
+	   $RPM_BUILD_ROOT/%{_libdir}/control-center-1/panels/libbluetooth.la
 
 desktop-file-install --vendor=""				\
 	--delete-original					\
@@ -129,10 +132,9 @@ rm -rf $RPM_BUILD_ROOT
 
 %post
 update-desktop-database -q
-export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-gconftool-2 --makefile-install-rule					\
-	%{_sysconfdir}/gconf/schemas/bluetooth-manager.schemas		\
-	>& /dev/null || :
+
+%posttrans
+glib-compile-schemas %{_datadir}/glib-2.0/schemas || :
 
 %pre
 if [ "$1" -gt 1 ]; then
@@ -164,6 +166,7 @@ fi
 
 %postun
 update-desktop-database -q
+glib-compile-schemas %{_datadir}/glib-2.0/schemas || :
 if [ $1 -eq 0 ] ; then
 	touch --no-create %{_datadir}/icons/hicolor &>/dev/null
 	gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
@@ -186,10 +189,8 @@ fi
 %files
 %defattr(-,root,root,-)
 %doc README NEWS COPYING
-%{_sysconfdir}/gconf/schemas/bluetooth-manager.schemas
 %{_sysconfdir}/xdg/autostart/bluetooth-applet.desktop
 %{_bindir}/bluetooth-applet
-%{_bindir}/bluetooth-properties
 %{_bindir}/bluetooth-sendto
 %{_bindir}/bluetooth-wizard
 %{_libdir}/gnome-bluetooth/
@@ -198,6 +199,9 @@ fi
 %{_mandir}/man1/*
 %{_libdir}/nautilus-sendto/plugins/*.so
 /lib/udev/rules.d/61-gnome-bluetooth-rfkill.rules
+%{_libdir}/control-center-1/panels/libbluetooth.so
+%{_datadir}/GConf/gsettings/*
+%{_datadir}/glib-2.0/schemas/*
 
 %files -f gnome-bluetooth2.lang libs
 %defattr(-,root,root,-)
@@ -219,9 +223,12 @@ fi
 %defattr(-,root,root,-)
 %{_sysconfdir}/xdg/autostart/bluetooth-panel.desktop
 %{_datadir}/dbus-1/services/org.moblin.UX.Shell.Panels.bluetooth.service
-%{_bindir}/bluetooth-panel
+%{_libexecdir}/bluetooth-panel
 
 %changelog
+* Wed Jun 30 2010 Bastien Nocera <bnocera@redhat.com> 2.90.0-1
+- Update to 2.90.0
+
 * Mon Jun 28 2010 Bastien Nocera <bnocera@redhat.com> 2.30.0-3
 - Fix moblin package description
 
diff --git a/sources b/sources
index 8cdc507..1729950 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-eb88212922037eb9751f0fcedb9c166e  gnome-bluetooth-2.30.0.tar.bz2
+49d4f58871358acb3c80e0bef2fff702  gnome-bluetooth-2.90.0.tar.bz2