From 9e38e2d06dab74372097deb1d608be6da0bba5c8 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Tue, 3 Mar 2020 23:31:20 +0100 Subject: [PATCH] Fix libtool wrappers installed for gdal utilities instead of actual binaries --- gdal.spec | 7 ++++++- gdal_installapps.patch | 11 +++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 gdal_installapps.patch diff --git a/gdal.spec b/gdal.spec index 0740e58..7e045c8 100644 --- a/gdal.spec +++ b/gdal.spec @@ -46,7 +46,7 @@ Name: gdal Version: 3.0.4 -Release: 1%{?dist}%{?bootstrap:.%{bootstrap}.bootstrap} +Release: 2%{?dist}%{?bootstrap:.%{bootstrap}.bootstrap} Summary: GIS file format library License: MIT URL: http://www.gdal.org @@ -69,6 +69,8 @@ Patch2: %{name}-1.9.0-java.patch Patch3: gdal_tirpcinc.patch # Use libtool to create libiso8211.a, otherwise broken static lib is created since object files are compiled through libtool Patch4: gdal_iso8211.patch +# Fix makefiles installing libtool wrappers instead of actual executables +Patch5: gdal_installapps.patch BuildRequires: gcc BuildRequires: gcc-c++ @@ -684,6 +686,9 @@ popd #Or as before, using ldconfig %changelog +* Tue Mar 03 2020 Sandro Mani - 3.0.4-2 +- Fix libtool wrappers installed for gdal utilities instead of actual binaries + * Wed Feb 05 2020 Sandro Mani - 3.0.4-1 - Update to 3.0.4 diff --git a/gdal_installapps.patch b/gdal_installapps.patch new file mode 100644 index 0000000..6102657 --- /dev/null +++ b/gdal_installapps.patch @@ -0,0 +1,11 @@ +diff -rupN --no-dereference gdal-3.0.4-fedora/apps/GNUmakefile gdal-3.0.4-fedora-new/apps/GNUmakefile +--- gdal-3.0.4-fedora/apps/GNUmakefile 2020-01-28 11:13:12.000000000 +0100 ++++ gdal-3.0.4-fedora-new/apps/GNUmakefile 2020-03-03 23:17:41.032487778 +0100 +@@ -216,6 +216,7 @@ gdal-config-inst: gdal-config.in ../GDAL + + install: default + for f in $(BIN_LIST) ; do $(INSTALL) $$f $(DESTDIR)$(INST_BIN) ; done ++ for f in $(BIN_LIST) ; do $(INSTALL) .libs/$$f $(DESTDIR)$(INST_BIN) ; done + $(INSTALL_DATA) gdal_utils.h $(DESTDIR)$(INST_INCLUDE) + $(INSTALL) gdal-config-inst $(DESTDIR)$(INST_BIN)/gdal-config +