!38 [sync] PR-14: Fix gdal-config-64 missing
From: @openeuler-sync-bot Reviewed-by: @desert-sailor Signed-off-by: @desert-sailor
This commit is contained in:
commit
06646880dd
20
gdal.spec
20
gdal.spec
@ -1,6 +1,7 @@
|
||||
%global run_tests 1
|
||||
|
||||
%global bashcompletiondir %(pkg-config --variable=compatdir bash-completion)
|
||||
%global cpuarch 64
|
||||
|
||||
%if 0%{?bootstrap}
|
||||
%global with_mysql 0
|
||||
@ -22,13 +23,16 @@
|
||||
|
||||
Name: gdal
|
||||
Version: 3.7.3
|
||||
Release: 1
|
||||
Release: 2
|
||||
Summary: GIS file format library
|
||||
License: MIT
|
||||
URL: http://www.gdal.org
|
||||
Source0: http://download.osgeo.org/gdal/%{version}/gdal-%{version}.tar.xz
|
||||
Source1: http://download.osgeo.org/%{name}/%{version}/%{name}autotest-%{version}.tar.gz
|
||||
Source2: gdal-config
|
||||
# Multilib compatible cpl-config.h header
|
||||
Source2: cpl-config.h
|
||||
# Multilib compatible gdal-config script
|
||||
Source3: gdal-config
|
||||
|
||||
# Add some utils to the default install target
|
||||
Patch0: gdal_utils.patch
|
||||
@ -94,6 +98,7 @@ BuildRequires: python3-numpy
|
||||
BuildRequires: python3-setuptools
|
||||
BuildRequires: python3-pytest >= 3.6
|
||||
BuildRequires: python3-lxml >= 4.5.1
|
||||
BuildRequires: python3-pyproj
|
||||
|
||||
# Java
|
||||
# For 'mvn_artifact' and 'mvn_install'
|
||||
@ -228,7 +233,10 @@ done
|
||||
# Multilib
|
||||
# - cpl_config.h is arch-dependent (contains various SIZEOF defines)
|
||||
# - gdal-config stores arch-specific information
|
||||
cp -a %{SOURCE2} %{buildroot}%{_bindir}/%{name}-config
|
||||
mv %{buildroot}%{_includedir}/%{name}/cpl_config.h %{buildroot}%{_includedir}/%{name}/cpl_config-%{cpuarch}.h
|
||||
cp -a %{SOURCE2} %{buildroot}%{_includedir}/%{name}/cpl_config.h
|
||||
mv %{buildroot}%{_bindir}/%{name}-config %{buildroot}%{_bindir}/%{name}-config-%{cpuarch}
|
||||
cp -a %{SOURCE3} %{buildroot}%{_bindir}/%{name}-config
|
||||
|
||||
|
||||
%if 0%{run_tests}
|
||||
@ -282,7 +290,8 @@ cp -a %{SOURCE2} %{buildroot}%{_bindir}/%{name}-config
|
||||
%{_libdir}/gdalplugins/
|
||||
|
||||
%files devel
|
||||
%{_bindir}/%{name}-config*
|
||||
%{_bindir}/%{name}-config
|
||||
%{_bindir}/%{name}-config-%{cpuarch}
|
||||
%{_includedir}/%{name}/
|
||||
%{_libdir}/lib%{name}.so
|
||||
%{_libdir}/cmake/gdal/
|
||||
@ -326,6 +335,9 @@ cp -a %{SOURCE2} %{buildroot}%{_bindir}/%{name}-config
|
||||
%{_jnidir}/%{name}/gdal-%{version}-javadoc.jar
|
||||
|
||||
%changelog
|
||||
* Fri Nov 15 2024 Dongxing Wang <dongxing.wang_a@thundersoft.com> - 3.7.3-2
|
||||
- Fix gdal-config-64 missing
|
||||
|
||||
* Tue Nov 5 2024 Dongxing Wang <dongxing.wang_a@thundersoft.com> - 3.7.3-1
|
||||
- Update to 3.7.3
|
||||
CheckDependentLibraries.cmake: don't use libjpeg if disabled
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user