This commit was manufactured by cvs2git to create branch 'AC-branch'.

Sprout from master 2005-01-16 01:40:45 UTC Jakub Bogusz <qboosh@pld-linux.org> '- updated to 2.1.1'
Cherrypick from master 2006-05-28 22:44:30 UTC Jakub Bogusz <qboosh@pld-linux.org> '- old patch obsolete; now add missing file + disable function which relies on non-existing geos code':
    geos-swig.patch -> 1.2
Cherrypick from master 2008-03-12 00:53:19 UTC Elan Ruusamäe <glen@pld-linux.org> '- unpackaged file':
    geos.spec -> 1.21

diff --git a/geos-swig.patch b/geos-swig.patch
new file mode 100644 (file)
index 0000000..a8224c3
--- /dev/null
+++ b/geos-swig.patch
@@ -0,0 +1,36 @@
+--- geos/swig/python/python.i.orig     1970-01-01 01:00:00.000000000 +0100
++++ geos/swig/python/python.i  2006-05-28 23:19:23.272220250 +0200
+@@ -0,0 +1,3 @@
++%template(vector_GeometryP) std::vector<geos::Geometry *>;
++%template(vector_LineStringP) std::vector<geos::LineString *>;
++%template(vector_PolygonP) std::vector<geos::Polygon *>;
+--- geos-2.2.2/swig/geos.i.orig        2006-04-04 11:50:17.000000000 +0200
++++ geos-2.2.2/swig/geos.i     2006-05-28 23:30:37.130333750 +0200
+@@ -202,12 +202,14 @@
+                                geos::MultiPoint, geos::MultiLineString,
+                                geos::MultiPolygon, geos::GeometryCollection);
+ 
++/*
+ %newobject geos::Geometry::fromHEX;
+ %factory(geos::Geometry * geos::Geometry::fromHEX, geos::Point, 
+                                geos::LinearRing, geos::LineString,
+                                geos::Polygon, 
+                                geos::MultiPoint, geos::MultiLineString,
+                                geos::MultiPolygon, geos::GeometryCollection);
++*/
+ 
+ /* ================= Operators  ============== */
+ /* Ignore these for now - if we don't SWIG will create
+@@ -316,10 +318,11 @@
+               std::stringstream in(wkt);
+               return geos_Geometry_reader().read(in);
+       }
+-      
++/*    
+       static Geometry* fromHEX(std::string hex)
+       {
+               std::stringstream in(hex);
+               return geos_Geometry_reader().readHEX(in);
+       }
++*/
+ };

diff --git a/geos.spec b/geos.spec
index 206c9abb427fbcc95229cff8769bc067a97e5c73..154fa0abc5aacb53bec8d8a3e3143e4f4fd9cd95 100644 (file)
--- a/geos.spec
+++ b/geos.spec
@@ -1,16 +1,28 @@
+# TODO
+# - unpackaged:    /usr/bin/XMLTester
+#
+# Conditional build:
+%bcond_without ruby    # ruby binding
+#
 Summary:       Geometry Engine - Open Source
-Summary(pl):   GEOS - silnik geometryczny z otwartymi ¼ród³ami
+Summary(pl.UTF-8):     GEOS - silnik geometryczny z otwartymi źródłami
 Name:          geos
-Version:       2.0.1
+Version:       3.0.0
 Release:       1
-License:       LGPL
+License:       LGPL v2.1
 Group:         Libraries
-Source0:       http://geos.refractions.net/%{name}-%{version}.tar.bz2
-# Source0-md5: 847ce051190d1901b0c2a9f670c6b320
-Patch0:                %{name}-config.patch
+Source0:       http://geos.refractions.net/downloads/%{name}-%{version}.tar.bz2
+# Source0-md5: 3f7940abee9fec69a9787878cd3ae771
 URL:           http://geos.refractions.net/
 BuildRequires: automake
 BuildRequires: libstdc++-devel
+BuildRequires: python
+BuildRequires: python-devel
+BuildRequires: rpm-pythonprov
+BuildRequires: rpmbuild(macros) >= 1.219
+%{?with_ruby:BuildRequires:    ruby-devel}
+BuildRequires: swig-python >= 1.3.29
+%{?with_ruby:BuildRequires:    swig-ruby >= 1.3.29}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -20,17 +32,17 @@ functionality of JTS in C++. This includes all the OpenGIS "Simple
 Features for SQL" spatial predicate functions and spatial operators,
 as well as specific JTS topology functions such as IsValid().
 
-%description -l pl
+%description -l pl.UTF-8
 GEOS (Geometry Engine - Open Source, czyli silnik geometryczny z
-otwartymi ¼ród³ami) to port C++ biblioteki Java Topology Suite (JTS).
-Celem biblioteki jako takiej jest implementacja pe³nej funkcjonalno¶ci
-JTS w C++. Obejmuje to wszystkie funkcje predykatów przestrzennych
+otwartymi źródłami) to port C++ biblioteki Java Topology Suite (JTS).
+Celem biblioteki jako takiej jest implementacja pełnej funkcjonalności
+JTS w C++. Obejmuje to wszystkie funkcje predykatów przestrzennych
 wg "Simple Features for SQL" OpenGIS oraz operatory przestrzenne, a
-tak¿e specyficzne dla JTS funkcje topologiczne takie jak IsValid().
+także specyficzne dla JTS funkcje topologiczne takie jak IsValid().
 
 %package devel
 Summary:       Header files for GEOS library
-Summary(pl):   Pliki nag³ówkowe biblioteki GEOS
+Summary(pl.UTF-8):     Pliki nagłówkowe biblioteki GEOS
 Group:         Development/Libraries
 Requires:      %{name} = %{version}-%{release}
 Requires:      libstdc++-devel
@@ -38,37 +50,68 @@ Requires:   libstdc++-devel
 %description devel
 Header files for GEOS library.
 
-%description devel -l pl
-Pliki nag³ówkowe biblioteki GEOS.
+%description devel -l pl.UTF-8
+Pliki nagłówkowe biblioteki GEOS.
 
 %package static
 Summary:       Static GEOS library
-Summary(pl):   Statyczna biblioteka GEOS
+Summary(pl.UTF-8):     Statyczna biblioteka GEOS
 Group:         Development/Libraries
 Requires:      %{name}-devel = %{version}-%{release}
 
 %description static
 Static GEOS library.
 
-%description static -l pl
+%description static -l pl.UTF-8
 Statyczna biblioteka GEOS.
 
+%package -n python-geos
+Summary:       Python bindings for Geometry Engine - Open Source
+Summary(pl.UTF-8):     Wiązania Pythona do biblioteki GEOS
+Group:         Development/Languages/Python
+Requires:      %{name} = %{version}-%{release}
+
+%description -n python-geos
+Python bindings for Geometry Engine - Open Source.
+
+%description -n python-geos -l pl.UTF-8
+Wiązania Pythona do biblioteki GEOS.
+
+%package -n ruby-geos
+Summary:       Ruby bindings for Geometry Engine - Open Source
+Summary(pl.UTF-8):     Wiązania języka Ruby do biblioteki GEOS
+Group:         Development/Languages/Python
+Requires:      %{name} = %{version}-%{release}
+
+%description -n ruby-geos
+Ruby bindings for Geometry Engine - Open Source.
+
+%description -n ruby-geos -l pl.UTF-8
+Wiązania języka Ruby do biblioteki GEOS.
+
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 cp -f /usr/share/automake/config.* .
-%configure
+%configure \
+       --enable-python \
+       %{?with_ruby:--enable-ruby}
+
 %{__make} \
        pkglibdir=%{_libdir}
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
 
 %{__make} install \
-       DESTDIR=$RPM_BUILD_ROOT \
-       pkglibdir=%{_libdir}
+       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}
+
+%py_postclean
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -78,17 +121,36 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS TODO
-%attr(755,root,root) %{_libdir}/lib*.so.*.*.*
+%doc AUTHORS ChangeLog NEWS README TODO
+%attr(755,root,root) %{_libdir}/libgeos-3.0.0.so
+%attr(755,root,root) %{_libdir}/libgeos_c.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libgeos_c.so.1
 
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/geos-config
-%attr(755,root,root) %{_libdir}/lib*.so
-%{_libdir}/lib*.la
+%attr(755,root,root) %{_libdir}/libgeos.so
+%attr(755,root,root) %{_libdir}/libgeos_c.so
+%{_libdir}/libgeos.la
+%{_libdir}/libgeos_c.la
 %{_includedir}/geos
 %{_includedir}/geos.h
+%{_includedir}/geos_c.h
 
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/lib*.a
+%{_libdir}/libgeos.a
+%{_libdir}/libgeos_c.a
+
+%files -n python-geos
+%defattr(644,root,root,755)
+%dir %{py_sitedir}/geos
+%attr(755,root,root) %{py_sitedir}/geos/_geos.so
+%{py_sitescriptdir}/geos
+%{py_sitescriptdir}/geos.pth
+
+%if %{with ruby}
+%files -n ruby-geos
+%defattr(644,root,root,755)
+%attr(755,root,root) %{ruby_sitearchdir}/geos.so
+%endif