From 6896c2add83131639cc022b3f12a8d94d3d3d2a2 Mon Sep 17 00:00:00 2001
From: Devrim GUNDUZ <devrim@gunduz.org>
Date: Wed, 11 Sep 2013 14:12:57 +0300
Subject: [PATCH] Remove obsoleted patches.

---
 geos-3.2.1-swig.patch    | 15 ---------------
 geos-3.3.2-ruby-19.patch | 13 -------------
 geos.spec                |  7 +------
 3 files changed, 1 insertion(+), 34 deletions(-)
 delete mode 100644 geos-3.2.1-swig.patch
 delete mode 100644 geos-3.3.2-ruby-19.patch

diff --git a/geos-3.2.1-swig.patch b/geos-3.2.1-swig.patch
deleted file mode 100644
index c161a95..0000000
--- a/geos-3.2.1-swig.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- geos-3.2.2/configure.old	2011-05-09 22:59:42.529808010 +0300
-+++ geos-3.2.2/configure	2011-05-09 23:00:46.382808002 +0300
-@@ -16544,9 +16544,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
-+			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
-                                 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: SWIG version >= 1.3.28 is required.  You have $swig_version.  You should look at http://www.swig.org" >&5
- $as_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=''
diff --git a/geos-3.3.2-ruby-19.patch b/geos-3.3.2-ruby-19.patch
deleted file mode 100644
index 23d50d5..0000000
--- a/geos-3.3.2-ruby-19.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: swig/ruby/ruby.i
-===================================================================
---- swig/ruby/ruby.i	(revision 3104)
-+++ swig/ruby/ruby.i	(working copy)
-@@ -75,7 +75,7 @@
-         Check_Type($input, T_ARRAY);
- 
-         /* Get the length */
--        $2 = RARRAY($input)->len;
-+        $2 = RARRAY_LEN($input);
-       
-         /* Allocate space for the C array. */
-         $1 = (GeosLinearRing**) malloc($2*sizeof(GeosLinearRing*));
diff --git a/geos.spec b/geos.spec
index 2143750..aad63ce 100644
--- a/geos.spec
+++ b/geos.spec
@@ -8,11 +8,6 @@ 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
-# Fixes SWIG interface for Ruby 1.9 compatibility.
-# http://trac.osgeo.org/geos/ticket/379
-Patch2:		geos-3.3.2-ruby-19.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	doxygen libtool
@@ -75,7 +70,6 @@ PHP module to build applications using GEOS and PHP
 %prep
 %setup -q 
 %patch0 -p0 -b .gcc43
-%patch2 -p0 -b .ruby19
 
 %build
 
@@ -171,6 +165,7 @@ rm -rf %{buildroot}
 * Wed Sep 11 2013 Devrim GUNDUZ <devrim@gunduz.org> - 3.4.2-1
 - Update to 3.4.2, per changes described in:
   http://trac.osgeo.org/geos/browser/tags/3.4.2/NEWS
+- Remove Patch2, it is now in upstream.
 
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.3.8-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild