- fixed rubyarch dir

- rel 3

diff --git a/geos.spec b/geos.spec
index 3de3a4ce0f7b62c33b5f32b4e9441619588670fa..2ac2a2ea343f57c9aa5fdf207d014e299bcc6f43 100644 (file)
--- a/geos.spec
+++ b/geos.spec
@@ -7,13 +7,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:       2
+Release:       3
 License:       LGPL v2.1
 Group:         Libraries
 Source0:       http://download.osgeo.org/geos/%{name}-%{version}.tar.bz2
 # Source0-md5: 75be476d0831a2d14958fed76ca266de
 Patch0:                %{name}-ruby1.9.patch
 Patch1:                %{name}-am.patch
+Patch2:                rubydir.patch
 URL:           http://trac.osgeo.org/geos/
 BuildRequires: autoconf >= 2.52
 BuildRequires: automake
@@ -109,6 +110,7 @@ Wiązania języka Ruby do biblioteki GEOS.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %{__aclocal} -I macros
@@ -118,10 +120,7 @@ Wiązania języka Ruby do biblioteki GEOS.
 %configure \
        %{?with_php:--enable-php} \
        --enable-python \
-%if %{with ruby}
-       --enable-ruby \
-%endif
-
+       %{?with_ruby:--enable-ruby}
 
 %{__make} \
        pkglibdir=%{_libdir}
@@ -131,7 +130,6 @@ Wiązania języka Ruby do biblioteki GEOS.
 rm -rf $RPM_BUILD_ROOT
 
 %{__make} install \
-       rubyextensiondir=%{ruby_vendorarchdir} \
        DESTDIR=$RPM_BUILD_ROOT
 
 %if %{with php}
@@ -142,7 +140,7 @@ extension=geos.so
 EOF
 %endif
 
-%{?with_ruby:%{__rm} $RPM_BUILD_ROOT%{ruby_sitearchdir}/*.{la,a}}
+%{?with_ruby:%{__rm} $RPM_BUILD_ROOT%{ruby_vendorarchdir}/*.{la,a}}
 %{__rm} $RPM_BUILD_ROOT%{py_sitedir}/geos/*.{la,a}
 
 %py_postclean

diff --git a/rubydir.patch b/rubydir.patch
new file mode 100644 (file)
index 0000000..22d4877
--- /dev/null
+++ b/rubydir.patch
@@ -0,0 +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"]]'`
+ 
+               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"]]'`
+ 
+               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"]]'`