Author: qboosh Date: Sat Oct 9 16:08:14 2010 GMT Module: packages Tag: HEAD ---- Log message: - added swig2 patch to allow build with swig 2.0.x
---- Files affected: packages/geos: geos.spec (1.27 -> 1.28) , geos-swig2.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/geos/geos.spec diff -u packages/geos/geos.spec:1.27 packages/geos/geos.spec:1.28 --- packages/geos/geos.spec:1.27 Sat Oct 9 12:50:16 2010 +++ packages/geos/geos.spec Sat Oct 9 18:08:09 2010 @@ -15,6 +15,7 @@ Source0: http://download.osgeo.org/geos/%{name}-%{version}.tar.bz2 # Source0-md5: c5d264acac22fe7720f85dadc1fc17c6 Patch0: %{name}-ruby1.9.patch +Patch1: %{name}-swig2.patch URL: http://trac.osgeo.org/geos/ BuildRequires: autoconf >= 2.52 BuildRequires: automake @@ -95,6 +96,7 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 %build %{__aclocal} -I macros @@ -168,6 +170,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.28 2010/10/09 16:08:09 qboosh +- added swig2 patch to allow build with swig 2.0.x + Revision 1.27 2010/10/09 10:50:16 qboosh - ac version ================================================================ Index: packages/geos/geos-swig2.patch diff -u /dev/null packages/geos/geos-swig2.patch:1.1 --- /dev/null Sat Oct 9 18:08:14 2010 +++ packages/geos/geos-swig2.patch Sat Oct 9 18:08:09 2010 @@ -0,0 +1,15 @@ +--- geos-3.2.2/macros/ac_pkg_swig.m4.orig 2007-08-30 08:19:41.000000000 +0200 ++++ geos-3.2.2/macros/ac_pkg_swig.m4 2010-10-09 13:30:47.923740205 +0200 +@@ -67,9 +67,9 @@ + 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 ++ if test $available_major -lt $required_major \ ++ -o $available_major -eq $required_major -a $available_minor -lt $required_minor \ ++ -o $available_major -eq $required_major -a $available_minor -eq $required_minor -a $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='' + else ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/geos/geos.spec?r1=1.27&r2=1.28&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
