Limit -java subpackage to %%java_arches

This commit is contained in:
Sandro Mani 2022-07-05 22:26:47 +02:00
parent ad79c6a1f1
commit a929131a14

View File

@ -8,10 +8,16 @@
# This should be investigated.
%global python_mapscript 1
%ifarch %{java_arches}
%bcond_without java
%else
%bcond_with java
%endif
Name: mapserver
Version: 7.6.4
Release: 17%{?dist}
Release: 18%{?dist}
Summary: Environment for building spatially-enabled internet applications
%global dashver %(echo %version | sed 's|\\.|-|g')
@ -124,6 +130,7 @@ The Python/Mapscript extension provides full map customization capabilities
within the Python programming language.
%endif
%if %{with java}
%package java
Summary: Java/Mapscript map making extensions to Java
BuildRequires: java-devel
@ -133,6 +140,7 @@ Requires: java-headless
%description java
The Java/Mapscript extension provides full map customization capabilities
within the Java programming language.
%endif
%package ruby
@ -174,7 +182,11 @@ export CXXFLAGS="%{optflags} -fno-strict-aliasing"
-DWITH_GEOS=TRUE \
-DWITH_GIF=TRUE \
-DWITH_ICONV=TRUE \
%if %{with java}
-DWITH_JAVA=TRUE \
%else
-DWITH_JAVA=FALSE \
%endif
-DWITH_KML=TRUE \
-DWITH_LIBXML2=TRUE \
-DWITH_OGR=TRUE \
@ -219,9 +231,11 @@ mkdir -p %{buildroot}%{_datadir}/%{name}
install -p -m 644 xmlmapfile/mapfile.xsd %{buildroot}%{_datadir}/%{name}
install -p -m 644 xmlmapfile/mapfile.xsl %{buildroot}%{_datadir}/%{name}
%if %{with java}
# install java
mkdir -p %{buildroot}%{_javadir}
install -p -m 644 %{_vpath_builddir}/mapscript/java/mapscript.jar %{buildroot}%{_javadir}/
%endif
%if 0%{php_mapscript}
# install php config file
@ -283,12 +297,14 @@ EOF
%{python3_sitearch}/*mapscript*
%endif
%if %{with java}
%files java
%doc mapscript/java/README
%doc mapscript/java/examples
%doc mapscript/java/tests
%{_javadir}/*.jar
%{_libdir}/libjavamapscript.so
%endif
%files ruby
%doc mapscript/ruby/README
@ -297,6 +313,9 @@ EOF
%changelog
* Tue Jul 05 2022 Sandro Mani <manisandro@gmail.com> - 7.6.4-18
- Limit -java subpackage to %%java_arches
* Mon Jun 13 2022 Python Maint <python-maint@redhat.com> - 7.6.4-17
- Rebuilt for Python 3.11