From 5f2f1d4fa3c6e02f50443976dfba198c1bfea319 Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess@fedoraproject.org>
Date: Mar 04 2009 23:18:59 +0000
Subject: - Update to 2.27.1

- Loads of fixes mentioned by Bill Nottingham in bug #488498

---

diff --git a/gnome-bluetooth.spec b/gnome-bluetooth.spec
index 0ffada4..a2870c9 100644
--- a/gnome-bluetooth.spec
+++ b/gnome-bluetooth.spec
@@ -20,8 +20,8 @@ BuildRequires:	perl-XML-Parser intltool desktop-file-utils gettext gtk-doc
 
 Obsoletes:	bluez-pin
 Provides:	dbus-bluez-pin-helper
-Conflicts:	bluez-gnome
-Obsoletes:	bluez-gnome
+Conflicts:	bluez-gnome <= 1.8
+Obsoletes:	bluez-gnome <= 1.8
 
 Requires:	gvfs-obexftp
 Requires:	bluez
@@ -50,7 +50,7 @@ Summary:	Development files for %{name}-libs
 Group:		Development/Libraries
 License:	LGPLv2+
 Requires:	%{name}-libs = %{version}-%{release}
-Requires:	gtk-doc
+Requires:	gtk-doc pkgconfig
 
 %description libs-devel
 This package contains the libraries amd header files that are needed
@@ -88,44 +88,44 @@ desktop-file-install --vendor=""				\
 update-desktop-database -q
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --makefile-install-rule					\
-        %{_sysconfdir}/gconf/schemas/bluetooth-manager.schemas		\
+	%{_sysconfdir}/gconf/schemas/bluetooth-manager.schemas		\
 	>& /dev/null || :
 if [ -x /usr/bin/gtk-update-icon-cache ]; then
-  /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
+	/usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
 fi
 
 %pre
 if [ "$1" -gt 1 ]; then
-    export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-    if [ -f %{_sysconfdir}/gconf/schemas/gnome-obex-server.schemas ] ; then
-      gconftool-2 --makefile-uninstall-rule \
-        %{_sysconfdir}/gconf/schemas/gnome-obex-server.schemas >/dev/null || :
-    fi
-    if [ -f %{_sysconfdir}/gconf/schemas/bluetooth-manager.schemas ] ; then
-      gconftool-2 --makefile-uninstall-rule 				\
-        %{_sysconfdir}/gconf/schemas/bluetooth-manager.schemas		\
-	>& /dev/null || :
-    fi
+	export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+	if [ -f %{_sysconfdir}/gconf/schemas/gnome-obex-server.schemas ] ; then
+		gconftool-2 --makefile-uninstall-rule \
+		%{_sysconfdir}/gconf/schemas/gnome-obex-server.schemas >/dev/null || :
+	fi
+	if [ -f %{_sysconfdir}/gconf/schemas/bluetooth-manager.schemas ] ; then
+		gconftool-2 --makefile-uninstall-rule 				\
+		%{_sysconfdir}/gconf/schemas/bluetooth-manager.schemas		\
+		>& /dev/null || :
+	fi
 fi
 
 %preun
 if [ "$1" -eq 0 ]; then
-    export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-    if [ -f %{_sysconfdir}/gconf/schemas/gnome-obex-server.schemas ] ; then
-      gconftool-2 --makefile-uninstall-rule \
-        %{_sysconfdir}/gconf/schemas/gnome-obex-server.schemas > /dev/null || :
-    fi
-    if [ -f %{_sysconfdir}/gconf/schemas/bluetooth-manager.schemas ] ; then
-      gconftool-2 --makefile-uninstall-rule 				\
-        %{_sysconfdir}/gconf/schemas/bluetooth-manager.schemas		\
-	>& /dev/null || :
-    fi
+	export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+	if [ -f %{_sysconfdir}/gconf/schemas/gnome-obex-server.schemas ] ; then
+		gconftool-2 --makefile-uninstall-rule \
+		%{_sysconfdir}/gconf/schemas/gnome-obex-server.schemas > /dev/null || :
+	fi
+	if [ -f %{_sysconfdir}/gconf/schemas/bluetooth-manager.schemas ] ; then
+		gconftool-2 --makefile-uninstall-rule 				\
+		%{_sysconfdir}/gconf/schemas/bluetooth-manager.schemas		\
+		>& /dev/null || :
+	fi
 fi
 
 %postun
 update-desktop-database -q
 if [ -x /usr/bin/gtk-update-icon-cache ]; then
-  /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
+	/usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
 fi
 
 %post libs -p /sbin/ldconfig
@@ -150,7 +150,7 @@ fi
 
 %files libs-devel
 %defattr(-,root,root,-)
-%{_includedir}/gnome-bluetooth/*.h
+%{_includedir}/gnome-bluetooth/
 %{_libdir}/libgnome-bluetooth.so
 %{_libdir}/pkgconfig/gnome-bluetooth-1.0.pc
 %{_datadir}/gtk-doc/html/gnome-bluetooth/
@@ -158,6 +158,7 @@ fi
 %changelog
 * Wed Mar 04 2009 - Bastien Nocera <bnocera@redhat.com> - 2.27.1-2
 - Update to 2.27.1
+- Loads of fixes mentioned by Bill Nottingham in bug #488498
 
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.12.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild