Date: Sunday, June 28, 2015 @ 00:09:56 Author: jlichtblau Revision: 135927
upgpkg: gdal 2.0.0-1 - new upstream release Added: gdal/trunk/gdal-python-install.patch Modified: gdal/trunk/PKGBUILD gdal/trunk/gdal.changelog Deleted: gdal/trunk/gdal-1.5.1-python-install.patch gdal/trunk/poppler-0.31.patch ---------------------------------+ PKGBUILD | 25 ++++++++++++------------- gdal-1.5.1-python-install.patch | 10 ---------- gdal-python-install.patch | 10 ++++++++++ gdal.changelog | 6 ++++++ poppler-0.31.patch | 12 ------------ 5 files changed, 28 insertions(+), 35 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2015-06-27 19:44:11 UTC (rev 135926) +++ PKGBUILD 2015-06-27 22:09:56 UTC (rev 135927) @@ -4,29 +4,28 @@ # Contributor: William Rea <sillywi...@gmail.com> pkgname=gdal -pkgver=1.11.2 -pkgrel=5 +pkgver=2.0.0 +pkgrel=1 pkgdesc="A translator library for raster geospatial data formats" arch=('i686' 'x86_64') url="http://www.gdal.org/" license=('custom') -depends=('curl' 'geos' 'giflib' 'hdf5' 'libgeotiff' 'libjpeg' 'libpng' 'libspatialite' 'libtiff' 'netcdf' 'poppler' 'python2' 'python2-numpy' 'cfitsio' 'sqlite' 'libmariadbclient' 'postgresql-libs') +depends=('curl' 'geos' 'giflib' 'hdf5' 'libgeotiff' 'libjpeg' 'libpng' 'libspatialite' 'libtiff' 'netcdf' + 'poppler' 'python2' 'python2-numpy' 'cfitsio' 'sqlite' 'libmariadbclient' 'postgresql-libs') makedepends=('perl' 'swig' 'chrpath' 'doxygen') optdepends=('postgresql: postgresql database support' 'mariadb: mariadb database support' 'perl: perl binding support') +options=('!emptydirs') changelog=$pkgname.changelog source=(http://download.osgeo.org/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz - gdal-1.5.1-python-install.patch - poppler-0.31.patch) -sha256sums=('66bc8192d24e314a66ed69285186d46e6999beb44fc97eeb9c76d82a117c0845' - '55a0a961b2d1caddf80f18b6763a96690b0b6443fbd5a0c89e29503ded3bcea6' - '4fc42bdb729cec92920236ef9f3302fab497069dbb7d41d81222e7e48a36e7a6') + gdal-python-install.patch) +sha256sums=('53761563ff53c5bf27bff7c4d6cab8bb1634baccefda05348e0f3b7acaf4c9e6' + '823199fdedf5953d9b6bffb0e58a810490e958054f5a9da9d5cd1818f89cd51a') prepare() { cd "${srcdir}"/$pkgname-$pkgver - patch -Np0 -i "${srcdir}"/gdal-1.5.1-python-install.patch - patch -Np1 -i "${srcdir}"/poppler-0.31.patch + patch -Np0 -i "${srcdir}"/gdal-python-install.patch # python2 fixes sed -i 's_python python1.5_python2 python python1.5_' configure @@ -46,8 +45,8 @@ export LDFLAGS="$LDFLAGS -Wl,--as-needed" ./configure --prefix=/usr --with-netcdf --with-libtiff --with-sqlite3 \ - --with-geotiff --with-mysql --with-python --with-curl \ - --with-hdf5 --with-perl --with-geos --with-png --with-poppler --with-spatialite + --with-geotiff --with-mysql --with-python --with-curl --with-hdf5 \ + --with-perl --with-geos --with-png --with-poppler --with-spatialite # workaround for bug #13646 sed -i 's/PY_HAVE_SETUPTOOLS=1/PY_HAVE_SETUPTOOLS=/g' ./GDALmake.opt @@ -63,7 +62,7 @@ make DESTDIR="${pkgdir}" install-man # install license - install -D -m644 LICENSE.TXT "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE + install -Dm644 LICENSE.TXT "${pkgdir}"/usr/share/licenses/$pkgname/LICENSE #FS15477 clean up junks rm -f "${pkgdir}"/usr/bin/*.dox Deleted: gdal-1.5.1-python-install.patch =================================================================== --- gdal-1.5.1-python-install.patch 2015-06-27 19:44:11 UTC (rev 135926) +++ gdal-1.5.1-python-install.patch 2015-06-27 22:09:56 UTC (rev 135927) @@ -1,10 +0,0 @@ ---- swig/python/GNUmakefile.orig 2010-04-24 01:22:07.000000000 +0200 -+++ swig/python/GNUmakefile 2010-05-05 19:14:58.000000000 +0200 -@@ -72,5 +72,5 @@ - ifeq ($(PY_HAVE_SETUPTOOLS),1) -- $(PYTHON) setup.py install -+ $(PYTHON) setup.py install --root=$(DESTDIR) - else -- $(PYTHON) setup.py install --prefix=$(DESTDIR)$(prefix) -+ $(PYTHON) setup.py install --root=$(DESTDIR) --prefix=$(prefix) - endif Added: gdal-python-install.patch =================================================================== --- gdal-python-install.patch (rev 0) +++ gdal-python-install.patch 2015-06-27 22:09:56 UTC (rev 135927) @@ -0,0 +1,10 @@ +--- swig/python/GNUmakefile.orig 2015-06-14 21:06:33.000000000 +0200 ++++ swig/python/GNUmakefile 2015-06-27 22:02:07.805035411 +0200 +@@ -70,5 +70,5 @@ + ifeq ($(PY_HAVE_SETUPTOOLS),1) +- $(PYTHON) setup.py install ++ $(PYTHON) setup.py install --root=$(DESTDIR) + else +- $(PYTHON) setup.py install --prefix=$(DESTDIR)$(prefix) ++ $(PYTHON) setup.py install --root=$(DESTDIR) --prefix=$(prefix) + endif Modified: gdal.changelog =================================================================== --- gdal.changelog 2015-06-27 19:44:11 UTC (rev 135926) +++ gdal.changelog 2015-06-27 22:09:56 UTC (rev 135927) @@ -1,3 +1,9 @@ +2015-06-27 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * gdal 2.0.0 + +2015-03-01 Jaroslav Lichtblau <svetlemo...@archlinux.org> + * gdal 1.11.2-2 poppler 0.31.0 rebuild + 2015-02-23 Jaroslav Lichtblau <svetlemo...@archlinux.org> * gdal 1.11.2-1 Deleted: poppler-0.31.patch =================================================================== --- poppler-0.31.patch 2015-06-27 19:44:11 UTC (rev 135926) +++ poppler-0.31.patch 2015-06-27 22:09:56 UTC (rev 135927) @@ -1,12 +0,0 @@ -diff -Nur gdal-1.11.2/frmts/pdf/pdfdataset.cpp gdal-1.11.2a/frmts/pdf/pdfdataset.cpp ---- gdal-1.11.2/frmts/pdf/pdfdataset.cpp 2015-02-10 13:11:19.000000000 +0100 -+++ gdal-1.11.2a/frmts/pdf/pdfdataset.cpp 2015-03-02 18:38:25.170155277 +0100 -@@ -113,7 +113,7 @@ - GBool allowAntialiasA = gTrue) : - SplashOutputDev(colorModeA, bitmapRowPadA, - reverseVideoA, paperColorA, -- bitmapTopDownA, allowAntialiasA), -+ bitmapTopDownA), - bEnableVector(TRUE), - bEnableText(TRUE), - bEnableBitmap(TRUE) {}