diff --git a/gdal-3.0.2-java.patch b/gdal-3.0.2-java.patch new file mode 100644 index 0000000..672e622 --- /dev/null +++ b/gdal-3.0.2-java.patch @@ -0,0 +1,10 @@ +--- gdal/swig/java/java.opt.old 2019-10-29 13:03:54.400836584 +0000 ++++ gdal/swig/java/java.opt 2019-10-29 13:04:17.170046904 +0000 +@@ -7,6 +7,6 @@ + JAVAC=$(JAVA_HOME)/bin/javac + JAVA=$(JAVA_HOME)/bin/java + JAR=$(JAVA_HOME)/bin/jar +-JAVA_INCLUDE=-I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux ++JAVA_INCLUDE=-I/usr/lib/jvm/java/include/ -I/usr/lib/jvm/java/include/linux + + diff --git a/gdal-3.0.2-perl-build.patch b/gdal-3.0.2-perl-build.patch new file mode 100644 index 0000000..9a0b7a6 --- /dev/null +++ b/gdal-3.0.2-perl-build.patch @@ -0,0 +1,9 @@ +--- gdal/swig/perl/GNUmakefile.old 2019-10-29 13:08:12.754223012 +0000 ++++ gdal/swig/perl/GNUmakefile 2019-10-29 13:08:34.518424050 +0000 +@@ -64,3 +64,6 @@ + + .FORCE: + perl parse-for-doxygen.pl > all.pm; doxygen; rm -f all.pm ++ ++.PHONY: generate ++ diff --git a/gdal-3.0.2-zlib.patch b/gdal-3.0.2-zlib.patch new file mode 100644 index 0000000..d12691e --- /dev/null +++ b/gdal-3.0.2-zlib.patch @@ -0,0 +1,11 @@ +--- gdal/frmts/mrf/mrf_band.cpp.old 2019-10-29 13:05:35.413769644 +0000 ++++ gdal/frmts/mrf/mrf_band.cpp 2019-10-29 13:05:48.962894799 +0000 +@@ -49,7 +49,7 @@ + + #include + #include +-#include "zlib.h" ++#include "../zlib/zlib.h" + + CPL_CVSID("$Id$") + diff --git a/gdal.spec b/gdal.spec index 60213a8..02360ac 100644 --- a/gdal.spec +++ b/gdal.spec @@ -46,7 +46,7 @@ Name: gdal Version: 3.0.4 -Release: 5%{?dist}%{?bootstrap:.%{bootstrap}.bootstrap} +Release: 12%{?dist}%{?bootstrap:.%{bootstrap}.bootstrap} Summary: GIS file format library License: MIT URL: http://www.gdal.org @@ -75,6 +75,7 @@ Patch5: gdal_installapps.patch BuildRequires: gcc BuildRequires: gcc-c++ BuildRequires: libtool +BuildRequires: make BuildRequires: automake BuildRequires: autoconf BuildRequires: ant @@ -97,17 +98,15 @@ BuildRequires: ghostscript BuildRequires: hdf-devel BuildRequires: hdf-static BuildRequires: hdf5-devel -# No complete java yet in EL8 %if 0%{?rhel} < 8 BuildRequires: java-devel >= 1:1.6.0 +%else +BuildRequires: java-1.8.0-openjdk-devel %endif BuildRequires: jasper-devel BuildRequires: jpackage-utils -# No complete java yet in EL8 -%if 0%{?rhel} < 8 -# For 'mvn_artifact' and 'mvn_install' +# For 'mvn_artifact' BuildRequires: javapackages-local -%endif BuildRequires: json-c-devel BuildRequires: libgeotiff-devel # No libgta in EL5 @@ -210,8 +209,6 @@ Provides: bundled(degrib) = 2.14 This package contains the GDAL file format library. -# No complete java yet in EL8 -%if 0%{?rhel} < 8 %package java Summary: Java modules for the GDAL file format library Requires: jpackage-utils @@ -228,7 +225,6 @@ BuildArch: noarch %description javadoc This package contains the API documentation for %{name}. -%endif %package perl @@ -351,9 +347,7 @@ autoreconf -ifv --with-hdf4 \ --with-hdf5 \ --with-jasper \ -%if 0%{?rhel} < 8 --with-java \ -%endif --with-jpeg \ --with-libjson-c \ --without-jpeg12 \ @@ -388,15 +382,12 @@ make docs make -C ogr/ogrsf_frmts/s57 all make -C frmts/iso8211 all -# No complete java yet in EL8 -%if 0%{?rhel} < 8 # Make Java module and documentation pushd swig/java make ant maven popd %mvn_artifact swig/java/build/maven/gdal-%version.pom swig/java/build/maven/gdal-%version.jar -%endif # Make Python modules pushd swig/python @@ -461,8 +452,6 @@ rm %buildroot%_mandir/man1/{pct2rgb,rgb2pct}.1 find %{buildroot}%{perl_vendorarch} -name "*.so" -exec chmod 755 '{}' \; find %{buildroot}%{perl_vendorarch} -name "*.pm" -exec chmod 644 '{}' \; -# No complete java yet in EL8 -%if 0%{?rhel} < 8 # install Java plugin %mvn_install -J swig/java/java @@ -477,7 +466,6 @@ chrpath --delete %{buildroot}%{_jnidir}/%{name}/*jni.so* # Install Java API documentation in the designated place mkdir -p %{buildroot}%{_javadocdir}/%{name} cp -pr swig/java/java/org %{buildroot}%{_javadocdir}/%{name} -%endif # Install refmans for docdir in %{docdirs}; do @@ -553,8 +541,6 @@ done rm %{buildroot}%{_datadir}/%{name}/LICENSE.TXT -# No complete java yet in EL8 -%if 0%{?rhel} < 8 %check %if %{run_tests} for i in -I/usr/lib/jvm/java/include{,/linux}; do @@ -564,7 +550,7 @@ done pushd %{name}autotest-%{testversion} # Export test enviroment - export PYTHONPATH=$PYTHONPATH:%{buildroot}%{python_sitearch} + export PYTHONPATH=$PYTHONPATH:%{buildroot}%{python3_sitearch} #TODO: Nötig? export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:%{buildroot}%{_libdir} # export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:%%{buildroot}%%{_libdir}:$java_inc @@ -584,7 +570,6 @@ pushd %{name}autotest-%{testversion} # Run tests but force normal exit in the end ./run_all.py || true popd -%endif #%%{run_tests} @@ -645,15 +630,12 @@ popd %{_libdir}/*.so %{_libdir}/pkgconfig/%{name}.pc -# No complete java yet in EL8 -%if 0%{?rhel} < 8 # Can I even have a separate Java package anymore? %files java -f .mfiles %doc swig/java/apps %{_jnidir}/%{name}/libgdalalljni.so* %files javadoc -f .mfiles-javadoc -%endif %files perl %doc swig/perl/README @@ -709,6 +691,27 @@ popd #Or as before, using ldconfig %changelog +* Mon Jan 01 2024 Sandro Mani - 3.0.4-12 +- Rebuild (armadillo) + +* Wed Jun 01 2022 Sandro Mani - 3.0.4-11 +- Rebuild (armadillo) + +* Mon Oct 04 2021 Sandro Mani - 3.0.4-10 +- Restore java subpackage + +* Thu Sep 23 2021 Sandro Mani - 3.0.4-9 +- Rebuild (ldap) + +* Fri Jun 04 2021 Orion Poplawski - 3.0.4-8 +- Rebuild for poppler 20.11 (EL 8.4) (bz#1962667) + +* Tue May 18 2021 Sandro Mani - 3.0.4-7 +- Rebuild + +* Tue May 18 2021 Sandro Mani +- Rebuild + * Sat May 09 2020 Markus Neteler - 3.0.4-5 * disabled JAVA and LaTeX support for EPEL8, due to (yet) missing dependencies