Hello community,
here is the log from the commit of package libimobiledevice for openSUSE:Factory
checked in at Mon May 30 16:06:54 CEST 2011.
--------
--- libimobiledevice/libimobiledevice.changes 2011-05-12 18:08:01.000000000
+0200
+++ /mounts/work_src_done/STABLE/libimobiledevice/libimobiledevice.changes
2011-05-26 11:52:49.000000000 +0200
@@ -1,0 +2,5 @@
+Thu May 26 09:50:48 UTC 2011 - idon...@novell.com
+
+- Add libimobiledevice-swig-2x.patch: support swig 2.x
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
New:
----
libimobiledevice-swig-2x.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libimobiledevice.spec ++++++
--- /var/tmp/diff_new_pack.BDGYVi/_old 2011-05-30 16:06:34.000000000 +0200
+++ /var/tmp/diff_new_pack.BDGYVi/_new 2011-05-30 16:06:34.000000000 +0200
@@ -21,7 +21,7 @@
Name: libimobiledevice
%define _name libimobiledevice2
Version: 1.1.1
-Release: 1
+Release: 4
License: GPLv2+; LGPLv2.1+
BuildRequires: gcc-c++ glib2-devel libtasn1-devel libxml2-devel sed
BuildRequires: libusbmuxd-devel >= 1.0.0
@@ -37,6 +37,7 @@
BuildRequires: libgcrypt-devel libgnutls-devel
Source: %{name}-%{version}.tar.bz2
Patch1: %{name}-gstatbuf-fix.patch
+Patch2: %{name}-swig-2x.patch
Group: System/Libraries
Summary: Native protocols library for iPhone, iPod Touch and iPad
Url: http://www.libimobiledevice.org
@@ -52,6 +53,7 @@
%package -n %{_name}
+
License: LGPLv2.1+
Summary: Native protocols library for iPhone, iPod Touch and iPad
Group: System/Libraries
@@ -110,8 +112,10 @@
%prep
%setup -q -n %{name}-%{version}
%patch1 -p1
+%patch2
%build
+autoreconf -fi
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"
++++++ libimobiledevice-swig-2x.patch ++++++
--- 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-hu...@web.de>
-# Copyright (c) 2008 Alan W. Irwin <ir...@beluga.phys.uvic.ca>
-# Copyright (c) 2008 Rafael Laboissiere <raf...@laboissiere.net>
-# Copyright (c) 2008 Andrew Collier <colli...@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-hu...@web.de>
+# Copyright (c) 2006 Alan W. Irwin <ir...@beluga.phys.uvic.ca>
+# Copyright (c) 2006 Rafael Laboissiere <raf...@laboissiere.net>
+# Copyright (c) 2006 Andrew Collier <colli...@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])
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
