SPECS: geos.spec - ver. 3.0.0 rc4

wrobell wrobell at pld-linux.org
Tue Oct 9 23:43:28 CEST 2007


Author: wrobell                      Date: Tue Oct  9 21:43:28 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- ver. 3.0.0 rc4

---- Files affected:
SPECS:
   geos.spec (1.17 -> 1.18) 

---- Diffs:

================================================================
Index: SPECS/geos.spec
diff -u SPECS/geos.spec:1.17 SPECS/geos.spec:1.18
--- SPECS/geos.spec:1.17	Tue Oct  9 22:48:56 2007
+++ SPECS/geos.spec	Tue Oct  9 23:43:23 2007
@@ -5,13 +5,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
@@ -88,25 +88,17 @@
 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
@@ -115,16 +107,6 @@
 	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
@@ -136,7 +118,9 @@
 %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
@@ -157,9 +141,9 @@
 
 %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
@@ -173,6 +157,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.18  2007/10/09 21:43:23  wrobell
+- ver. 3.0.0 rc4
+
 Revision 1.17  2007/10/09 20:48:56  wrobell
 - added ruby bcond
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/geos.spec?r1=1.17&r2=1.18&f=u



More information about the pld-cvs-commit mailing list