SPECS: gdal.spec - ver. 1.4.2 - added ruby build conditional - pyt...

[wrobell]

Author: wrobell                      Date: Thu Jul  5 10:11:18 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- ver. 1.4.2
- added ruby build conditional
- python new generation bindings seem to be compatibile with old python
  bindings, so switch ngpython on

---- Files affected:
SPECS:
   gdal.spec (1.43 -> 1.44) 

---- Diffs:

================================================================
Index: SPECS/gdal.spec
diff -u SPECS/gdal.spec:1.43 SPECS/gdal.spec:1.44
--- SPECS/gdal.spec:1.43	Sun Jun 17 21:12:42 2007
+++ SPECS/gdal.spec	Thu Jul  5 12:11:12 2007
@@ -3,21 +3,21 @@
 # Conditional build:
 %bcond_without	odbc	# disable odbc support
 %bcond_without	xerces	# disable xerces support
+%bcond_without	ruby	# disable ruby support
 #
 Summary:	Geospatial Data Abstraction Library
 Summary(pl.UTF-8):	Biblioteka abstrakcji danych dotyczących powierzchni Ziemi
 Name:		gdal
-Version:	1.4.1
+Version:	1.4.2
 Release:	1
 License:	BSD-like
 Group:		Libraries
 #Source0:	http://download.osgeo.org/gdal/%{name}-%{version}.tar.gz
 Source0:	ftp://ftp.gdal.org/gdal/%{name}-%{version}.tar.gz
-# Source0-md5:	688cf651c6f6efc2851b12f2e9c2e0d1
+# Source0-md5:	dedf5ff6a766e85b9a2b5c54c1c59221
 Patch0:		%{name}-dods.patch
-Patch1:		%{name}-ac.patch
-Patch2:		%{name}-perl.patch
-Patch3:		%{name}-ruby.patch
+Patch1:		%{name}-perl.patch
+Patch2:		%{name}-ruby.patch
 URL:		http://www.gdal.org/
 BuildRequires:	autoconf
 BuildRequires:	cfitsio-devel
@@ -38,11 +38,11 @@
 BuildRequires:	perl-devel
 BuildRequires:	postgresql-devel
 BuildRequires:	postgresql-backend-devel
-BuildRequires:	python-Numeric-devel
+BuildRequires:	python-numpy-devel
 BuildRequires:	python-devel
-BuildRequires:	ruby-devel
+%{?with_ruby:BuildRequires:	ruby-devel}
 BuildRequires:	sqlite3-devel >= 3
-BuildRequires:	swig-ruby
+%{?with_ruby:BuildRequires:	swig-ruby}
 %{?with_odbc:BuildRequires:	unixODBC-devel}
 %{?with_xerces:BuildRequires:	xerces-c-devel >= 2.2.0}
 BuildRequires:	zlib-devel >= 1.1.4
@@ -155,7 +155,6 @@
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
 
 %build
 # disable grass/libgrass here, it can be built from separate gdal-grass package
@@ -165,14 +164,15 @@
 	--with-dods-root=/usr \
 	--with-perl \
 	--with-pymoddir=%{py_sitedir} \
-	--with-ruby \
+	%{?with_ruby:--with-ruby} \
 	--with-sqlite \
 	%{?with_xerces:--with-xerces} \
 	--with-xerces-inc=/usr/include/xercesc \
 	--with-xerces-lib="-lxerces-c" \
 	--without-grass \
-	--without-libgrass
-# --with-ngpython disables traditional python binding
+	--without-libgrass \
+	--with-ngpython
+# ngpython seems to be compatibile with old python bindings
 # --with-php needs Zend API update
 %{__make}
 
@@ -247,9 +247,11 @@
 
 %files -n python-gdal
 %defattr(644,root,root,755)
-%attr(755,root,root) %{py_sitedir}/_gdalmodule.so
+%attr(755,root,root) %{py_sitedir}/*.so
 %{py_sitedir}/*.py[co]
+%{py_sitedir}/*.egg-info
 
+%if %{with ruby}
 %files -n ruby-gdal
 %defattr(644,root,root,755)
 %dir %{ruby_sitearchdir}/gdal
@@ -257,6 +259,7 @@
 %attr(755,root,root) %{ruby_sitearchdir}/gdal/gdalconst.so
 %attr(755,root,root) %{ruby_sitearchdir}/gdal/ogr.so
 %attr(755,root,root) %{ruby_sitearchdir}/gdal/osr.so
+%endif
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -264,6 +267,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.44  2007/07/05 10:11:12  wrobell
+- ver. 1.4.2
+- added ruby build conditional
+- python new generation bindings seem to be compatibile with old python
+  bindings, so switch ngpython on
+
 Revision 1.43  2007/06/17 19:12:42  wrobell
 - rel. 1
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/gdal.spec?r1=1.43&r2=1.44&f=u