- added swig2 patch to allow build with swig 2.0.x

Changed files:
    geos-swig2.patch -> 1.1
    geos.spec -> 1.28

diff --git a/geos-swig2.patch b/geos-swig2.patch
new file mode 100644 (file)
index 0000000..d78cf83
--- /dev/null
+++ b/geos-swig2.patch
@@ -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

diff --git a/geos.spec b/geos.spec
index 16a1b397d4fda248cf69cdc932b689a4f65b3b10..6cabe6d01b02d602bd920c4a29e8a5523aa55473 100644 (file)
--- a/geos.spec
+++ b/geos.spec
@@ -14,6 +14,7 @@ Group:                Libraries
 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
@@ -94,6 +95,7 @@ Wiązania języka Ruby do biblioteki GEOS.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{__aclocal} -I macros