From 30a3c0af3b0a2197765be11d110755f8b341f7f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Devrim=20G=C3=BCnd=C3=BCz?= <devrim@gunduz.org>
Date: Tue, 13 Oct 2015 20:56:26 +0300
Subject: [PATCH] - Update to 3.5.0, per changes described at:  
 http://trac.osgeo.org/geos/browser/tags/3.5.0/NEWS - Add swig as BR to python
 subpackage, as it does not build without that.

---
 .gitignore |  2 +-
 geos.spec  | 40 +++++++++++++++++++++++-----------------
 sources    |  2 +-
 3 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/.gitignore b/.gitignore
index cd4c9f1..ad50ed4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/geos-3.4.2.tar.bz2
+/geos-3.5.0.tar.bz2
diff --git a/geos.spec b/geos.spec
index 429e6b7..240a239 100644
--- a/geos.spec
+++ b/geos.spec
@@ -1,6 +1,6 @@
 Name:		geos
-Version:	3.4.2
-Release:	6%{?dist}
+Version:	3.5.0
+Release:	1%{?dist}
 Summary:	GEOS is a C++ port of the Java Topology Suite
 
 Group:		Applications/Engineering
@@ -17,10 +17,10 @@ BuildRequires:	python-devel php-devel
 %{!?php_sitearch: %define php_sitearch %{_libdir}/php/modules}
 
 %description
-GEOS (Geometry Engine - Open Source) is a C++ port of the Java Topology 
-Suite (JTS). As such, it aims to contain the complete functionality of 
-JTS in C++. This includes all the OpenGIS "Simple Features for SQL" spatial 
-predicate functions and spatial operators, as well as specific JTS topology 
+GEOS (Geometry Engine - Open Source) is a C++ port of the Java Topology
+Suite (JTS). As such, it aims to contain the complete functionality of
+JTS in C++. This includes all the OpenGIS "Simple Features for SQL" spatial
+predicate functions and spatial operators, as well as specific JTS topology
 functions such as IsValid()
 
 %package devel
@@ -29,19 +29,20 @@ Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
 
 %description devel
-GEOS (Geometry Engine - Open Source) is a C++ port of the Java Topology 
-Suite (JTS). As such, it aims to contain the complete functionality of 
-JTS in C++. This includes all the OpenGIS "Simple Features for SQL" spatial 
-predicate functions and spatial operators, as well as specific JTS topology 
-functions such as IsValid()
+GEOS (Geometry Engine - Open Source) is a C++ port of the Java Topology
+Suite (JTS). As such, it aims to contain the complete functionality of
+JTS in C++. This includes all the OpenGIS "Simple Features for SQL" spatial
+predicate functions and spatial operators, as well as specific JTS topology
+functions such as IsValid().
 
-This package contains the development files to build applications that 
-use GEOS
+This package contains the development files to build applications that
+use GEOS.
 
 %package python
 Summary:	Python modules for GEOS
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
+BuildRequires:	swig
 
 %description python
 Python module to build applications using GEOS and python
@@ -55,7 +56,7 @@ Requires:	%{name} = %{version}-%{release}
 PHP module to build applications using GEOS and PHP
 
 %prep
-%setup -q 
+%setup -q
 %patch0 -p0 -b .gcc43
 
 %build
@@ -83,11 +84,11 @@ cd doc
 make doxygen-html
 
 %install
-rm -rf %{buildroot}
+%{__rm} -rf %{buildroot}
 make DESTDIR=%{buildroot} install
 
 # install php config file
-mkdir -p %{buildroot}%{_sysconfdir}/php.d/
+%{__mkdir} -p %{buildroot}%{_sysconfdir}/php.d/
 cat > %{buildroot}%{_sysconfdir}/php.d/%{name}.ini <<EOF
 ; Enable %{name} extension module
 extension=geos.so
@@ -99,7 +100,7 @@ EOF
 make %{?_smp_mflags} check || exit 0
 
 %clean
-rm -rf %{buildroot}
+%{__rm} -rf %{buildroot}
 
 %post -p /sbin/ldconfig
 
@@ -138,6 +139,11 @@ rm -rf %{buildroot}
 %config(noreplace) %{_sysconfdir}/php.d/%{name}.ini
 
 %changelog
+* Tue Oct 13 2015 Devrim GUNDUZ <devrim@gunduz.org> - 3.5.0-1
+- Update to 3.5.0, per changes described at:
+  http://trac.osgeo.org/geos/browser/tags/3.5.0/NEWS
+- Add swig as BR to python subpackage, as it does not build without that.
+
 * Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.4.2-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
 
diff --git a/sources b/sources
index edca6f9..5556b8b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-fc5df2d926eb7e67f988a43a92683bae  geos-3.4.2.tar.bz2
+136842690be7f504fba46b3c539438dd  geos-3.5.0.tar.bz2