packages: geos/geos.spec, geos/geos-swig2.patch (REMOVED) - updated to 3.3....

[qboosh]

Author: qboosh                       Date: Tue Jun 14 06:44:32 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 3.3.0
- removed obsolete swig2 patch
- package php extension

---- Files affected:
packages/geos:
   geos.spec (1.29 -> 1.30) , geos-swig2.patch (1.1 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/geos/geos.spec
diff -u packages/geos/geos.spec:1.29 packages/geos/geos.spec:1.30
--- packages/geos/geos.spec:1.29	Mon Nov 15 11:17:19 2010
+++ packages/geos/geos.spec	Tue Jun 14 08:44:27 2011
@@ -1,29 +1,28 @@
 # $Revision$, $Date$
-# 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:	3
+Version:	3.3.0
+Release:	1
 License:	LGPL v2.1
 Group:		Libraries
 Source0:	http://download.osgeo.org/geos/%{name}-%{version}.tar.bz2
-# Source0-md5:	c5d264acac22fe7720f85dadc1fc17c6
+# Source0-md5:	3301f3d1d747b95749384b8a356b022a
 Patch0:		%{name}-ruby1.9.patch
-Patch1:		%{name}-swig2.patch
 URL:		http://trac.osgeo.org/geos/
 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}
@@ -69,6 +68,19 @@
 %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
@@ -96,7 +108,6 @@
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 
 %build
 %{__aclocal} -I macros
@@ -104,6 +115,7 @@
 %{__autoheader}
 %{__automake}
 %configure \
+	%{?with_php:--enable-php} \
 	--enable-python \
 	%{?with_ruby:--enable-ruby}
 
@@ -117,8 +129,16 @@
 %{__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_sitearchdir}/*.{la,a}}
+%{__rm} $RPM_BUILD_ROOT%{py_sitedir}/geos/*.{la,a}
 
 %py_postclean
 
@@ -151,6 +171,14 @@
 %{_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
@@ -170,6 +198,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.30  2011/06/14 06:44:27  qboosh
+- updated to 3.3.0
+- removed obsolete swig2 patch
+- package php extension
+
 Revision 1.29  2010/11/15 10:17:19  pawelz
 - release 3
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/geos/geos.spec?r1=1.29&r2=1.30&f=u