- ver. 3.0.0 rc4

Changed files:
    geos.spec -> 1.18

diff --git a/geos.spec b/geos.spec
index ff1179bea9bbd2654090cb53e3a86766c13d023f..14e8293b92066ef9d30f224a636a419559de0e37 100644 (file)
--- a/geos.spec
+++ b/geos.spec
@@ -4,13 +4,13 @@
 Summary:       Geometry Engine - Open Source
 Summary(pl.UTF-8):     GEOS - silnik geometryczny z otwartymi źródłami
 Name:          geos
-Version:       2.2.3
-Release:       2
+Version:       3.0.0
+%define        _rc     rc4
+Release:       0.%{_rc}.1
 License:       LGPL
 Group:         Libraries
-Source0:       http://geos.refractions.net/%{name}-%{version}.tar.bz2
-# Source0-md5: 440be2b11fd3d711e950a47ea6f1b424
-Patch0:                %{name}-swig.patch
+Source0:       http://geos.refractions.net/%{name}-%{version}%{_rc}.tar.bz2
+# Source0-md5: 90d4dba51dd75f8f1f12378e0f910d76
 URL:           http://geos.refractions.net/
 BuildRequires: automake
 BuildRequires: libstdc++-devel
@@ -87,25 +87,17 @@ Ruby bindings for Geometry Engine - Open Source.
 Wiązania języka Ruby do biblioteki GEOS.
 
 %prep
-%setup -q
-%patch0 -p1
+%setup -q -n %{name}-%{version}%{_rc}
 
 %build
 cp -f /usr/share/automake/config.* .
-%configure
+%configure \
+       --enable-python \
+       %{?with_ruby:--enable-ruby}
+
 %{__make} \
        pkglibdir=%{_libdir}
 
-cd swig/python
-swig -c++ -python -modern -o geos_wrap.cxx ../geos.i
-python setup.py build
-
-%if %{with ruby}
-cd ../ruby
-swig -c++ -ruby -autorename -o geos_wrap.cxx ../geos.i
-%{__cxx} %{rpmcxxflags} -I../../source/headers -I%{ruby_archdir} -c geos_wrap.cxx
-%{__cxx} -shared -o geos.so geos_wrap.o -lruby -L../../source/geom/.libs -lgeos
-%endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -114,16 +106,6 @@ rm -rf $RPM_BUILD_ROOT
        DESTDIR=$RPM_BUILD_ROOT \
        pkglibdir=%{_libdir}
 
-cd swig
-%if %{with ruby}
-install -D ruby/geos.so $RPM_BUILD_ROOT%{ruby_archdir}/geos.so
-%endif
-
-cd python
-python setup.py install \
-       --optimize=2 \
-       --root=$RPM_BUILD_ROOT
-
 %py_postclean
 
 %clean
@@ -135,7 +117,9 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS README TODO
-%attr(755,root,root) %{_libdir}/libgeos.so.*.*.*
+# fixme?:
+%attr(755,root,root) %{_libdir}/libgeos-3.0*.so
+#%attr(755,root,root) %{_libdir}/libgeos.so.*.*.*
 %attr(755,root,root) %{_libdir}/libgeos_c.so.*.*.*
 
 %files devel
@@ -156,9 +140,9 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n python-geos
 %defattr(644,root,root,755)
-%attr(755,root,root) %{py_sitedir}/_geos.so
-%{py_sitedir}/geos.py[co]
-%{py_sitedir}/PyGEOS-*.egg-info
+%dir %{py_sitedir}/geos
+%attr(755,root,root) %{py_sitedir}/geos/_geos.so
+%{py_sitescriptdir}/geos*
 
 %if %{with ruby}
 %files -n ruby-geos