- python %install fix
authorJacek Konieczny <jajcus@pld-linux.org>
Mon, 18 May 2009 18:23:03 +0000 (18:23 +0000)
committercvs2git <feedback@pld-linux.org>
Sun, 24 Jun 2012 12:13:13 +0000 (12:13 +0000)
Changed files:
    gdal-python_install.patch -> 1.1
    gdal.spec -> 1.61

gdal-python_install.patch [new file with mode: 0644]
gdal.spec

diff --git a/gdal-python_install.patch b/gdal-python_install.patch
new file mode 100644 (file)
index 0000000..88eac18
--- /dev/null
@@ -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
+       
index 76665ae8533c6375c4b89af5c6f9825fb37f33c8..94d1f28367329fb015de949694eb497ab2a4452e 100644 (file)
--- a/gdal.spec
+++ b/gdal.spec
@@ -9,7 +9,7 @@ Summary:        Geospatial Data Abstraction Library
 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
@@ -19,6 +19,7 @@ Patch1:               %{name}-perl.patch
 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
@@ -228,7 +229,9 @@ cp -a ogr/html _html/ogr
 %{__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
This page took 0.048406 seconds and 4 git commands to generate.