rpms
/
gdal
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix libtool wrappers installed for gdal utilities instead of actual binaries

This commit is contained in:
Sandro Mani 2020-03-03 23:31:20 +01:00
parent d89196fcc8
commit 9e38e2d06d
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gdal.spec
View File

@ -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 <manisandro@gmail.com> - 3.0.4-2
- Fix libtool wrappers installed for gdal utilities instead of actual binaries
* Wed Feb 05 2020 Sandro Mani <manisandro@gmail.com> - 3.0.4-1
- Update to 3.0.4

11
gdal_installapps.patch Normal file
View File

@ -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