Hello community, here is the log from the commit of package lash for openSUSE:Factory checked in at Fri May 27 14:05:35 CEST 2011.
-------- --- lash/lash.changes 2011-05-02 02:48:50.000000000 +0200 +++ /mounts/work_src_done/STABLE/lash/lash.changes 2011-05-26 11:57:38.000000000 +0200 @@ -1,0 +2,5 @@ +Thu May 26 09:55:41 UTC 2011 - [email protected] + +- Add lash-swig-2x.patch: support swig 2.x + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- lash-swig-2x.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lash.spec ++++++ --- /var/tmp/diff_new_pack.CqrWQM/_old 2011-05-27 14:05:11.000000000 +0200 +++ /var/tmp/diff_new_pack.CqrWQM/_new 2011-05-27 14:05:11.000000000 +0200 @@ -21,7 +21,7 @@ BuildRequires: alsa-devel e2fsprogs-devel glibc-devel gtk2-devel libjack-devel libuuid-devel libxml2-devel python-devel readline-devel swig Summary: Linux Audio Session Handler Version: 0.5.4 -Release: 5 +Release: 7 Group: Productivity/Multimedia/Sound/Utilities AutoReqProv: on PreReq: %install_info_prereq @@ -33,6 +33,7 @@ Patch0: lash-gcc44.patch Patch1: lash-implicit-fortify-decl.patch Patch2: lash-info-entry.diff +Patch3: lash-swig-2x.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %py_requires @@ -53,6 +54,7 @@ %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 %build ./autogen.sh ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.CqrWQM/_old 2011-05-27 14:05:11.000000000 +0200 +++ /var/tmp/diff_new_pack.CqrWQM/_new 2011-05-27 14:05:11.000000000 +0200 @@ -1,2 +1,2 @@ -lash +liblash1 ++++++ lash-swig-2x.patch ++++++ --- acinclude.m4.orig 2011-05-26 11:54:28.755022485 +0200 +++ acinclude.m4 2011-05-26 11:55:00.566022473 +0200 @@ -1,3 +1,83 @@ +##### http://autoconf-archive.cryp.to/ac_pkg_swig.html +# +# SYNOPSIS +# +# AC_PROG_SWIG([major.minor.micro]) +# +# 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.) +# +# 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: +# +# AC_PROG_SWIG(1.3.17) +# SWIG_ENABLE_CXX +# SWIG_MULTI_MODULE_SUPPORT +# SWIG_PYTHON +# +# LAST MODIFICATION +# +# 2006-10-22 +# +# COPYLEFT +# +# Copyright (c) 2006 Sebastian Huber <[email protected]> +# Copyright (c) 2006 Alan W. Irwin <[email protected]> +# Copyright (c) 2006 Rafael Laboissiere <[email protected]> +# Copyright (c) 2006 Andrew Collier <[email protected]> +# +# 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. +# +# 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 @@ -40,16 +120,44 @@ 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='echo "Error: SWIG version >= $1 is required. You have '"$swig_version"'. You should look at http://www.swig.org"; ; 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='echo "Error: Cannot determine SWIG version. You should look at http://www.swig.org"; ; false' ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
