X-Git-Url: http://git.pld-linux.org/?p=packages%2Fgeos.git;a=blobdiff_plain;f=geos.spec;h=e475a949f21cc812703c0c94cb978be8eca5083e;hp=fe2a0e1efeed68d344217f394a16ad54c14d1036;hb=b45d67f4cd848a3acb162a48b367c6d086e0a057;hpb=9132b2c3a3879ca37409714452608f9ec4843014

diff --git a/geos.spec b/geos.spec
index fe2a0e1..e475a94 100644
--- a/geos.spec
+++ b/geos.spec
@@ -1,27 +1,28 @@
-# TODO
-# - unpackaged:    /usr/bin/XMLTester
 #
 # 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.2.2
-Release:	2
+Version:	3.4.2
+Release:	1
 License:	LGPL v2.1
 Group:		Libraries
 Source0:	http://download.osgeo.org/geos/%{name}-%{version}.tar.bz2
-# Source0-md5:	c5d264acac22fe7720f85dadc1fc17c6
+# Source0-md5:	fc5df2d926eb7e67f988a43a92683bae
 Patch0:		%{name}-ruby1.9.patch
+Patch1:		rubydir.patch
 URL:		http://trac.osgeo.org/geos/
-BuildRequires:	autoconf
+BuildRequires:	autoconf >= 2.52
 BuildRequires:	automake
 BuildRequires:	libstdc++-devel
+%{?with_php:BuildRequires:	php-devel}
 BuildRequires:	python
 BuildRequires:	python-devel
 BuildRequires:	rpm-pythonprov
-BuildRequires:	rpmbuild(macros) >= 1.219
+BuildRequires:	rpmbuild(macros) >= 1.519
 %{?with_ruby:BuildRequires:	ruby-devel}
 BuildRequires:	swig-python >= 1.3.29
 %{?with_ruby:BuildRequires:	swig-ruby >= 1.3.40-3}
@@ -67,6 +68,19 @@ Static GEOS library.
 %description static -l pl.UTF-8
 Statyczna biblioteka GEOS.
 
+%package -n php-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
+PHP bindings for Geometry Engine - Open Source.
+
+%description -n php-geos -l pl.UTF-8
+Wiązania PHP do biblioteki GEOS.
+
 %package -n python-geos
 Summary:	Python bindings for Geometry Engine - Open Source
 Summary(pl.UTF-8):	Wiązania Pythona do biblioteki GEOS
@@ -94,6 +108,7 @@ Wiązania języka Ruby do biblioteki GEOS.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{__aclocal} -I macros
@@ -101,6 +116,7 @@ Wiązania języka Ruby do biblioteki GEOS.
 %{__autoheader}
 %{__automake}
 %configure \
+	%{?with_php:--enable-php} \
 	--enable-python \
 	%{?with_ruby:--enable-ruby}
 
@@ -114,8 +130,16 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-%{?with_ruby:rm -f $RPM_BUILD_ROOT%{ruby_sitearchdir}/*.{la,a}}
-rm -f $RPM_BUILD_ROOT%{py_sitedir}/geos/*.{la,a}
+%if %{with php}
+install -d $RPM_BUILD_ROOT%{php_sysconfdir}/conf.d
+cat <<'EOF' > $RPM_BUILD_ROOT%{php_sysconfdir}/conf.d/geos.ini
+; Enable geos extension module
+extension=geos.so
+EOF
+%endif
+
+%{?with_ruby:%{__rm} $RPM_BUILD_ROOT%{ruby_vendorarchdir}/*.{la,a}}
+%{__rm} $RPM_BUILD_ROOT%{py_sitedir}/geos/*.{la,a}
 
 %py_postclean
 
@@ -148,6 +172,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libgeos.a
 %{_libdir}/libgeos_c.a
 
+%if %{with php}
+%files -n php-geos
+%defattr(644,root,root,755)
+%doc php/{README,TODO}
+%config(noreplace) %verify(not md5 mtime size) %{php_sysconfdir}/conf.d/geos.ini
+%attr(755,root,root) %{php_extensiondir}/geos.so
+%endif
+
 %files -n python-geos
 %defattr(644,root,root,755)
 %dir %{py_sitedir}/geos
@@ -158,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