[packages/libimobiledevice] - updated to 1.1.5 - old cython patch obsolete; replaced by new one (needed at least with Cython 0.1
qboosh
qboosh at pld-linux.org
Sun Sep 1 10:56:00 CEST 2013
commit b0e585fcff3673bd23be546331d34b0c416963af
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sun Sep 1 10:55:40 2013 +0200
- updated to 1.1.5
- old cython patch obsolete; replaced by new one (needed at least with Cython 0.19.x)
libimobiledevice-cython.patch | 114 ++++--------------------------------------
libimobiledevice.spec | 18 ++++---
2 files changed, 23 insertions(+), 109 deletions(-)
---
diff --git a/libimobiledevice.spec b/libimobiledevice.spec
index 307ce5a..36e007e 100644
--- a/libimobiledevice.spec
+++ b/libimobiledevice.spec
@@ -12,13 +12,13 @@
Summary: Library for connecting to mobile devices
Summary(pl.UTF-8): Biblioteka do łączenia się z urządzeniami mobilnymi
Name: libimobiledevice
-Version: 1.1.4
+Version: 1.1.5
Release: 1
License: LGPL v2+
Group: Libraries
#Source0Download: http://www.libimobiledevice.org/
Source0: http://www.libimobiledevice.org/downloads/%{name}-%{version}.tar.bz2
-# Source0-md5: 3f28cbc6a2e30d34685049c0abde5183
+# Source0-md5: d9debdcf71508dee2c85b60b28ccddd4
Patch0: %{name}-cython.patch
URL: http://www.libimobiledevice.org/
BuildRequires: autoconf >= 2.61
@@ -31,7 +31,7 @@ BuildRequires: libstdc++-devel
BuildRequires: libtool
%{?with_openssl:BuildRequires: openssl-devel >= 0.9.8}
BuildRequires: pkgconfig
-%{?with_cython:BuildRequires: python-Cython >= 0.13.0}
+%{?with_cython:BuildRequires: python-Cython >= 0.17.0}
BuildRequires: python-devel >= 2.3
BuildRequires: python-modules >= 2.3
BuildRequires: rpm-pythonprov
@@ -127,26 +127,32 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
%doc AUTHORS NEWS README
+%attr(755,root,root) %{_bindir}/idevice_id
%attr(755,root,root) %{_bindir}/idevicebackup
%attr(755,root,root) %{_bindir}/idevicebackup2
%attr(755,root,root) %{_bindir}/idevicedate
+%attr(755,root,root) %{_bindir}/idevicedebugserverproxy
+%attr(755,root,root) %{_bindir}/idevicediagnostics
%attr(755,root,root) %{_bindir}/ideviceenterrecovery
-%attr(755,root,root) %{_bindir}/idevice_id
%attr(755,root,root) %{_bindir}/ideviceimagemounter
%attr(755,root,root) %{_bindir}/ideviceinfo
%attr(755,root,root) %{_bindir}/idevicepair
+%attr(755,root,root) %{_bindir}/ideviceprovision
%attr(755,root,root) %{_bindir}/idevicescreenshot
%attr(755,root,root) %{_bindir}/idevicesyslog
%attr(755,root,root) %{_libdir}/libimobiledevice.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libimobiledevice.so.3
+%attr(755,root,root) %ghost %{_libdir}/libimobiledevice.so.4
+%{_mandir}/man1/idevice_id.1*
%{_mandir}/man1/idevicebackup.1*
%{_mandir}/man1/idevicebackup2.1*
%{_mandir}/man1/idevicedate.1*
+%{_mandir}/man1/idevicedebugserverproxy.1*
+%{_mandir}/man1/idevicediagnostics.1*
%{_mandir}/man1/ideviceenterrecovery.1*
-%{_mandir}/man1/idevice_id.1*
%{_mandir}/man1/ideviceimagemounter.1*
%{_mandir}/man1/ideviceinfo.1*
%{_mandir}/man1/idevicepair.1*
+%{_mandir}/man1/ideviceprovision.1*
%{_mandir}/man1/idevicescreenshot.1*
%{_mandir}/man1/idevicesyslog.1*
diff --git a/libimobiledevice-cython.patch b/libimobiledevice-cython.patch
index ad3a662..a13be43 100644
--- a/libimobiledevice-cython.patch
+++ b/libimobiledevice-cython.patch
@@ -1,103 +1,11 @@
---- libimobiledevice-1.1.4/m4/ac_pkg_cython.m4.orig 2012-04-07 16:14:02.000000000 +0200
-+++ libimobiledevice-1.1.4/m4/ac_pkg_cython.m4 2012-09-06 16:49:26.457727996 +0200
-@@ -6,7 +6,7 @@
- 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 | grep 'Cython version' | sed 's/.*\<\([0-9][0-9]*\.[0-9][0-9]*\(\.[0-9][0-9]*\)\?\).*/\1/g'`]
- AC_MSG_RESULT([$cython_version])
- if test -n "$cython_version" ; then
- # Calculate the required version number components
-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.9.0.2
---- libimobiledevice-1.1.4/cython/imobiledevice.pxd.orig 2012-09-06 19:18:33.427541516 +0200
-+++ libimobiledevice-1.1.4/cython/imobiledevice.pxd 2012-09-06 19:52:45.620832075 +0200
-@@ -12,7 +12,7 @@
-
- cdef class Base:
- cdef inline int handle_error(self, int16_t ret) except -1
-- cdef inline BaseError _error(self, int16_t ret)
-+ cdef BaseError _error(self, int16_t ret)
-
- cdef class iDeviceError(BaseError): pass
-
+--- libimobiledevice-1.1.5/cython/lockdown.pxi.orig 2013-03-07 23:05:33.000000000 +0100
++++ libimobiledevice-1.1.5/cython/lockdown.pxi 2013-09-01 10:16:46.775583997 +0200
+@@ -219,7 +219,7 @@
+ cdef:
+ lockdownd_error_t err
+ char* c_session_id = NULL
+- bint ssl_enabled
++ int ssl_enabled
+ bytes session_id
+ err = lockdownd_start_session(self._c_client, host_id, &c_session_id, &ssl_enabled)
+ try:
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/libimobiledevice.git/commitdiff/b0e585fcff3673bd23be546331d34b0c416963af
More information about the pld-cvs-commit
mailing list