[geos/epel7] - Update to 3.4.2, per changes described in: http://trac.osgeo.org/geos/browser/tags/3.4.2/NEWS -

[Devrim GÜNDÜZ]

commit cda9025274b0b93b3be85045c60dbed12f96a779
Author: Devrim Gunduz <devrim at gunduz.org>
Date:   Wed Jan 15 14:55:06 2014 +0200

    - Update to 3.4.2, per changes described in:
      http://trac.osgeo.org/geos/browser/tags/3.4.2/NEWS
    - Remove Patch2 and Patch1, it is now in upstream.
    - Disable ruby bindings
    - Remove all conditionals -- no more RHEL 4!

 .gitignore |    2 +-
 geos.spec  |   55 ++++++++++++++++---------------------------------------
 sources    |    2 +-
 3 files changed, 18 insertions(+), 41 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 21fe92c..cd4c9f1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/geos-3.3.8.tar.bz2
+/geos-3.4.2.tar.bz2
diff --git a/geos.spec b/geos.spec
index 1fc90d7..3142182 100644
--- a/geos.spec
+++ b/geos.spec
@@ -1,6 +1,6 @@
 Name:		geos
-Version:	3.3.8
-Release:	2%{?dist}
+Version:	3.4.2
+Release:	1%{?dist}
 Summary:	GEOS is a C++ port of the Java Topology Suite
 
 Group:		Applications/Engineering
@@ -8,18 +8,10 @@ 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
-%if "%{?dist}" != ".el4"
-BuildRequires:	swig ruby
-BuildRequires:	python-devel ruby-devel php-devel
-%endif
+BuildRequires:	python-devel php-devel
 
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 %{!?php_sitearch: %define php_sitearch %{_libdir}/php/modules}
@@ -46,7 +38,6 @@ functions such as IsValid()
 This package contains the development files to build applications that 
 use GEOS
 
-%if "%{?dist}" != ".el4"
 %package python
 Summary:	Python modules for GEOS
 Group:		Development/Libraries
@@ -55,14 +46,6 @@ Requires:	%{name} = %{version}-%{release}
 %description python
 Python module to build applications using GEOS and python
 
-%package ruby
-Summary:	Ruby modules for GEOS
-Group:		Development/Libraries
-Requires:	%{name} = %{version}-%{release}
-
-%description ruby
-Ruby module to build applications using GEOS and ruby
-
 %package php
 Summary:	PHP modules for GEOS
 Group:		Development/Libraries
@@ -70,12 +53,10 @@ Requires:	%{name} = %{version}-%{release}
 
 %description php
 PHP module to build applications using GEOS and PHP
-%endif
 
 %prep
 %setup -q 
 %patch0 -p0 -b .gcc43
-%patch2 -p0 -b .ruby19
 
 %build
 
@@ -89,16 +70,13 @@ for makefile in `find . -type f -name 'Makefile.in'`; do
 sed -i 's|@LIBTOOL@|%{_bindir}/libtool|g' $makefile
 done
 
-# Use correct library placement for Ruby 1.9.
-sed -i 's|sitearchdir|vendorarchdir|' configure
+%configure --disable-static --disable-dependency-tracking --enable-python --enable-php
 
-%configure --disable-static --disable-dependency-tracking \
-%if "%{?dist}" != ".el4"
-           --enable-python \
-           --enable-ruby \
-           --enable-php
-%endif
-make %{?_smp_mflags} CPPFLAGS=-I`ruby -e 'puts File.join(RbConfig::CONFIG[%q(includedir)], RbConfig::CONFIG[%q(sitearch)])'`
+# Touch the file, since we are not using ruby bindings anymore:
+# Per http://lists.osgeo.org/pipermail/geos-devel/2009-May/004149.html
+touch swig/python/geos_wrap.cxx
+
+make %{?_smp_mflags}
 
 # Make doxygen documentation files
 cd doc
@@ -144,7 +122,6 @@ rm -rf %{buildroot}
 %exclude %{_libdir}/*.la
 %exclude %{_libdir}/*.a
 
-%if "%{?dist}" != ".el4"
 %files python
 %defattr(-,root,root,-)
 %dir %{python_sitearch}/%{name}
@@ -155,19 +132,19 @@ rm -rf %{buildroot}
 %{python_sitearch}/%{name}/*.py?
 %{python_sitearch}/%{name}/_%{name}.so
 
-%files ruby
-%defattr(-,root,root,-)
-%exclude %{ruby_vendorarchdir}/%{name}.a
-%exclude %{ruby_vendorarchdir}/%{name}.la
-%{ruby_vendorarchdir}/%{name}.so
-
 %files php
 %defattr(-,root,root,-)
 %{php_sitearch}/%{name}.so
 %config(noreplace) %{_sysconfdir}/php.d/%{name}.ini
-%endif
 
 %changelog
+* Wed Jan 15 2014 Devrim GUNDUZ <devrim at 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 and Patch1, it is now in upstream.
+- Disable ruby bindings
+- Remove all conditionals -- no more RHEL 4!
+
 * Wed Mar 13 2013 Vít Ondruch <vondruch at redhat.com> - 3.3.8-2
 - Rebuild for https://fedoraproject.org/wiki/Features/Ruby_2.0.0
 
diff --git a/sources b/sources
index 671933b..edca6f9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-75be476d0831a2d14958fed76ca266de  geos-3.3.8.tar.bz2
+fc5df2d926eb7e67f988a43a92683bae  geos-3.4.2.tar.bz2