Accepting request 70132 from mobile:synchronization:FACTORY

For dimstar, because he asked so nicely.

OBS-URL: https://build.opensuse.org/request/show/70132
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libimobiledevice?expand=0&rev=10

0b40ddb1f41c94a3ee58abc6326e59d65662e5c7.patch

@@ -1,18 +0,0 @@
-From 0b40ddb1f41c94a3ee58abc6326e59d65662e5c7 Mon Sep 17 00:00:00 2001
-From: Martin Szulecki
-Date: Thu, 16 Dec 2010 22:01:15 +0000
-Subject: Python: Fix SWIG includes to pass make distcheck
-
----
-diff --git a/swig/Makefile.am b/swig/Makefile.am
-index 0953a56..8c1f2b9 100644
---- a/swig/Makefile.am
-+++ b/swig/Makefile.am
-@@ -1,4 +1,4 @@
--AM_CPPFLAGS = -I$(top_srcdir)/include  $(libplist_CFLAGS) $(SWIG_PYTHON_CPPFLAGS) -I$(oldincludedir)
-+AM_CPPFLAGS = -I$(top_srcdir)/include $(libglib2_CFLAGS) $(libplist_CFLAGS) $(SWIG_PYTHON_CPPFLAGS) -I$(oldincludedir)
- 
- if HAVE_SWIG
- BUILT_SOURCES = imobiledevice_wrap.cxx
---
-cgit v0.8.3.1-34-gbf3d

libimobiledevice-1.0.4.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2b836f09b95c9cf644ac824647b66d823cd135c5e0d4a8fca863d5314734d046
-size 413573

libimobiledevice-1.1.1.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c544d7bf0e7d6a97f3c446b2fb4597f19aac7b184ea806e16cd6a7852fd25f67
+size 459976

libimobiledevice-gstatbuf-fix.patch

@@ -0,0 +1,13 @@
+diff --git a/tools/idevicebackup2.c b/tools/idevicebackup2.c
+index 574155f..b57f86c 100644
+--- a/tools/idevicebackup2.c
++++ b/tools/idevicebackup2.c
+@@ -910,7 +910,7 @@ static void mb2_handle_list_directory(plist_t message, const char *backup_dir)
+ 			gchar *fpath = g_build_filename(path, dir_file, NULL);
+ 			if (fpath) {
+ 				plist_t fdict = plist_new_dict();
+-				GStatBuf st;
++				struct stat st;
+ 				g_stat(fpath, &st);
+ 				const char *ftype = "DLFileTypeUnknown";
+ 				if (g_file_test(fpath, G_FILE_TEST_IS_DIR)) {

libimobiledevice.changes

@@ -1,3 +1,60 @@
+-------------------------------------------------------------------
+Thu May 12 16:05:12 UTC 2011 - dimstar@opensuse.org
+
+- Change License tags to LGPLv2.1+ and GPLv2+ (Some of the tools
+  are GPLv2+) and add COPYING.LESSER to the library package.
+
+-------------------------------------------------------------------
+Thu Apr 28 21:49:46 CEST 2011 - opensuse@sukimashita.com
+
+- Update to 1.1.1:
+  + Add new idevicebackup2 tool for full backup and restore
+    support on iOS 4+
+  + Add a workaround for a bug in iOS 4.3 affecting
+    lockdown_get_value() which most prominently affected libgpod,
+    gvfs, ideviceinfo and some other tools
+  + Read ProxyDeath message to preventing obsolete messages in
+    device syslog
+  + Rework SWIG detection and includes
+  + Add new idevicedate tool to get or set the clock on iDevices
+  + API: Add mobilesync_clear_all_records_on_device()
+  + API: Change device_link_service_disconnect() to accept a
+    message
+  + Add manpages for ideviceenterrecovery, idevicepair,
+    idevicebackup2 and idevicedate
+  + Add missing libgen.h include to silence compiler warnings
+  + Fix a segfault that might occur if locally stored certs
+    could not be read
+  + Fix various memory leaks
+  + Update documentation
+- Add libimobiledevice-gstatbuf-fix.patch to fix build of oS < 11.4
+
+-------------------------------------------------------------------
+Mon Feb 28 11:01:08 UTC 2011 - fcrozat@novell.com
+
+- Update to 1.1.0:
+  + Note that this is a development release, which means:
+    - Python Bindings will get refactored completely
+    - API is UNSTABLE
+  + Implement restoring backups using idevicebackup
+  + Allow connecting without pairing using "ideviceinfo -s"
+  + Add ideviceenterrecovery tool
+  + Add mobilesync service implementation
+  + Add restored service implementation for restore mode
+  + Add home_arrest service implementation for document sharing
+  + Add API afc_client_new_from_connection()
+  + Support to fetch wallpaper in sbservices
+  + Support for formatVersion 2 of iOS 4+ in sbservices
+  + Add new lockdownd domains to ideviceinfo
+  + Give the device time to prepare backup data to prevent abort
+  + Improve idevicebackup output
+  + notification_proxy fixes and new notification type
+  + Silence some 64bit compiler warnings
+  + Fix various memory leaks
+  + Update documentation
+- Drop 0b40ddb1f41c94a3ee58abc6326e59d65662e5c7.patch: fixed
+  upstream.
+
 -------------------------------------------------------------------
 Wed Dec 29 23:36:07 UTC 2010 - andreas.hanke@gmx-topmail.de
 

libimobiledevice.spec

@@ -1,5 +1,5 @@
 #
-# spec file for package libimobiledevice (Version 1.0.4)
+# spec file for package libimobiledevice
 #
 # Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -19,10 +19,10 @@
 
 
 Name:           libimobiledevice
-%define _name   libimobiledevice1
+%define _name   libimobiledevice2
-Version:        1.0.4
+Version:        1.1.1
-Release:        1
+Release:        2
-License:        LGPL v2 or later
+License:        GPLv2+; LGPLv2.1+
 BuildRequires:  gcc-c++ glib2-devel libtasn1-devel libxml2-devel sed
 BuildRequires:  libusbmuxd-devel >= 1.0.0
 BuildRequires:  libplist++-devel >= 1.1 libplist-devel >= 1.1
@@ -36,7 +36,7 @@ BuildRequires:  libusb-1_0-devel >= 1.0.3
 %endif
 BuildRequires:  libgcrypt-devel libgnutls-devel
 Source:         %{name}-%{version}.tar.bz2
-Patch0:         0b40ddb1f41c94a3ee58abc6326e59d65662e5c7.patch
+Patch1:         %{name}-gstatbuf-fix.patch
 Group:          System/Libraries
 Summary:        Native protocols library for iPhone, iPod Touch and iPad
 Url:            http://www.libimobiledevice.org
@@ -50,26 +50,8 @@ libimobiledevice is a software library that talks the protocols to support
 iPhone, iPod Touch and iPad devices. Unlike other projects, it does not depend
 on using any existing `.dll` or `.so` libraries from Apple.
 
-
-
-Authors:  
---------  
-    Christophe Fergeau
-    Jonathan Beck
-    Matthew Colyer
-    Martin Aumueller
-    Martin Szulecki
-    Nikias Bassen
-    Patrick Walton
-    Paul Sladen
-    Todd Zullinger
-    Zach C.
-    Zoltan Balaton
-
 %package -n %{_name}
-
+License:        LGPLv2.1+
-
-License:        LGPL v2 or later
 Summary:        Native protocols library for iPhone, iPod Touch and iPad
 Group:          System/Libraries
 Provides:       %{name} = %{version}
@@ -81,24 +63,8 @@ libimobiledevice is a software library that talks the protocols to support
 iPhone, iPod Touch and iPad devices. Unlike other projects, it does not depend
 on using any existing `.dll` or `.so` libraries from Apple.
 
-
-
-Authors:  
---------  
-    Christophe Fergeau
-    Jonathan Beck
-    Matthew Colyer
-    Martin Aumueller
-    Martin Szulecki
-    Nikias Bassen
-    Patrick Walton
-    Paul Sladen
-    Todd Zullinger
-    Zach C.
-    Zoltan Balaton
-
 %package devel
-License:        LGPL v2 or later
+License:        LGPLv2.1+
 Summary:        Development files for %{_name}
 Group:          Development/Libraries/C and C++
 Requires:       %{_name} = %{version}
@@ -110,24 +76,8 @@ Requires:       glibc-devel
 The %{name}-devel package contains libraries and header files for
 developing applications that use %{_name}.
 
-
-
-Authors:  
---------  
-    Christophe Fergeau
-    Jonathan Beck
-    Matthew Colyer
-    Martin Aumueller
-    Martin Szulecki
-    Nikias Bassen
-    Patrick Walton
-    Paul Sladen
-    Todd Zullinger
-    Zach C.
-    Zoltan Balaton
-
 %package tools
-License:        LGPL v2 or later
+License:        GPLv2+; LGPLv2.1+
 Summary:        Tools using %{_name} for iPhone, iPod Touch and iPad
 Group:          Productivity/Multimedia/Other
 Requires:       %{_name} = %{version}
@@ -137,48 +87,16 @@ libimobiledevice is a software library that talks the protocols to support
 iPhone, iPod Touch and iPad devices. Unlike other projects, it does not depend
 on using any existing `.dll` or `.so` libraries from Apple.
 
-
-
-Authors:  
---------  
-    Christophe Fergeau
-    Jonathan Beck
-    Matthew Colyer
-    Martin Aumueller
-    Martin Szulecki
-    Nikias Bassen
-    Patrick Walton
-    Paul Sladen
-    Todd Zullinger
-    Zach C.
-    Zoltan Balaton
-
 %package doc
-License:        LGPL v2 or later
+License:        LGPLv2.1+
 Summary:        API Reference Documentation for %{_name}
 Group:          Development/Libraries/C and C++
 
 %description doc
 Contains API reference documentation for developers using %{_name}.
 
-
-
-Authors:  
---------  
-    Christophe Fergeau
-    Jonathan Beck
-    Matthew Colyer
-    Martin Aumueller
-    Martin Szulecki
-    Nikias Bassen
-    Patrick Walton
-    Paul Sladen
-    Todd Zullinger
-    Zach C.
-    Zoltan Balaton
-
 %package -n python-imobiledevice
-License:        LGPL v2 or later
+License:        LGPLv2.1+
 Summary:        Python bindings for %{_name}
 Group:          Development/Languages/Python
 Requires:       %{_name} = %{version}
@@ -188,32 +106,16 @@ Requires:       libplist++1 >= 0.16
 %description -n python-imobiledevice
 Contains Python bindings for developing applications that use %{_name}.
 
-
-
-Authors:  
---------  
-    Christophe Fergeau
-    Jonathan Beck
-    Matthew Colyer
-    Martin Aumueller
-    Martin Szulecki
-    Nikias Bassen
-    Patrick Walton
-    Paul Sladen
-    Todd Zullinger
-    Zach C.
-    Zoltan Balaton
-
 %prep
 %setup -q -n %{name}-%{version}
-%patch0 -p1
+%patch1 -p1
 
 %build
 sed -i -e '/Requires:/d' %{name}-1.0.pc.in
 sed -i -e 's/-L${libdir}//' %{name}-1.0.pc.in
 export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
 %configure --disable-silent-rules \
-	--disable-static
+	--disable-static --disable-dev-tools
 make %{?jobs:-j%jobs}
 
 %install
@@ -230,6 +132,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n %{_name}
 %defattr(-,root,root)
+%doc COPYING.LESSER
 %{_libdir}/%{name}.so.*
 
 %files devel
@@ -246,14 +149,21 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/ideviceinfo
 %{_bindir}/idevicesyslog
 %{_bindir}/idevicebackup
+%{_bindir}/idevicebackup2
 %{_bindir}/ideviceimagemounter
 %{_bindir}/idevicescreenshot
+%{_bindir}/ideviceenterrecovery
+%{_bindir}/idevicedate
 %doc %{_mandir}/man1/idevice_id.1.*
+%doc %{_mandir}/man1/idevicepair.1.*
 %doc %{_mandir}/man1/ideviceinfo.1.*
 %doc %{_mandir}/man1/idevicesyslog.1.*
 %doc %{_mandir}/man1/idevicebackup.1.*
+%doc %{_mandir}/man1/idevicebackup2.1.*
 %doc %{_mandir}/man1/ideviceimagemounter.1.*
 %doc %{_mandir}/man1/idevicescreenshot.1.*
+%doc %{_mandir}/man1/ideviceenterrecovery.1.*
+%doc %{_mandir}/man1/idevicedate.1.*
 
 %files doc
 %defattr (-, root, root)