Author: hawk                         Date: Mon Mar 12 20:55:49 2007 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- updated to 3.0.0rc4

---- Files affected:
SPECS:
   geos.spec (1.12.2.1 -> 1.12.2.2) 

---- Diffs:

================================================================
Index: SPECS/geos.spec
diff -u SPECS/geos.spec:1.12.2.1 SPECS/geos.spec:1.12.2.2
--- SPECS/geos.spec:1.12.2.1    Mon Dec 11 21:49:25 2006
+++ SPECS/geos.spec     Mon Mar 12 21:55:44 2007
@@ -1,14 +1,14 @@
 # $Revision$, $Date$
+%define                _rc     rc4
 Summary:       Geometry Engine - Open Source
 Summary(pl):   GEOS - silnik geometryczny z otwartymi źródłami
 Name:          geos
-Version:       2.2.3
-Release:       1
+Version:       3.0.0
+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
@@ -85,24 +85,16 @@
 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 \
+       --enable-ruby
 %{__make} \
        pkglibdir=%{_libdir}
 
-cd swig/python
-swig -c++ -python -modern -o geos_wrap.cxx ../geos.i
-python setup.py build
-
-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
-
 %install
 rm -rf $RPM_BUILD_ROOT
 
@@ -110,14 +102,6 @@
        DESTDIR=$RPM_BUILD_ROOT \
        pkglibdir=%{_libdir}
 
-cd swig
-install -D ruby/geos.so $RPM_BUILD_ROOT%{ruby_archdir}/geos.so
-
-cd python
-python setup.py install \
-       --optimize=2 \
-       --root=$RPM_BUILD_ROOT
-
 %py_postclean
 
 %clean
@@ -129,7 +113,7 @@
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS README TODO
-%attr(755,root,root) %{_libdir}/libgeos.so.*.*.*
+%attr(755,root,root) %{_libdir}/libgeos-*.*.*.so
 %attr(755,root,root) %{_libdir}/libgeos_c.so.*.*.*
 
 %files devel
@@ -150,12 +134,12 @@
 
 %files -n python-geos
 %defattr(644,root,root,755)
-%attr(755,root,root) %{py_sitedir}/_geos.so
-%{py_sitedir}/geos.py[co]
+%attr(755,root,root) %{py_sitedir}/geos/_geos.so
+%{py_sitescriptdir}/geos/geos.py[co]
 
 %files -n ruby-geos
 %defattr(644,root,root,755)
-%attr(755,root,root) %{ruby_archdir}/geos.so
+%attr(755,root,root) %{ruby_sitearchdir}/geos.so
 
 %define date   %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -163,6 +147,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.12.2.2  2007/03/12 20:55:44  hawk
+- updated to 3.0.0rc4
+
 Revision 1.12.2.1  2006/12/11 20:49:25  glen
 - AC-branch
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/geos.spec?r1=1.12.2.1&r2=1.12.2.2&f=u

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to