- patch for libimobiledevice-1.1.2 API change

- bump libimobiledevice BR
- rel. 3

Changed files:
    gvfs.spec -> 1.61
    unstable-libimobiledevice-api.patch -> 1.1

diff --git a/gvfs.spec b/gvfs.spec
index 19af023c508f9bda832eca83d23d25e6dc2b465f..5d3fb1643a3723ee106bb90bf6cfcdd4574af864 100644 (file)
--- a/gvfs.spec
+++ b/gvfs.spec
@@ -2,12 +2,13 @@ Summary:      gvfs - userspace virtual filesystem
 Summary(pl.UTF-8):     gvfs - wirtualny system plików w przestrzeni użytkownika
 Name:          gvfs
 Version:       1.12.0
-Release:       2
+Release:       3
 License:       LGPL v2+
 Group:         Libraries
 Source0:       http://ftp.gnome.org/pub/GNOME/sources/gvfs/1.12/%{name}-%{version}.tar.xz
 # Source0-md5: 0dd301b6d80b5ffa89e9a4a981abe297
 Patch0:                set_attributes_from_info-v1.patch
+Patch1:                unstable-libimobiledevice-api.patch
 BuildRequires: autoconf >= 2.64
 BuildRequires: automake >= 1:1.11.1
 BuildRequires: avahi-glib-devel >= 0.6.22
@@ -25,7 +26,7 @@ BuildRequires:        libfuse-devel >= 2.8.0
 BuildRequires: libgcrypt-devel >= 1.2.2
 BuildRequires: libgnome-keyring-devel
 BuildRequires: libgphoto2-devel >= 2.4.7
-BuildRequires: libimobiledevice-devel >= 1.1.0
+BuildRequires: libimobiledevice-devel >= 1.1.2
 BuildRequires: libplist-devel >= 0.15
 BuildRequires: libsmbclient-devel >= 3.0
 BuildRequires: libsoup-gnome-devel >= 2.26.0
@@ -103,6 +104,7 @@ Pakiet ten dostarcza bashowe uzupełnianie nazw dla gvfs.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{__intltoolize}

diff --git a/unstable-libimobiledevice-api.patch b/unstable-libimobiledevice-api.patch
new file mode 100644 (file)
index 0000000..e558f63
--- /dev/null
+++ b/unstable-libimobiledevice-api.patch
@@ -0,0 +1,27 @@
+diff -uNr gvfs-1.12.0/daemon/gvfsbackendafc.c gvfs-1.12.0.new/daemon/gvfsbackendafc.c
+--- gvfs-1.12.0/daemon/gvfsbackendafc.c        2012-03-26 16:35:11.000000000 +0200
++++ gvfs-1.12.0.new/daemon/gvfsbackendafc.c    2012-03-31 10:03:27.141244477 +0200
+@@ -343,7 +343,7 @@
+   g_return_if_fail (afc_backend->uuid != NULL);
+   if (event->event != IDEVICE_DEVICE_REMOVE)
+     return;
+-  if (g_str_equal (event->uuid, afc_backend->uuid) == FALSE)
++  if (g_str_equal (event->udid, afc_backend->uuid) == FALSE)
+     return;
+ 
+   g_print ("Shutting down AFC backend for device uuid %s\n", afc_backend->uuid);
+diff -uNr gvfs-1.12.0/monitor/afc/afcvolumemonitor.c gvfs-1.12.0.new/monitor/afc/afcvolumemonitor.c
+--- gvfs-1.12.0/monitor/afc/afcvolumemonitor.c 2012-03-26 16:35:11.000000000 +0200
++++ gvfs-1.12.0.new/monitor/afc/afcvolumemonitor.c     2012-03-31 10:23:02.284878178 +0200
+@@ -89,9 +89,9 @@
+   self = G_VFS_AFC_VOLUME_MONITOR(user_data);
+ 
+   if (event->event == IDEVICE_DEVICE_ADD)
+-    g_vfs_afc_monitor_create_volume (self, event->uuid);
++    g_vfs_afc_monitor_create_volume (self, event->udid);
+   else
+-    g_vfs_afc_monitor_remove_volume (self, event->uuid);
++    g_vfs_afc_monitor_remove_volume (self, event->udid);
+ }
+ 
+ static GObject *