- updated to 3.4.1

- removed obsolete am patch
- old ruby1.9 patch obsolete, replaced with one new fix
- updated rubydir patch

diff --git a/geos-am.patch b/geos-am.patch
deleted file mode 100644 (file)
index 6233432..0000000
--- a/geos-am.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- geos-3.3.7/configure.in.orig       2013-01-22 19:21:11.000000000 +0100
-+++ geos-3.3.7/configure.in    2013-01-26 13:00:57.162086197 +0100
-@@ -37,8 +37,7 @@
- 
- AM_INIT_AUTOMAKE([geos], [$VERSION], [no-define])
- AM_MAINTAINER_MODE
--AM_CONFIG_HEADER([include/config.h])
--AM_CONFIG_HEADER([include/geos/platform.h])
-+AC_CONFIG_HEADERS([include/config.h include/geos/platform.h])
- AC_PROG_CC
- 
- dnl use libtool ----------------------------------------------------------

diff --git a/geos-ruby1.9.patch b/geos-ruby1.9.patch
index b0b187df1b16c726a3b31ae29e81179be31eb96e..03f7dcde1bea5e99b785c151cad5fa36c06c19b2 100644 (file)
--- a/geos-ruby1.9.patch
+++ b/geos-ruby1.9.patch
@@ -1,52 +1,11 @@
---- geos-3.2.0/macros/ruby.m4~ 2007-09-07 01:22:38.000000000 +0200
-+++ geos-3.2.0/macros/ruby.m4  2010-03-02 14:29:47.012190992 +0100
-@@ -25,8 +25,9 @@
-               dnl Get Ruby bin directory
-               RUBY_BIN_DIR=`$RUBY -rrbconfig -e 'puts Config::CONFIG[["bindir"]]'`
-               
--              dnl Get Ruby include directory
--              RUBY_INCLUDE_DIR=`$RUBY -rrbconfig -e 'puts Config::CONFIG[["archdir"]]'`
-+              dnl Get Ruby include directories
-+              RUBY_INCLUDE_DIR=`$RUBY -rrbconfig -e 'puts Config::CONFIG[["rubyhdrdir"]]'`
-+              RUBY_ARCHINCLUDE_DIR=`$RUBY -rrbconfig -e 'puts RbConfig.expand("$(rubyhdrdir)/$(arch)")'`
-       
-               dnl Get Ruby lib directory
-               RUBY_LIB_DIR=`$RUBY -rrbconfig -e 'puts Config::CONFIG[["libdir"]]'`
-@@ -44,6 +45,7 @@
-     AC_MSG_NOTICE([Ruby version is '$RUBY_VERSION'])
-     AC_MSG_NOTICE([Ruby bin directory is '$RUBY_BIN_DIR'])
-     AC_MSG_NOTICE([Ruby include directory is '$RUBY_INCLUDE_DIR'])
-+    AC_MSG_NOTICE([Ruby arch include directory is '$RUBY_ARCHINCLUDE_DIR'])
-     AC_MSG_NOTICE([Ruby library directory is '$RUBY_LIB_DIR'])
-     AC_MSG_NOTICE([Ruby extension directory is '$RUBY_EXTENSION_DIR'])
-     AC_MSG_NOTICE([Ruby library is '$RUBY_SO_NAME'])
-@@ -52,6 +54,7 @@
-     AC_SUBST([RUBY_VERSION])
-     AC_SUBST([RUBY_BIN_DIR])
-     AC_SUBST([RUBY_INCLUDE_DIR])
-+    AC_SUBST([RUBY_ARCHINCLUDE_DIR])
-     AC_SUBST([RUBY_LIB_DIR])
-     AC_SUBST([RUBY_EXTENSION_DIR])
-     AC_SUBST([RUBY_SO_NAME])
---- geos-3.2.0/swig/ruby/Makefile.am~  2007-08-31 22:18:15.000000000 +0200
-+++ geos-3.2.0/swig/ruby/Makefile.am   2010-03-02 14:30:59.197124565 +0100
-@@ -14,7 +14,7 @@
- rubyextensiondirdir = $(RUBY_EXTENSION_DIR)
- 
- # Setup includes
--INCLUDES = -I$(RUBY_INCLUDE_DIR)
-+INCLUDES = -I$(RUBY_INCLUDE_DIR) -I$(RUBY_ARCHINCLUDE_DIR)
+--- geos-3.4.1/macros/ruby.m4.orig     2013-08-25 17:35:18.906527499 +0200
++++ geos-3.4.1/macros/ruby.m4  2013-08-25 17:53:45.516481059 +0200
+@@ -38,7 +38,7 @@
+               RUBY_EXTENSION_DIR=`$RUBY -rrbconfig -e 'puts RbConfig::CONFIG[["vendorarchdir"]] || Config::CONFIG[["vendorarchdir"]]'`
  
- # Build Ruby module as shared library
- rubyextensiondir_LTLIBRARIES = geos.la
---- geos-3.2.0/swig/ruby/ruby.i~       2009-07-15 20:56:30.000000000 +0200
-+++ geos-3.2.0/swig/ruby/ruby.i        2010-03-02 17:02:01.176123831 +0100
-@@ -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*));
+               dnl Get Ruby shared library name, this does not include the lib prefix or extension name
+-              RUBY_SO_NAME=`$RUBY -rrbconfig -e 'puts RbConfig::CONFIG[["LIBRUBY_SO"]] || Config::CONFIG[["RUBY_SO_NAME"]]'`
++              RUBY_SO_NAME=`$RUBY -rrbconfig -e 'puts RbConfig::CONFIG[["RUBY_SO_NAME"]] || Config::CONFIG[["RUBY_SO_NAME"]]'`
+               
+               dnl Get Ruby shared libary name
+               RUBY_SHARED_LIB=`$RUBY -rrbconfig -e 'puts RbConfig::CONFIG[["LIBRUBY"]] || Config::CONFIG[["LIBRUBY"]]'`

diff --git a/geos.spec b/geos.spec
index 2ac2a2ea343f57c9aa5fdf207d014e299bcc6f43..948bd64f138e78156a43e7b2bb26003b3fd10e27 100644 (file)
--- a/geos.spec
+++ b/geos.spec
@@ -6,15 +6,14 @@
 Summary:       Geometry Engine - Open Source
 Summary(pl.UTF-8):     GEOS - silnik geometryczny z otwartymi źródłami
 Name:          geos
-Version:       3.3.8
-Release:       3
+Version:       3.4.1
+Release:       1
 License:       LGPL v2.1
 Group:         Libraries
 Source0:       http://download.osgeo.org/geos/%{name}-%{version}.tar.bz2
-# Source0-md5: 75be476d0831a2d14958fed76ca266de
+# Source0-md5: 4c930dec44c45c49cd71f3e0931ded7e
 Patch0:                %{name}-ruby1.9.patch
-Patch1:                %{name}-am.patch
-Patch2:                rubydir.patch
+Patch1:                rubydir.patch
 URL:           http://trac.osgeo.org/geos/
 BuildRequires: autoconf >= 2.52
 BuildRequires: automake
@@ -110,7 +109,6 @@ Wiązania języka Ruby do biblioteki GEOS.
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 %build
 %{__aclocal} -I macros

diff --git a/rubydir.patch b/rubydir.patch
index 22d48773ef9436eb5dd604f0882580bf0432a6e5..819f3fb1222099fc073f78d5d37e0eaef9c19686 100644 (file)
--- a/rubydir.patch
+++ b/rubydir.patch
@@ -1,11 +1,11 @@
---- geos-3.3.8/macros/ruby.m4~ 2013-07-14 21:24:58.543846706 +0200
-+++ geos-3.3.8/macros/ruby.m4  2013-07-14 21:34:50.456329482 +0200
-@@ -33,7 +33,7 @@
-               RUBY_LIB_DIR=`$RUBY -rrbconfig -e 'puts Config::CONFIG[["libdir"]]'`
+--- geos-3.4.1/macros/ruby.m4.orig     2013-08-25 17:32:42.246534073 +0200
++++ geos-3.4.1/macros/ruby.m4  2013-08-25 17:34:56.293195116 +0200
+@@ -35,7 +35,7 @@
+               RUBY_LIB_DIR=`$RUBY -rrbconfig -e 'puts RbConfig::CONFIG[["libdir"]] || Config::CONFIG[["libdir"]]'`
  
                dnl Get Ruby extensions directory
--              RUBY_EXTENSION_DIR=`$RUBY -rrbconfig -e 'puts Config::CONFIG[["sitearchdir"]]'`
-+              RUBY_EXTENSION_DIR=`$RUBY -rrbconfig -e 'puts Config::CONFIG[["vendorarchdir"]]'`
+-              RUBY_EXTENSION_DIR=`$RUBY -rrbconfig -e 'puts RbConfig::CONFIG[["sitearchdir"]] || Config::CONFIG[["sitearchdir"]]'`
++              RUBY_EXTENSION_DIR=`$RUBY -rrbconfig -e 'puts RbConfig::CONFIG[["vendorarchdir"]] || Config::CONFIG[["vendorarchdir"]]'`
  
                dnl Get Ruby shared library name, this does not include the lib prefix or extension name
-               RUBY_SO_NAME=`$RUBY -rrbconfig -e 'puts Config::CONFIG[["RUBY_SO_NAME"]]'`
+               RUBY_SO_NAME=`$RUBY -rrbconfig -e 'puts RbConfig::CONFIG[["LIBRUBY_SO"]] || Config::CONFIG[["RUBY_SO_NAME"]]'`