- fix build with swig 2.0.0

This commit is contained in:
Dan Horák 2010-07-21 07:53:11 +00:00
parent 4d60d427e8
commit 042240d45e
2 changed files with 23 additions and 1 deletions

16
geos-3.2.1-swig.patch Normal file
View File

@ -0,0 +1,16 @@
diff -up geos-3.2.1/configure.swig geos-3.2.1/configure
--- geos-3.2.1/configure.swig 2010-07-20 23:28:45.000000000 +0200
+++ geos-3.2.1/configure 2010-07-21 08:36:39.000000000 +0200
@@ -18996,9 +18996,9 @@ echo "${ECHO_T}$swig_version" >&6; }
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
+ required_full=`printf %2.2d%2.2d%2.2d%2.2d $required_major $required_minor $required_patch`
+ available_full=`printf %2.2d%2.2d%2.2d%2.2d $available_major $available_minor $available_patch`
+ if test $available_full -lt $required_full; then
{ echo "$as_me:$LINENO: WARNING: SWIG version >= 1.3.28 is required. You have $swig_version. You should look at http://www.swig.org" >&5
echo "$as_me: WARNING: SWIG version >= 1.3.28 is required. You have $swig_version. You should look at http://www.swig.org" >&2;}
SWIG=''

View File

@ -1,6 +1,6 @@
Name: geos
Version: 3.2.1
Release: 1%{?dist}
Release: 2%{?dist}
Summary: GEOS is a C++ port of the Java Topology Suite
Group: Applications/Engineering
@ -8,6 +8,8 @@ License: LGPLv2
URL: http://trac.osgeo.org/geos/
Source0: http://download.osgeo.org/%{name}/%{name}-%{version}.tar.bz2
Patch0: geos-gcc43.patch
# fixed in upstream revision 3000
Patch1: geos-3.2.1-swig.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: doxygen libtool
%if "%{?dist}" != ".el4"
@ -61,6 +63,7 @@ Ruby module to build applications using GEOS and ruby
%prep
%setup -q
%patch0 -p0 -b .gcc43
%patch1 -p1 -b .swig
%build
@ -138,6 +141,9 @@ rm -rf %{buildroot}
%endif
%changelog
* Wed Jul 21 2010 Dan Horák <dan[at]danny.cz> - 3.2.1-2
- fix build with swig 2.0.0
* Tue Mar 30 2010 Devrim GUNDUZ <devrim@gunduz.org> - 3.2.1-1
- Update to 3.2.1