Accepting request 114396 from mobile:synchronization:FACTORY

- Allow compilation on 11.4 by disabling cython bindings

- Update to 1.1.4:
  - Fix a bug in idevicesyslog causing the connection to close after timeout
  - Bump soname revision
  - Bump libusbmuxd dependency to 1.0.8
  - Fix reading from syslog_relay and remove null characters
  - Relicense ideviceimagemounter and idevicescreenshot to LGPL
  - Fix a crash when using restored_client_free()
  - API: Add sbservices_get_interface_orientation()
  - Update man pages and code comments for documentation
  - Minor cleanup
  - Add Python bindings generated by Cython
  - Bump libplist requirement to latest 1.8
  - Add support for OpenSSL with fallback to GNUTLS
  - Improvements and various fixes for Win32 and OS X build
  - Remove glib dependency
  - Improve restored implementation
  - Fix various memory leaks
  - Fix support for iOS 5 and later
- Remove swig patch as bindings have been removed
- Remove gstatbuf patch as it is obselete now

OBS-URL: https://build.opensuse.org/request/show/114396
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libimobiledevice?expand=0&rev=19
This commit is contained in:
Stephan Kulow 2012-04-18 14:28:28 +00:00 committed by Git OBS Bridge
parent e0f3451181
commit 3da718c4ab
7 changed files with 68 additions and 232 deletions

View File

@ -1 +1 @@
libimobiledevice2
libimobiledevice3

View File

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

View File

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

View File

@ -1,13 +0,0 @@
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)) {

View File

@ -1,186 +0,0 @@
--- m4/ac_pkg_swig.m4 2010-01-08 16:34:39.000000000 +0100
+++ m4/ac_pkg_swig.m4 2011-05-26 11:46:27.778022446 +0200
@@ -1,6 +1,4 @@
-# ===========================================================================
-# http://autoconf-archive.cryp.to/ac_pkg_swig.html
-# ===========================================================================
+##### http://autoconf-archive.cryp.to/ac_pkg_swig.html
#
# SYNOPSIS
#
@@ -8,14 +6,15 @@
#
# DESCRIPTION
#
-# This macro searches for a SWIG installation on your system. If found you
-# should call SWIG via $(SWIG). You can use the optional first argument to
-# check if the version of the available SWIG is greater than or equal to
-# the value of the argument. It should have the format: N[.N[.N]] (N is a
-# number between 0 and 999. Only the first N is mandatory.)
+# This macro searches for a SWIG installation on your system. If
+# found you should call SWIG via $(SWIG). You can use the optional
+# first argument to check if the version of the available SWIG is
+# greater than or equal to the value of the argument. It should have
+# the format: N[.N[.N]] (N is a number between 0 and 999. Only the
+# first N is mandatory.)
#
-# If the version argument is given (e.g. 1.3.17), AC_PROG_SWIG checks that
-# the swig package is this version number or higher.
+# If the version argument is given (e.g. 1.3.17), AC_PROG_SWIG checks
+# that the swig package is this version number or higher.
#
# In configure.in, use as:
#
@@ -26,46 +25,64 @@
#
# LAST MODIFICATION
#
-# 2008-04-12
+# 2006-10-22
#
# COPYLEFT
#
-# Copyright (c) 2008 Sebastian Huber <sebastian-huber@web.de>
-# Copyright (c) 2008 Alan W. Irwin <irwin@beluga.phys.uvic.ca>
-# Copyright (c) 2008 Rafael Laboissiere <rafael@laboissiere.net>
-# Copyright (c) 2008 Andrew Collier <colliera@ukzn.ac.za>
-#
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by the
-# Free Software Foundation; either version 2 of the License, or (at your
-# option) any later version.
+# Copyright (c) 2006 Sebastian Huber <sebastian-huber@web.de>
+# Copyright (c) 2006 Alan W. Irwin <irwin@beluga.phys.uvic.ca>
+# Copyright (c) 2006 Rafael Laboissiere <rafael@laboissiere.net>
+# Copyright (c) 2006 Andrew Collier <colliera@ukzn.ac.za>
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2 of the
+# License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
-# Public License for more details.
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
#
-# You should have received a copy of the GNU General Public License along
-# with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-# As a special exception, the respective Autoconf Macro's copyright owner
-# gives unlimited permission to copy, distribute and modify the configure
-# scripts that are the output of Autoconf when processing the Macro. You
-# need not follow the terms of the GNU General Public License when using
-# or distributing such scripts, even though portions of the text of the
-# Macro appear in them. The GNU General Public License (GPL) does govern
-# all other use of the material that constitutes the Autoconf Macro.
-#
-# This special exception to the GPL applies to versions of the Autoconf
-# Macro released by the Autoconf Macro Archive. When you make and
-# distribute a modified version of the Autoconf Macro, you may extend this
-# special exception to the GPL to apply to your modified version as well.
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+#
+# As a special exception, the respective Autoconf Macro's copyright
+# owner gives unlimited permission to copy, distribute and modify the
+# configure scripts that are the output of Autoconf when processing
+# the Macro. You need not follow the terms of the GNU General Public
+# License when using or distributing such scripts, even though
+# portions of the text of the Macro appear in them. The GNU General
+# Public License (GPL) does govern all other use of the material that
+# constitutes the Autoconf Macro.
+#
+# This special exception to the GPL applies to versions of the
+# Autoconf Macro released by the Autoconf Macro Archive. When you
+# make and distribute a modified version of the Autoconf Macro, you
+# may extend this special exception to the GPL to apply to your
+# modified version as well.
+
+AC_DEFUN([SWIG_VERSION_GOOD],[
+ AC_MSG_NOTICE([SWIG executable is '$SWIG'])
+ SWIG_LIB=`$SWIG -swiglib`
+ AC_MSG_NOTICE([SWIG library directory is '$SWIG_LIB'])
+ SWIG_VERSION=`echo $(( $available_major * 100 * 100 + $available_minor * 100 + $available_patch ))`
+ AC_MSG_NOTICE([SWIG version is '$SWIG_VERSION'])
+ # AM_CONDITIONAL(SWIG_NEW_OPTIONS, test "$SWIG_VERSION" \> 10331)
+])
+
+AC_DEFUN([SWIG_VERSION_BAD],[
+ AC_MSG_WARN([SWIG version >= $1 is required. You have $swig_version. You should look at http://www.swig.org])
+ SWIG='echo "Error: SWIG version >= $1 is required. You have '"$swig_version"'. You should look at http://www.swig.org" ; false'
+])
AC_DEFUN([AC_PROG_SWIG],[
AC_PATH_PROG([SWIG],[swig])
if test -z "$SWIG" ; then
- AC_MSG_WARN([cannot find 'swig' program. You should look at http://www.swig.org] or install your distribution specific swig package.)
- SWIG=false
+ AC_MSG_WARN([cannot find 'swig' program. You should look at http://www.swig.org])
+ SWIG='echo "Error: SWIG is not installed. You should look at http://www.swig.org" ; false'
elif test -n "$1" ; then
AC_MSG_CHECKING([for SWIG version])
[swig_version=`$SWIG -version 2>&1 | grep 'SWIG Version' | sed 's/.*\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\).*/\1/g'`]
@@ -103,19 +120,47 @@
if test -z "$available_patch" ; then
[available_patch=0]
fi
- if test $available_major -ne $required_major \
- -o $available_minor -ne $required_minor \
- -o $available_patch -lt $required_patch ; then
- AC_MSG_WARN([SWIG version >= $1 is required. You have $swig_version. You should look at http://www.swig.org])
- SWIG=false
- else
- AC_MSG_NOTICE([SWIG executable is '$SWIG'])
- SWIG_LIB=`$SWIG -swiglib`
- AC_MSG_NOTICE([SWIG library directory is '$SWIG_LIB'])
- fi
+
+
+
+ if test $available_major -gt $required_major; then
+ # the available major is greater than required major --GOOD
+ SWIG_VERSION_GOOD()
+
+ elif test $available_major -lt $required_major ; then
+ # the avialable major is less than required major -- BAD
+ SWIG_VERSION_BAD()
+ else
+ # the available and require major are equal check the minor and patch versions.
+
+ if test $available_minor -gt $required_minor ; then
+ # GOOD
+ SWIG_VERSION_GOOD()
+ elif test $avaialble_minor -lt $required_minor ; then
+ # BAD
+ SWIG_VERSION_BAD()
+ else
+ # the minor version are also equal
+
+ if test $available_patch -gt $required_patch ; then
+ # GOOD
+ SWIG_VERSION_GOOD()
+ elif test $available_minor -lt $required_minor ; then
+ # BAD
+ SWIG_VERSION_BAD()
+ else
+ # all the available major, minor and patch levels are the same as the required -- GOOD
+ SWIG_VERSION_GOOD()
+ fi
+ fi
+ fi
+
+
+
+
else
AC_MSG_WARN([cannot determine SWIG version])
- SWIG=false
+ SWIG='echo "Error: Cannot determine SWIG version. You should look at http://www.swig.org" ; false'
fi
fi
AC_SUBST([SWIG_LIB])

View File

@ -1,3 +1,32 @@
-------------------------------------------------------------------
Mon Apr 09 15:45:03 CEST 2012 - opensuse@sukimashita.com
- Allow compilation on 11.4 by disabling cython bindings
-------------------------------------------------------------------
Mon Apr 09 02:20:51 CEST 2012 - opensuse@sukimashita.com
- Update to 1.1.4:
- Fix a bug in idevicesyslog causing the connection to close after timeout
- Bump soname revision
- Bump libusbmuxd dependency to 1.0.8
- Fix reading from syslog_relay and remove null characters
- Relicense ideviceimagemounter and idevicescreenshot to LGPL
- Fix a crash when using restored_client_free()
- API: Add sbservices_get_interface_orientation()
- Update man pages and code comments for documentation
- Minor cleanup
- Add Python bindings generated by Cython
- Bump libplist requirement to latest 1.8
- Add support for OpenSSL with fallback to GNUTLS
- Improvements and various fixes for Win32 and OS X build
- Remove glib dependency
- Improve restored implementation
- Fix various memory leaks
- Fix support for iOS 5 and later
- Remove swig patch as bindings have been removed
- Remove gstatbuf patch as it is obselete now
-------------------------------------------------------------------
Sat Nov 19 20:37:42 UTC 2011 - coolo@suse.com

View File

@ -1,7 +1,7 @@
#
# spec file for package libimobiledevice
#
# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -15,37 +15,40 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
# norootforbuild
Name: libimobiledevice
%define _name libimobiledevice2
Version: 1.1.1
Release: 6
License: GPL-2.0+ ; LGPL-2.1+
BuildRequires: gcc-c++ glib2-devel libtasn1-devel libxml2-devel sed
%define _name libimobiledevice3
Version: 1.1.4
Release: 0
BuildRequires: gcc-c++
BuildRequires: libopenssl-devel
BuildRequires: libplist++-devel >= 1.8
BuildRequires: libplist-devel >= 1.8
BuildRequires: libtool
BuildRequires: libusbmuxd-devel >= 1.0.0
BuildRequires: libplist++-devel >= 1.1 libplist-devel >= 1.1
BuildRequires: libtool readline-devel
BuildRequires: python-devel python-plist swig
BuildRequires: libxml2-devel
%if %{?suse_version} > 1140
BuildRequires: python-cython
BuildRequires: python-devel
BuildRequires: python-plist
%endif
BuildRequires: readline-devel
BuildRequires: sed
%if 0%{?opensuse_bs}
BuildRequires: pkg-config
%endif
%if 0%{?suse_version} <= 1110
BuildRequires: libusb-1_0-devel >= 1.0.3
%endif
BuildRequires: libgcrypt-devel libgnutls-devel
Source: %{name}-%{version}.tar.bz2
Source1: baselibs.conf
Patch1: %{name}-gstatbuf-fix.patch
Patch2: %{name}-swig-2x.patch
Group: System/Libraries
Summary: Native protocols library for iPhone, iPod Touch and iPad
License: LGPL-2.1+
Group: System/Libraries
Url: http://www.libimobiledevice.org
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: usbmuxd >= 1.0.0
Obsoletes: libiphone0 < 0.9.6
AutoReqProv: on
%description
libimobiledevice is a software library that talks the protocols to support
@ -54,8 +57,8 @@ on using any existing `.dll` or `.so` libraries from Apple.
%package -n %{_name}
License: LGPL-2.1+
Summary: Native protocols library for iPhone, iPod Touch and iPad
License: LGPL-2.1+
Group: System/Libraries
Provides: %{name} = %{version}
Obsoletes: %{name} < %{version}
@ -67,21 +70,20 @@ iPhone, iPod Touch and iPad devices. Unlike other projects, it does not depend
on using any existing `.dll` or `.so` libraries from Apple.
%package devel
License: LGPL-2.1+
Summary: Development files for %{_name}
License: LGPL-2.1+
Group: Development/Libraries/C and C++
Requires: %{_name} = %{version}
Requires: libopenssl-devel
Requires: libplist-devel
Requires: glib2-devel
Requires: glibc-devel
%description devel
The %{name}-devel package contains libraries and header files for
developing applications that use %{_name}.
%package tools
License: GPL-2.0+ ; LGPL-2.1+
Summary: Tools using %{_name} for iPhone, iPod Touch and iPad
License: GPL-2.0+ ; LGPL-2.1+
Group: Productivity/Multimedia/Other
Requires: %{_name} = %{version}
@ -91,28 +93,28 @@ iPhone, iPod Touch and iPad devices. Unlike other projects, it does not depend
on using any existing `.dll` or `.so` libraries from Apple.
%package doc
License: LGPL-2.1+
Summary: API Reference Documentation for %{_name}
License: LGPL-2.1+
Group: Development/Libraries/C and C++
%description doc
Contains API reference documentation for developers using %{_name}.
%if %{?suse_version} > 1140
%package -n python-imobiledevice
License: LGPL-2.1+
Summary: Python bindings for %{_name}
License: LGPL-2.1+
Group: Development/Languages/Python
Requires: %{_name} = %{version}
Requires: libplist++1 >= 0.16
Requires: libplist++1 >= 1.8
%{py_requires}
%description -n python-imobiledevice
Contains Python bindings for developing applications that use %{_name}.
%endif
%prep
%setup -q -n %{name}-%{version}
%patch1 -p1
%patch2
%build
autoreconf -fi
@ -120,8 +122,11 @@ 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 \
%if %{?suse_version} <= 1140
--without-cython \
%endif
--disable-static --disable-dev-tools
make %{?jobs:-j%jobs}
make %{?_smp_mflags}
%install
%{__make} install DESTDIR=$RPM_BUILD_ROOT
@ -175,9 +180,10 @@ rm -rf $RPM_BUILD_ROOT
%doc AUTHORS COPYING COPYING.LESSER NEWS README
%docdir docs/html
%if %{?suse_version} > 1140
%files -n python-imobiledevice
%defattr(-,root,root,-)
%dir %{py_sitedir}/imobiledevice
%{py_sitedir}/imobiledevice/*
%{py_sitedir}/imobiledevice.so
%endif
%changelog