diff --git a/baselibs.conf b/baselibs.conf index 1dd99fd..9770d1d 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1 +1 @@ -libimobiledevice3 +libimobiledevice4 diff --git a/libimobiledevice-1.1.4.tar.bz2 b/libimobiledevice-1.1.4.tar.bz2 deleted file mode 100644 index 1793912..0000000 --- a/libimobiledevice-1.1.4.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:67499cfaa6172f566ee6b0783605acffe484fb7ddc3b09881ab7ac58667ee5b8 -size 508371 diff --git a/libimobiledevice-1.1.5.tar.bz2 b/libimobiledevice-1.1.5.tar.bz2 new file mode 100644 index 0000000..0d5419b --- /dev/null +++ b/libimobiledevice-1.1.5.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d52ecd069dfc0abe8a81ed0718540df2def2f84b44e88ea783d44312b6f5f33e +size 577138 diff --git a/libimobiledevice-cython1.16-detection.patch b/libimobiledevice-cython1.16-detection.patch deleted file mode 100644 index c174bc9..0000000 --- a/libimobiledevice-cython1.16-detection.patch +++ /dev/null @@ -1,126 +0,0 @@ -From 70dfe8ad1766990386f1db04bbe5a4826bcde4e5 Mon Sep 17 00:00:00 2001 -From: Martin Szulecki -Date: Thu, 17 May 2012 13:42:50 +0000 -Subject: m4: Fix parsing of "artistic" cython version strings to fix version detection - ---- -diff --git a/m4/ac_pkg_cython.m4 b/m4/ac_pkg_cython.m4 -index 1b640e7..3b4c9a7 100644 ---- a/m4/ac_pkg_cython.m4 -+++ b/m4/ac_pkg_cython.m4 -@@ -6,8 +6,11 @@ AC_DEFUN([AC_PROG_CYTHON],[ - CYTHON=false - elif test -n "$1" ; then - AC_MSG_CHECKING([for Cython version]) -- [cython_version=`$CYTHON --version 2>&1 | grep 'Cython version' | sed 's/.*\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\).*/\1/g'`] -+ [cython_version=`$CYTHON --version 2>&1 | sed 's/Cython version \(.*\)$/\1/g'`] - AC_MSG_RESULT([$cython_version]) -+ -+ # Setup extra version string for parsing -+ [cython_version_stripped=`echo $cython_version | sed 's/\([0-9]\+\)\.\([0-9]\+\)[^\.]*\(\.\([0-9]\+\)\)\?.*/0\1.0\2.0\4/g'`] - if test -n "$cython_version" ; then - # Calculate the required version number components - [required=$1] -@@ -25,8 +28,9 @@ AC_DEFUN([AC_PROG_CYTHON],[ - if test -z "$required_patch" ; then - [required_patch=0] - fi -+ - # Calculate the available version number components -- [available=$cython_version] -+ [available=$cython_version_stripped] - [available_major=`echo $available | sed 's/[^0-9].*//'`] - if test -z "$available_major" ; then - [available_major=0] -@@ -41,6 +45,7 @@ AC_DEFUN([AC_PROG_CYTHON],[ - if test -z "$available_patch" ; then - [available_patch=0] - fi -+ - if test $available_major -gt $required_major || \ - ( test $available_major -eq $required_major && \ - test $available_minor -gt $required_minor ) || \ --- -cgit v0.8.3.1-34-gbf3d -From 84235e0834e57551028329723f4510e1dbe7bc11 Mon Sep 17 00:00:00 2001 -From: Martin Szulecki -Date: Thu, 17 May 2012 13:44:31 +0000 -Subject: cython: Do not override final methods as comply to Cython >= 0.16 strict check - ---- -diff --git a/cython/afc.pxi b/cython/afc.pxi -index cf72b69..0383471 100644 ---- a/cython/afc.pxi -+++ b/cython/afc.pxi -@@ -162,7 +162,7 @@ cdef class AfcClient(BaseService): - err = afc_client_free(self._c_client) - self.handle_error(err) - -- cdef inline BaseError _error(self, int16_t ret): -+ cdef BaseError _error(self, int16_t ret): - return AfcError(ret) - - cpdef list get_device_info(self): -diff --git a/cython/imobiledevice.pxd b/cython/imobiledevice.pxd -index d0d1ada..3ec8dfb 100644 ---- a/cython/imobiledevice.pxd -+++ b/cython/imobiledevice.pxd -@@ -51,8 +51,8 @@ cdef class BaseService(Base): - cdef class PropertyListService(BaseService): - cpdef send(self, plist.Node node) - cpdef object receive(self) -- cdef inline int16_t _send(self, plist.plist_t node) -- cdef inline int16_t _receive(self, plist.plist_t* c_node) -+ cdef int16_t _send(self, plist.plist_t node) -+ cdef int16_t _receive(self, plist.plist_t* c_node) - - cdef extern from "libimobiledevice/lockdown.h": - cdef struct lockdownd_client_private: -diff --git a/cython/imobiledevice.pyx b/cython/imobiledevice.pyx -index ffaa3c1..9d2e13d 100644 ---- a/cython/imobiledevice.pyx -+++ b/cython/imobiledevice.pyx -@@ -25,9 +25,8 @@ cdef class Base: - return 0 - cdef BaseError err = self._error(ret) - raise err -- return -1 - -- cdef inline BaseError _error(self, int16_t ret): pass -+ cdef BaseError _error(self, int16_t ret): pass - - cdef extern from "libimobiledevice/libimobiledevice.h": - ctypedef enum idevice_error_t: -@@ -211,10 +210,10 @@ cdef class PropertyListService(BaseService): - plist.plist_free(c_node) - raise - -- cdef inline int16_t _send(self, plist.plist_t node): -+ cdef int16_t _send(self, plist.plist_t node): - raise NotImplementedError("send is not implemented") - -- cdef inline int16_t _receive(self, plist.plist_t* c_node): -+ cdef int16_t _receive(self, plist.plist_t* c_node): - raise NotImplementedError("receive is not implemented") - - cdef class DeviceLinkService(PropertyListService): -diff --git a/cython/mobilesync.pxi b/cython/mobilesync.pxi -index 0ec4710..e610191 100644 ---- a/cython/mobilesync.pxi -+++ b/cython/mobilesync.pxi -@@ -149,10 +149,10 @@ cdef class MobileSyncClient(DeviceLinkService): - plist.plist_free(remapping) - raise - -- cdef inline int16_t _send(self, plist.plist_t node): -+ cdef int16_t _send(self, plist.plist_t node): - return mobilesync_send(self._c_client, node) - -- cdef inline int16_t _receive(self, plist.plist_t* node): -+ cdef int16_t _receive(self, plist.plist_t* node): - return mobilesync_receive(self._c_client, node) - - cdef inline BaseError _error(self, int16_t ret): --- -cgit v0.8.3.1-34-gbf3d - diff --git a/libimobiledevice-segfault-fix.patch b/libimobiledevice-segfault-fix.patch deleted file mode 100644 index 84f2a7e..0000000 --- a/libimobiledevice-segfault-fix.patch +++ /dev/null @@ -1,14 +0,0 @@ -The patch fixes segfault when both $XDG_CONFIG_HOME and $HOME are unset -Signed-off-by: Maxim Mikityanskiy ---- src/userpref.c.orig 2012-06-04 17:04:57.387303630 +0300 -+++ src/userpref.c 2012-06-04 17:06:05.741301627 +0300 -@@ -125,6 +125,9 @@ - const char *cdir = getenv("XDG_CONFIG_HOME"); - if (!cdir) { - cdir = getenv("HOME"); -+ if (!cdir) { -+ cdir="/root"; -+ } - strcpy(__config_dir, cdir); - strcat(__config_dir, DIR_SEP_S); - strcat(__config_dir, ".config"); diff --git a/libimobiledevice.changes b/libimobiledevice.changes index 75dad17..7f9a074 100644 --- a/libimobiledevice.changes +++ b/libimobiledevice.changes @@ -1,3 +1,20 @@ +------------------------------------------------------------------- +Mon Jul 8 23:08:39 UTC 2013 - dimstar@opensuse.org + +- Update to version 1.1.5: + + An improved idevicebackup2 tool. + + Various new tools. + + Better cross-platform building. + + Crash fixes. + + iOS 6+ compatibility fixes. + + An important API change related to service lifecycle + management. +- Drop libimobiledevice-cython1.16-detection.patch: fixed upstream. +- Drop libimobiledevice-segfault-fix.patch: fixed upstream. +- Change _lname defines to libimobiledevice4, following upstreams + soname change. +- Update baselibs.conf to follow the soname change. + ------------------------------------------------------------------- Mon Apr 15 12:29:14 UTC 2013 - mmeister@suse.com diff --git a/libimobiledevice.spec b/libimobiledevice.spec index ba41f70..a71f73c 100644 --- a/libimobiledevice.spec +++ b/libimobiledevice.spec @@ -19,8 +19,8 @@ %define with_python 0%{suse_version} < 1230 Name: libimobiledevice -%define _name libimobiledevice3 -Version: 1.1.4 +%define _name libimobiledevice4 +Version: 1.1.5 Release: 0 BuildRequires: gcc-c++ BuildRequires: libopenssl-devel @@ -44,9 +44,6 @@ BuildRequires: libusb-1_0-devel >= 1.0.3 %endif Source: http://www.libimobiledevice.org/downloads/%{name}-%{version}.tar.bz2 Source1: baselibs.conf -Patch0: libimobiledevice-cython1.16-detection.patch -# PATCH-FIX-UPSTREAM libimobiledevice-segfault-fix.patch bnc768537 libiphone273 sbrabec@suse.cz -- Fix segfault without $XDG_CONFIG_HOME and $HOME set. -Patch1: libimobiledevice-segfault-fix.patch Summary: Native protocols library for iPhone, iPod Touch and iPad License: LGPL-2.1+ Group: System/Libraries @@ -120,8 +117,6 @@ Contains Python bindings for developing applications that use %{_name}. %prep %setup -q -n %{name}-%{version} -%patch0 -p1 -%patch1 %build autoreconf -fi @@ -167,20 +162,26 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/idevicesyslog %{_bindir}/idevicebackup %{_bindir}/idevicebackup2 +%{_bindir}/idevicedebugserverproxy +%{_bindir}/idevicediagnostics %{_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.* +%{_bindir}/ideviceprovision +%doc %{_mandir}/man1/idevice_id.1%{?ext_man} +%doc %{_mandir}/man1/idevicepair.1%{?ext_man} +%doc %{_mandir}/man1/ideviceinfo.1%{?ext_man} +%doc %{_mandir}/man1/idevicesyslog.1%{?ext_man} +%doc %{_mandir}/man1/idevicebackup.1%{?ext_man} +%doc %{_mandir}/man1/idevicebackup2.1%{?ext_man} +%doc %{_mandir}/man1/idevicedebugserverproxy.1%{?ext_man} +%doc %{_mandir}/man1/idevicediagnostics.1%{?ext_man} +%doc %{_mandir}/man1/ideviceimagemounter.1%{?ext_man} +%doc %{_mandir}/man1/idevicescreenshot.1%{?ext_man} +%doc %{_mandir}/man1/ideviceenterrecovery.1%{?ext_man} +%doc %{_mandir}/man1/idevicedate.1%{?ext_man} +%doc %{_mandir}/man1/ideviceprovision.1%{?ext_man} %files doc %defattr (-, root, root)