From 84c6805622d15d471c3bc9c1daf15aaaa240fc9b361fff399bb7d3dc48390bd0 Mon Sep 17 00:00:00 2001
From: Vincent Untz <vuntz@opensuse.org>
Date: Mon, 25 Apr 2011 09:44:37 +0000
Subject: [PATCH] Accepting request 68298 from
 home:vuntz:branches:GNOME:Factory

ok

OBS-URL: https://build.opensuse.org/request/show/68298
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-bluetooth?expand=0&rev=65
---
 gnome-bluetooth-3.0.patch | 25 -------------------------
 gnome-bluetooth.changes   | 13 +++++++------
 gnome-bluetooth.spec      | 10 +++++-----
 3 files changed, 12 insertions(+), 36 deletions(-)
 delete mode 100644 gnome-bluetooth-3.0.patch

diff --git a/gnome-bluetooth-3.0.patch b/gnome-bluetooth-3.0.patch
deleted file mode 100644
index e0f3697..0000000
--- a/gnome-bluetooth-3.0.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 16f8f60dc745f1d6dddfde031fd777959da8a226 Mon Sep 17 00:00:00 2001
-From: Bastien Nocera <hadess@hadess.net>
-Date: Mon, 21 Feb 2011 15:27:03 +0000
-Subject: [PATCH] sendto: Re-enable sendto plugin for 3.0
-
----
- configure.ac |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index eef6346..be8fcb7 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -77,7 +77,7 @@ GLIB_REQUIRED=2.25.7
- DBUS_GLIB_REQUIRED=0.74
- NOTIFY_REQUIRED=0.7.0
- NAUTILUS_SENDTO_REQUIRED=2.29.0
--NAUTILUS_SENDTO_MAX_REQUIRED=2.91.0
-+NAUTILUS_SENDTO_MAX_REQUIRED=3.1.0
- 
- dnl Requires for the properties window
- PANELS_DIR="${libdir}/control-center-1/panels"
--- 
-1.7.1
-
diff --git a/gnome-bluetooth.changes b/gnome-bluetooth.changes
index 59fca33..3633e72 100644
--- a/gnome-bluetooth.changes
+++ b/gnome-bluetooth.changes
@@ -76,14 +76,15 @@ Tue Mar 29 13:58:08 UTC 2011 - fcrozat@novell.com
   + Moblin/MeeGo:
     - Use bluetoothd backed power switch
     - Some re-designs for meego
-- obexd-client is needed, not obexd
+- Change obexed Requires to obexd-client.
 - Drop gnome-bluetooth-fix-introspection-build.patch: fixed
   upstream.
-- Update Build Requires:
-  - no longer needs libunique-devel
-  - switch to GNOME3 : pkgconfig(dbus-glib-1), 
-    pkgconfig(gtk+-3.0), pkgconfig(libgnome-control-center),
-    pkgconfig(nautilus-sendto)
+- Remove no longer needed libunique-devel BuildRequires.
+- Add pkgconfig() BuildRequires now needed: dbus-glib-1, gtk+-3.0,
+  libgnome-control-center.
+- Move to pkgconfig()-style BuildRequires:
+  + Old ones: nautilus-sendto-devel
+  + New ones: nautilus-sendto.
 - Add support for source service checkout, with %BUILD_FROM_VCS:
   + Add gnome-common and gtk-doc BuildRequires.
   + Add call to ./autogen.sh.
diff --git a/gnome-bluetooth.spec b/gnome-bluetooth.spec
index 3bbdab8..0511c13 100644
--- a/gnome-bluetooth.spec
+++ b/gnome-bluetooth.spec
@@ -33,12 +33,12 @@ BuildRequires:  gnome-doc-utils-devel
 BuildRequires:  gobject-introspection-devel
 BuildRequires:  intltool
 BuildRequires:  libnotify-devel
+BuildRequires:  translation-update-upstream
+BuildRequires:  update-desktop-files
 BuildRequires:  pkgconfig(dbus-glib-1)
 BuildRequires:  pkgconfig(gtk+-3.0)
 BuildRequires:  pkgconfig(libgnome-control-center)
 BuildRequires:  pkgconfig(nautilus-sendto)
-BuildRequires:  translation-update-upstream
-BuildRequires:  update-desktop-files
 %if 0%{?BUILD_FROM_VCS}
 BuildRequires:  gnome-common
 BuildRequires:  gtk-doc
@@ -137,8 +137,8 @@ rm -f %{buildroot}%{_libdir}/libgnome-bluetooth.la \
       %{buildroot}%{_libdir}/gnome-bluetooth/plugins/*.la \
       %{buildroot}%{_libdir}/nautilus-sendto/plugins/*.la \
       %{buildroot}/%{_libdir}/control-center-1/panels/libbluetooth.la
-%suse_update_desktop_file bluetooth-properties
 %suse_update_desktop_file bluetooth-applet
+%suse_update_desktop_file bluetooth-properties
 %suse_update_desktop_file bluetooth-sendto
 %suse_update_desktop_file bluetooth-wizard
 %find_lang %{name}2 %{?no_lang_C}
@@ -181,14 +181,14 @@ rm -rf %{buildroot}
 %doc %{_datadir}/omf/%{name}/%{name}-C.omf
 /lib/udev/rules.d/61-gnome-bluetooth-rfkill.rules
 %{_bindir}/bluetooth-*
-%{_libdir}/control-center-1/panels/libbluetooth.so
 %{_sysconfdir}/xdg/autostart/bluetooth-applet.desktop
 %{_datadir}/applications/bluetooth-properties.desktop
-%{_datadir}/applications/bluetooth-wizard.desktop
 %{_datadir}/applications/bluetooth-sendto.desktop
+%{_datadir}/applications/bluetooth-wizard.desktop
 %{_datadir}/gnome-bluetooth/
 %{_datadir}/icons/hicolor/*/*/bluetooth*
 %{_mandir}/man1/bluetooth-*
+%{_libdir}/control-center-1/panels/libbluetooth.so
 # Own the plugin directory, but exclude the plugin library itself
 %dir %{_libdir}/gnome-bluetooth
 %{_libdir}/gnome-bluetooth/libgnome-bluetooth-applet.*