X-Git-Url: http://git.pld-linux.org/?p=packages%2Fgdal.git;a=blobdiff_plain;f=gdal.spec;h=de3e09e82b75cfa9e6773c041cfa1840e1b18788;hp=8795888e9aea826890f4b3206755ba4706e753ba;hb=HEAD;hpb=a7c55bf47bd129641ef1ed34909032998a1e95e6

diff --git a/gdal.spec b/gdal.spec
index 8795888..b60a35f 100644
--- a/gdal.spec
+++ b/gdal.spec
@@ -46,11 +46,14 @@
 %if %{with podofo}
 %undefine	with_poppler
 %endif
+
+%{?use_default_jdk}
+
 Summary:	Geospatial Data Abstraction Library
 Summary(pl.UTF-8):	Biblioteka abstrakcji danych dotyczących powierzchni Ziemi
 Name:		gdal
 Version:	3.0.4
-Release:	1
+Release:	21
 License:	BSD-like
 Group:		Libraries
 Source0:	https://github.com/OSGeo/gdal/releases/download/v%{version}/%{name}-%{version}.tar.gz
@@ -61,7 +64,11 @@ Patch2:		%{name}-dds.patch
 Patch3:		%{name}-rasdaman.patch
 Patch4:		%{name}-pluginsdir.patch
 Patch5:		libx32.patch
+Patch6:		%{name}-poppler.patch
 Patch7:		decl.patch
+Patch8:		%{name}_tirpcinc.patch
+Patch9:		jasper.patch
+Patch10:	gcc11.patch
 URL:		http://www.gdal.org/
 # 1.x or 2.x supported
 BuildRequires:	CharLS-devel
@@ -85,7 +92,7 @@ BuildRequires:	giflib-devel >= 4.0
 BuildRequires:	hdf-devel >= 4.2.5
 BuildRequires:	hdf5-devel
 BuildRequires:	jasper-devel
-%{?with_java:BuildRequires:	jdk}
+%{?with_java:%buildrequires_jdk}
 %{?with_java:BuildRequires:	jpackage-utils}
 BuildRequires:	json-c-devel >= 0.11
 %{?with_kea:BuildRequires:	kealib-devel}
@@ -127,7 +134,7 @@ BuildRequires:	python-setuptools
 BuildRequires:	qhull-devel >= 2012
 %{?with_rasdaman:BuildRequires:	rasdaman-devel}
 BuildRequires:	rpm-pythonprov
-BuildRequires:	rpmbuild(macros) >= 1.344
+BuildRequires:	rpmbuild(macros) >= 2.021
 BuildRequires:	sed >= 4.0
 BuildRequires:	sqlite3-devel >= 3.0.0
 BuildRequires:	swig-perl
@@ -140,6 +147,7 @@ BuildRequires:	xz-devel
 BuildRequires:	zlib-devel >= 1.1.4
 # for ZSTD compression in TIFF
 BuildRequires:	zstd-devel
+%{?with_java:Requires:	 %{?use_jdk:%{use_jdk}-jre-base}%{!?use_jdk:jre}}
 Requires:	freexl >= 1.0
 Requires:	geos >= 3.1.0
 Requires:	hdf >= 4.2.5
@@ -272,7 +280,11 @@ Moduł Pythona GDAL.
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 %patch7 -p1
+%patch8 -p1
+%patch9 -p2
+%patch10 -p2
 
 # need to regenerate (old ones don't support perl 5.10)
 %{__rm} swig/perl/{gdal_wrap.cpp,gdalconst_wrap.c,ogr_wrap.cpp,osr_wrap.cpp}
@@ -314,6 +326,9 @@ sed -E -i -e '1s,#!\s*/usr/bin/env\s+python2(\s|$),#!%{__python}\1,' \
       swig/python/scripts/rgb2pct.py
 
 %build
+cp -f /usr/share/gettext/config.rpath .
+
+%if %{with java}
 %ifarch %{x8664}
 jvm_arch=amd64
 %endif
@@ -323,6 +338,21 @@ jvm_arch=i386
 %ifarch x32
 jvm_arch=x32
 %endif
+%ifarch aarch64
+jvm_arch=aarch64
+%endif
+%ifarch %{arm}
+jvm_arch=aarch32
+%endif
+for jvm_type in server client; do
+	for dir in lib jre/lib/$jvm_arch; do
+		if [ -f "%{java_home}/$dir/$jvm_type/libjvm.so" ]; then
+			jvm_lib="%{java_home}/$dir/$jvm_type"
+			break
+		fi
+	done
+done
+%endif
 
 %{__libtoolize}
 %{__aclocal} -I m4
@@ -341,7 +371,7 @@ jvm_arch=x32
 	%{?with_java:--with-java=%{java_home}} \
 	--with-liblzma \
 	%{!?with_kea:--without-kea} \
-	%{?with_java:--with-mdb --with-jvm-lib-add-rpath --with-jvm-lib=%{java_home}/jre/lib/$jvm_arch/server} \
+	%{?with_java:--with-mdb --with-jvm-lib-add-rpath --with-jvm-lib="$jvm_lib"} \
 	%{?with_mysql:--with-mysql} \
 	%{?with_oci:--with-oci --with-oci-include=/usr/include/oracle/client --with-oci-lib=%{_libdir}} \
 	%{?with_opencl:--with-opencl} \