SPECS (AC-branch): gdal.spec - python build hacks, re-entrant install

[glen]

Author: glen                         Date: Mon Mar  3 23:48:22 2008 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- python build hacks, re-entrant install

---- Files affected:
SPECS:
   gdal.spec (1.50.2.1 -> 1.50.2.2) 

---- Diffs:

================================================================
Index: SPECS/gdal.spec
diff -u SPECS/gdal.spec:1.50.2.1 SPECS/gdal.spec:1.50.2.2
--- SPECS/gdal.spec:1.50.2.1	Thu Feb 28 00:29:30 2008
+++ SPECS/gdal.spec	Tue Mar  4 00:48:17 2008
@@ -158,6 +158,10 @@
 %patch2 -p1
 
 %build
+# $PYTHON_INCLUDES is set only with --with-python, but we have --with-ngpython,
+# and $PYTHON_INCLUDES is needed to detect numpy properly
+export PYTHON_INCLUDES=-I%{py_incdir}
+
 # disable grass/libgrass here, it can be built from separate gdal-grass package
 %{__autoconf}
 %configure \
@@ -188,7 +192,12 @@
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-mv -f ogr/html html/org
+rm -rf _html
+cp -a html _html
+cp -a ogr/html _html/ogr
+
+# well. this seems some legacy wrapper, but we install as somebody put it to files section
+install swig/python/gdalnumeric.py $RPM_BUILD_ROOT%{py_sitedir}
 
 %py_comp $RPM_BUILD_ROOT%{py_sitedir}
 %py_ocomp $RPM_BUILD_ROOT%{py_sitedir}
@@ -213,7 +222,7 @@
 
 %files devel
 %defattr(644,root,root,755)
-%doc html/*
+%doc _html/*
 %attr(755,root,root) %{_bindir}/gdal-config
 %attr(755,root,root) %{_libdir}/libgdal.so
 %{_libdir}/libgdal.la
@@ -250,16 +259,15 @@
 %defattr(644,root,root,755)
 %attr(755,root,root) %{py_sitedir}/_gdal.so
 %attr(755,root,root) %{py_sitedir}/_gdalconst.so
-%attr(755,root,root) %{py_sitedir}/_gdal_array.so
+#%attr(755,root,root) %{py_sitedir}/_gdal_array.so
 %attr(755,root,root) %{py_sitedir}/_ogr.so
 %attr(755,root,root) %{py_sitedir}/_osr.so
 %{py_sitedir}/gdal.py[co]
 %{py_sitedir}/gdalconst.py[co]
 %{py_sitedir}/gdalnumeric.py[co]
-%{py_sitedir}/gdal_array.py[co]
+#%{py_sitedir}/gdal_array.py[co]
 %{py_sitedir}/ogr.py[co]
 %{py_sitedir}/osr.py[co]
-%{py_sitedir}/Gdal_Wrapper-*.egg-info
 
 %if %{with ruby}
 %files -n ruby-gdal
@@ -277,6 +285,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.50.2.2  2008-03-03 23:48:17  glen
+- python build hacks, re-entrant install
+
 Revision 1.50.2.1  2008-02-27 23:29:30  glen
 - moved branch
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/gdal.spec?r1=1.50.2.1&r2=1.50.2.2&f=u