packages: gdal/gdal.spec, gdal/gdal-python_install.patch (NEW) - python %in...

[jajcus]

Author: jajcus                       Date: Mon May 18 18:23:08 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- python %install fix

---- Files affected:
packages/gdal:
   gdal.spec (1.60 -> 1.61) , gdal-python_install.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/gdal/gdal.spec
diff -u packages/gdal/gdal.spec:1.60 packages/gdal/gdal.spec:1.61
--- packages/gdal/gdal.spec:1.60	Fri May 15 15:31:37 2009
+++ packages/gdal/gdal.spec	Mon May 18 20:23:03 2009
@@ -10,7 +10,7 @@
 Summary(pl.UTF-8):	Biblioteka abstrakcji danych dotyczących powierzchni Ziemi
 Name:		gdal
 Version:	1.5.4
-Release:	2
+Release:	3
 License:	BSD-like
 Group:		Libraries
 Source0:	ftp://ftp.remotesensing.org/gdal/%{name}-%{version}.tar.gz
@@ -20,6 +20,7 @@
 Patch2:		%{name}-ruby.patch
 Patch3:		%{name}-asneeded.patch
 Patch4:		%{name}-ogdi.patch
+Patch5:		%{name}-python_install.patch
 URL:		http://www.gdal.org/
 BuildRequires:	autoconf >= 2.52
 BuildRequires:	automake
@@ -229,7 +230,9 @@
 %{__rm} $RPM_BUILD_ROOT%{perl_vendorarch}/Geo/OGR.dox
 %{__rm} $RPM_BUILD_ROOT%{perl_vendorarch}/Geo/OSR.dox
 
+%if %{with ruby}
 %{__rm} $RPM_BUILD_ROOT%{ruby_sitearchdir}/gdal/*.la
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -315,6 +318,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.61  2009/05/18 18:23:03  jajcus
+- python %install fix
+
 Revision 1.60  2009/05/15 13:31:37  hawk
 - release 2
 

================================================================
Index: packages/gdal/gdal-python_install.patch
diff -u /dev/null packages/gdal/gdal-python_install.patch:1.1
--- /dev/null	Mon May 18 20:23:08 2009
+++ packages/gdal/gdal-python_install.patch	Mon May 18 20:23:03 2009
@@ -0,0 +1,16 @@
+--- gdal-1.5.4/swig/python/GNUmakefile.bak	2008-07-26 21:04:24.000000000 +0200
++++ gdal-1.5.4/swig/python/GNUmakefile	2009-05-18 20:14:35.000000000 +0200
+@@ -53,12 +53,7 @@
+ 	$(PYTHON) setup.py bdist_egg 
+ 	
+ install:
+-
+-ifeq ($(PY_HAVE_SETUPTOOLS),1)
+-	$(PYTHON) setup.py install 
+-else
+-	$(PYTHON) setup.py install --prefix=$(DESTDIR)$(prefix)
+-endif
++	$(PYTHON) setup.py install --root=$(DESTDIR)
+ 
+ 	for f in $(SCRIPTS) ; do $(INSTALL) ./scripts/$$f $(DESTDIR)$(INST_BIN) ; done
+ 	
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gdal/gdal.spec?r1=1.60&r2=1.61&f=u