- ruby 2.0 rebuld

[packages/geos.git] / geos.spec

diff --git a/geos.spec b/geos.spec
index 114fd499249c1424901088b149d1def028fac313..70cf67de0befc2e1764ab92d0c77cf4330d82bbb 100644 (file)
--- a/geos.spec
+++ b/geos.spec
@@ -2,23 +2,23 @@
 # Conditional build:
 %bcond_without php     # PHP binding
 %bcond_without ruby    # ruby binding
-#
+
 Summary:       Geometry Engine - Open Source
 Summary(pl.UTF-8):     GEOS - silnik geometryczny z otwartymi źródłami
 Name:          geos
-Version:       3.3.8
-Release:       1
+Version:       3.4.2
+Release:       5
 License:       LGPL v2.1
 Group:         Libraries
 Source0:       http://download.osgeo.org/geos/%{name}-%{version}.tar.bz2
-# Source0-md5: 75be476d0831a2d14958fed76ca266de
+# Source0-md5: fc5df2d926eb7e67f988a43a92683bae
 Patch0:                %{name}-ruby1.9.patch
-Patch1:                %{name}-am.patch
+Patch1:                rubydir.patch
 URL:           http://trac.osgeo.org/geos/
 BuildRequires: autoconf >= 2.52
 BuildRequires: automake
 BuildRequires: libstdc++-devel
-%{?with_php:BuildRequires:     php-devel}
+%{?with_php:BuildRequires:     %{php_name}-devel}
 BuildRequires: python
 BuildRequires: python-devel
 BuildRequires: rpm-pythonprov
@@ -68,17 +68,17 @@ Static GEOS library.
 %description static -l pl.UTF-8
 Statyczna biblioteka GEOS.
 
-%package -n php-geos
+%package -n %{php_name}-geos
 Summary:       PHP bindings for Geometry Engine - Open Source
 Summary(pl.UTF-8):     Wiązania PHP do biblioteki GEOS
 Group:         Development/Languages/PHP
 Requires:      %{name} = %{version}-%{release}
 %{?requires_php_extension}
 
-%description -n php-geos
+%description -n %{php_name}-geos
 PHP bindings for Geometry Engine - Open Source.
 
-%description -n php-geos -l pl.UTF-8
+%description -n %{php_name}-geos -l pl.UTF-8
 Wiązania PHP do biblioteki GEOS.
 
 %package -n python-geos
@@ -138,7 +138,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
@@ -173,7 +173,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libgeos_c.a
 
 %if %{with php}
-%files -n php-geos
+%files -n %{php_name}-geos
 %defattr(644,root,root,755)
 %doc php/{README,TODO}
 %config(noreplace) %verify(not md5 mtime size) %{php_sysconfdir}/conf.d/geos.ini
@@ -190,5 +190,5 @@ rm -rf $RPM_BUILD_ROOT
 %if %{with ruby}
 %files -n ruby-geos
 %defattr(644,root,root,755)
-%attr(755,root,root) %{ruby_sitearchdir}/geos.so
+%attr(755,root,root) %{ruby_vendorarchdir}/geos.so
 %endif