Update to 2.1.1
- Add patch to fix bash-completion installation and install it (bug #1337143)
This commit is contained in:
parent
9f6a4ae2b1
commit
b9bc4f9077
2
.gitignore
vendored
2
.gitignore
vendored
@ -24,3 +24,5 @@ gdalautotest-1.7.0.tar.gz
|
|||||||
/gdal-2.0.2-fedora.tar.xz
|
/gdal-2.0.2-fedora.tar.xz
|
||||||
/gdalautotest-2.1.0.tar.gz
|
/gdalautotest-2.1.0.tar.gz
|
||||||
/gdal-2.1.0-fedora.tar.xz
|
/gdal-2.1.0-fedora.tar.xz
|
||||||
|
/gdalautotest-2.1.1.tar.gz
|
||||||
|
/gdal-2.1.1-fedora.tar.xz
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
# Volker Fröhlich
|
# Volker Fröhlich
|
||||||
VERSION="2.1.0"
|
VERSION="2.1.1"
|
||||||
|
|
||||||
tar xvf gdal-"${VERSION}".tar.xz
|
tar xvf gdal-"${VERSION}".tar.xz
|
||||||
|
|
||||||
|
12
gdal-completion.patch
Normal file
12
gdal-completion.patch
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
diff -up gdal-2.1.1-fedora/scripts/GNUmakefile.completion gdal-2.1.1-fedora/scripts/GNUmakefile
|
||||||
|
--- gdal-2.1.1-fedora/scripts/GNUmakefile.completion 2016-07-07 04:35:26.000000000 -0600
|
||||||
|
+++ gdal-2.1.1-fedora/scripts/GNUmakefile 2016-08-12 10:21:01.442938729 -0600
|
||||||
|
@@ -5,6 +5,6 @@ completion:
|
||||||
|
|
||||||
|
install:
|
||||||
|
if test "x`pkg-config --version 2>/dev/null`" != "x" -a "x`pkg-config --variable=compatdir bash-completion`" != "x"; then \
|
||||||
|
- $(INSTALL_DIR) $(DESTDIR)${prefix}`pkg-config --variable=compatdir bash-completion` ; \
|
||||||
|
- cp gdal-bash-completion.sh $(DESTDIR)${prefix}`pkg-config --variable=compatdir bash-completion`; \
|
||||||
|
+ $(INSTALL_DIR) $(DESTDIR)`pkg-config --variable=compatdir bash-completion` ; \
|
||||||
|
+ $(INSTALL_DATA) gdal-bash-completion.sh $(DESTDIR)`pkg-config --variable=compatdir bash-completion`/gdal; \
|
||||||
|
fi
|
49
gdal.spec
49
gdal.spec
@ -24,7 +24,7 @@
|
|||||||
%global proj_somaj 9
|
%global proj_somaj 9
|
||||||
|
|
||||||
# Tests can be of a different version
|
# Tests can be of a different version
|
||||||
%global testversion 2.1.0
|
%global testversion 2.1.1
|
||||||
%global run_tests 1
|
%global run_tests 1
|
||||||
|
|
||||||
%global with_spatialite 1
|
%global with_spatialite 1
|
||||||
@ -39,10 +39,12 @@
|
|||||||
%endif
|
%endif
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
%global compdir %(dirname $(pkg-config --variable=compatdir bash-completion))
|
||||||
|
|
||||||
|
|
||||||
Name: gdal
|
Name: gdal
|
||||||
Version: 2.1.0
|
Version: 2.1.1
|
||||||
Release: 8%{?dist}
|
Release: 1%{?dist}
|
||||||
Summary: GIS file format library
|
Summary: GIS file format library
|
||||||
Group: System Environment/Libraries
|
Group: System Environment/Libraries
|
||||||
License: MIT
|
License: MIT
|
||||||
@ -63,6 +65,8 @@ Source4: PROVENANCE.TXT-fedora
|
|||||||
Patch1: %{name}-g2clib.patch
|
Patch1: %{name}-g2clib.patch
|
||||||
# Patch for Fedora JNI library location
|
# Patch for Fedora JNI library location
|
||||||
Patch2: %{name}-jni.patch
|
Patch2: %{name}-jni.patch
|
||||||
|
# Fix bash-completion install dir
|
||||||
|
Patch3: %{name}-completion.patch
|
||||||
|
|
||||||
# Fedora uses Alternatives for Java
|
# Fedora uses Alternatives for Java
|
||||||
Patch8: %{name}-1.9.0-java.patch
|
Patch8: %{name}-1.9.0-java.patch
|
||||||
@ -73,6 +77,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
|||||||
BuildRequires: ant
|
BuildRequires: ant
|
||||||
# No armadillo in EL5
|
# No armadillo in EL5
|
||||||
BuildRequires: armadillo-devel
|
BuildRequires: armadillo-devel
|
||||||
|
BuildRequires: bash-completion
|
||||||
BuildRequires: cfitsio-devel
|
BuildRequires: cfitsio-devel
|
||||||
# No CharLS in EL5
|
# No CharLS in EL5
|
||||||
#BuildRequires: CharLS-devel
|
#BuildRequires: CharLS-devel
|
||||||
@ -292,6 +297,7 @@ rm -r frmts/grib/degrib18/g2clib-1.0.4
|
|||||||
|
|
||||||
%patch1 -p1 -b .g2clib~
|
%patch1 -p1 -b .g2clib~
|
||||||
%patch2 -p1 -b .jni~
|
%patch2 -p1 -b .jni~
|
||||||
|
%patch3 -p1 -b .completion~
|
||||||
%patch8 -p1 -b .java~
|
%patch8 -p1 -b .java~
|
||||||
%patch9 -p1 -b .zlib~
|
%patch9 -p1 -b .zlib~
|
||||||
|
|
||||||
@ -325,17 +331,6 @@ pushd $f
|
|||||||
popd
|
popd
|
||||||
done
|
done
|
||||||
|
|
||||||
# Fix build order with parallel make
|
|
||||||
# http://trac.osgeo.org/gdal/ticket/5346
|
|
||||||
sed -i '/^swig-modules:/s/lib-target/apps-target/' GNUmakefile
|
|
||||||
|
|
||||||
# Workaround about wrong result in configure
|
|
||||||
# armadillo returns a warning about gcc versions 4.7.0 or 4.7.1
|
|
||||||
# due to http://gcc.gnu.org/bugzilla/show_bug.cgi?id=53549
|
|
||||||
# configure interprets the result as an error so ignore it
|
|
||||||
# this patch can/should be removed after gcc 4.7.2 is released
|
|
||||||
sed -i 's|if test -z "`${CXX} testarmadillo.cpp -o testarmadillo -larmadillo 2>&1`"|if true|' configure
|
|
||||||
|
|
||||||
# Replace hard-coded library- and include paths
|
# Replace hard-coded library- and include paths
|
||||||
sed -i 's|@LIBTOOL@|%{_bindir}/libtool|g' GDALmake.opt.in
|
sed -i 's|@LIBTOOL@|%{_bindir}/libtool|g' GDALmake.opt.in
|
||||||
sed -i 's|-L\$with_cfitsio -L\$with_cfitsio/lib -lcfitsio|-lcfitsio|g' configure
|
sed -i 's|-L\$with_cfitsio -L\$with_cfitsio/lib -lcfitsio|-lcfitsio|g' configure
|
||||||
@ -365,11 +360,6 @@ for f in `find . -name '*.py'`; do
|
|||||||
done
|
done
|
||||||
popd
|
popd
|
||||||
|
|
||||||
# Must be corrected for 64 bit architectures other than Intel
|
|
||||||
# http://trac.osgeo.org/gdal/ticket/4544
|
|
||||||
# Should be gone in 2.0
|
|
||||||
sed -i 's|test \"$ARCH\" = \"x86_64\"|test \"$libdir\" = \"/usr/lib64\"|g' configure
|
|
||||||
|
|
||||||
# Adjust check for LibDAP version
|
# Adjust check for LibDAP version
|
||||||
# http://trac.osgeo.org/gdal/ticket/4545
|
# http://trac.osgeo.org/gdal/ticket/4545
|
||||||
%if %cpuarch == 64
|
%if %cpuarch == 64
|
||||||
@ -388,15 +378,6 @@ sed -i 's|CFLAGS=\"${GEOS_CFLAGS}\"|CFLAGS=\"${CFLAGS} ${GEOS_CFLAGS}\"|g' confi
|
|||||||
#sed -i 's|#CHARLS_INC = -I/path/to/charls_include|CHARLS_INC = -I%{_includedir}/CharLS|' GDALmake.opt.in
|
#sed -i 's|#CHARLS_INC = -I/path/to/charls_include|CHARLS_INC = -I%{_includedir}/CharLS|' GDALmake.opt.in
|
||||||
#sed -i 's|#CHARLS_LIB = -L/path/to/charls_lib -lCharLS|CHARLS_LIB = -lCharLS|' GDALmake.opt.in
|
#sed -i 's|#CHARLS_LIB = -L/path/to/charls_lib -lCharLS|CHARLS_LIB = -lCharLS|' GDALmake.opt.in
|
||||||
|
|
||||||
# Replace default plug-in dir
|
|
||||||
# Solved in 2.0
|
|
||||||
# http://trac.osgeo.org/gdal/ticket/4444
|
|
||||||
%if %cpuarch == 64
|
|
||||||
sed -i 's|GDAL_PREFIX "/lib/gdalplugins"|GDAL_PREFIX "/lib64/gdalplugins"|' \
|
|
||||||
gcore/gdaldrivermanager.cpp \
|
|
||||||
ogr/ogrsf_frmts/generic/ogrsfdriverregistrar.cpp
|
|
||||||
%endif
|
|
||||||
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
#TODO: Couldn't I have modified that in the prep section?
|
#TODO: Couldn't I have modified that in the prep section?
|
||||||
@ -699,6 +680,13 @@ rm -f %{buildroot}%{_datadir}/%{name}/LICENSE.TXT
|
|||||||
for f in 'GDAL*' BandProperty ColorAssociation CutlineTransformer DatasetProperty EnhanceCBInfo ListFieldDesc NamedColor OGRSplitListFieldLayer VRTBuilder; do
|
for f in 'GDAL*' BandProperty ColorAssociation CutlineTransformer DatasetProperty EnhanceCBInfo ListFieldDesc NamedColor OGRSplitListFieldLayer VRTBuilder; do
|
||||||
rm -rf %{buildroot}%{_mandir}/man1/$f.1*
|
rm -rf %{buildroot}%{_mandir}/man1/$f.1*
|
||||||
done
|
done
|
||||||
|
|
||||||
|
# Fix python interpreter
|
||||||
|
sed -i '1s|^#!/usr/bin/env python$|#!%{__python2}|' %{buildroot}%{_bindir}/*.py
|
||||||
|
|
||||||
|
# Cleanup .pyc for now
|
||||||
|
rm -f %{buildroot}%{_bindir}/*.pyc
|
||||||
|
|
||||||
#TODO: What's that?
|
#TODO: What's that?
|
||||||
rm -f %{buildroot}%{_mandir}/man1/*_%{name}-%{version}-fedora_apps_*
|
rm -f %{buildroot}%{_mandir}/man1/*_%{name}-%{version}-fedora_apps_*
|
||||||
rm -f %{buildroot}%{_mandir}/man1/_home_rouault_dist_wrk_gdal_apps_.1*
|
rm -f %{buildroot}%{_mandir}/man1/_home_rouault_dist_wrk_gdal_apps_.1*
|
||||||
@ -741,6 +729,7 @@ popd
|
|||||||
|
|
||||||
|
|
||||||
%files
|
%files
|
||||||
|
%{compdir}/
|
||||||
%{_bindir}/gdallocationinfo
|
%{_bindir}/gdallocationinfo
|
||||||
%{_bindir}/gdal_contour
|
%{_bindir}/gdal_contour
|
||||||
%{_bindir}/gdal_rasterize
|
%{_bindir}/gdal_rasterize
|
||||||
@ -845,6 +834,10 @@ popd
|
|||||||
#Or as before, using ldconfig
|
#Or as before, using ldconfig
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Aug 12 2016 Orion Poplawski <orion@cora.nwra.com> - 2.1.1-1
|
||||||
|
- Update to 2.1.1
|
||||||
|
- Add patch to fix bash-completion installation and install it (bug #1337143)
|
||||||
|
|
||||||
* Tue Jul 19 2016 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.1.0-8
|
* Tue Jul 19 2016 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.1.0-8
|
||||||
- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages
|
- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user