Compare commits

...

No commits in common. 'epel9' and 'i9' have entirely different histories.
epel9 ... i9

@ -0,0 +1,2 @@
98aeeb4ced577aa3eb955f9938345ace521abb8a SOURCES/gdal-3.4.3-fedora.tar.xz
75352197abaa00dbc4490abc4bde7f6b61ac12b8 SOURCES/gdalautotest-3.4.3.tar.gz

4
.gitignore vendored

@ -1,2 +1,2 @@
/gdal-3.4.3-fedora.tar.xz SOURCES/gdal-3.4.3-fedora.tar.xz
/gdalautotest-3.4.3.tar.gz SOURCES/gdalautotest-3.4.3.tar.gz

@ -31,7 +31,6 @@
%global spatialite "--with-spatialite" %global spatialite "--with-spatialite"
%endif %endif
%bcond_without java
%bcond_without python3 %bcond_without python3
# No ppc64 build for spatialite in EL6 # No ppc64 build for spatialite in EL6
@ -45,7 +44,7 @@
Name: gdal Name: gdal
Version: 3.4.3 Version: 3.4.3
Release: 3%{?dist} Release: 1%{?dist}
Summary: GIS file format library Summary: GIS file format library
License: MIT License: MIT
URL: http://www.gdal.org URL: http://www.gdal.org
@ -102,8 +101,17 @@ BuildRequires: ghostscript
BuildRequires: hdf-devel BuildRequires: hdf-devel
BuildRequires: hdf-static BuildRequires: hdf-static
BuildRequires: hdf5-devel BuildRequires: hdf5-devel
# No complete java yet in EL8
%if 0%{?rhel} < 8
BuildRequires: java-devel >= 1:1.6.0
%endif
BuildRequires: jasper-devel BuildRequires: jasper-devel
BuildRequires: jpackage-utils BuildRequires: jpackage-utils
# No complete java yet in EL8
%if 0%{?rhel} < 8
# For 'mvn_artifact' and 'mvn_install'
BuildRequires: javapackages-local
%endif
BuildRequires: json-c-devel BuildRequires: json-c-devel
BuildRequires: libgeotiff-devel BuildRequires: libgeotiff-devel
BuildRequires: libgta-devel BuildRequires: libgta-devel
@ -199,12 +207,10 @@ Provides: bundled(degrib) = 2.14
This package contains the GDAL file format library. This package contains the GDAL file format library.
%if %{with java} # No complete java yet in EL8
%if 0%{?rhel} < 8
%package java %package java
Summary: Java modules for the GDAL file format library Summary: Java modules for the GDAL file format library
BuildRequires: java-devel >= 1:1.6.0
# For 'mvn_artifact' and 'mvn_install'
BuildRequires: javapackages-local
Requires: jpackage-utils Requires: jpackage-utils
Requires: %{name}-libs%{?_isa} = %{version}-%{release} Requires: %{name}-libs%{?_isa} = %{version}-%{release}
@ -316,7 +322,7 @@ autoreconf -ifv
--with-hdf4 \ --with-hdf4 \
--with-hdf5 \ --with-hdf5 \
--with-jasper \ --with-jasper \
%if %{with java} %if 0%{?rhel} < 8
--with-java \ --with-java \
%endif %endif
--with-jpeg \ --with-jpeg \
@ -355,7 +361,8 @@ make -C frmts/iso8211 all
make man make man
make docs make docs
%if %{with java} # No complete java yet in EL8
%if 0%{?rhel} < 8
# Make Java module and documentation # Make Java module and documentation
pushd swig/java pushd swig/java
@ -411,7 +418,8 @@ rm %buildroot%_mandir/man1/{pct2rgb,rgb2pct}.1
find %{buildroot}%{perl_vendorarch} -name "*.so" -exec chmod 755 '{}' \; find %{buildroot}%{perl_vendorarch} -name "*.so" -exec chmod 755 '{}' \;
find %{buildroot}%{perl_vendorarch} -name "*.pm" -exec chmod 644 '{}' \; find %{buildroot}%{perl_vendorarch} -name "*.pm" -exec chmod 644 '{}' \;
%if %{with java} # No complete java yet in EL8
%if 0%{?rhel} < 8
# install Java plugin # install Java plugin
%mvn_install -J swig/java/java %mvn_install -J swig/java/java
@ -487,7 +495,8 @@ done
rm %{buildroot}%{_datadir}/%{name}/LICENSE.TXT rm %{buildroot}%{_datadir}/%{name}/LICENSE.TXT
%if %{with java} # No complete java yet in EL8
%if 0%{?rhel} < 8
%check %check
%if %{run_tests} %if %{run_tests}
for i in -I/usr/lib/jvm/java/include{,/linux}; do for i in -I/usr/lib/jvm/java/include{,/linux}; do
@ -581,7 +590,8 @@ popd
%{_libdir}/*.so %{_libdir}/*.so
%{_libdir}/pkgconfig/%{name}.pc %{_libdir}/pkgconfig/%{name}.pc
%if %{with java} # No complete java yet in EL8
%if 0%{?rhel} < 8
# Can I even have a separate Java package anymore? # Can I even have a separate Java package anymore?
%files java -f .mfiles %files java -f .mfiles
%doc swig/java/apps %doc swig/java/apps
@ -625,11 +635,8 @@ popd
#Or as before, using ldconfig #Or as before, using ldconfig
%changelog %changelog
* Tue Sep 24 2024 Orion Poplawski <orion@nwra.com> - 3.4.3-3 * Wed Sep 20 2023 Arkady L. Shane <tigro@msvsphere-os.ru> - 3.4.3-1
- Re-enable java - Rebuilt for MSVSphere 9.2
* Mon Jan 01 2024 Sandro Mani <manisandro@gmail.com> - 3.4.3-2
- Rebuild (armadillo)
* Sun Jul 16 2023 Orion Poplawski <orion@nwra.com> - 3.4.3-1 * Sun Jul 16 2023 Orion Poplawski <orion@nwra.com> - 3.4.3-1
- Update to 3.4.3 - Update to 3.4.3

@ -1,2 +0,0 @@
SHA512 (gdal-3.4.3-fedora.tar.xz) = dc71756be69a98c255ba1f7fded5826848babc2137b2d06dd2919bfa051b4417c8737d3c97f499ba6a7d84bdf6ce2d12e1dd874907399ab6dab29a2d89198f06
SHA512 (gdalautotest-3.4.3.tar.gz) = 49f97eafbd223f2d6df433ec2936ca781301b3a7edd4ed597e1186139841ace4df2ff221edd46466afbd5d4e3541040bcc92fa779c7f06419472bc9d424a2c80
Loading…
Cancel
Save