From be7dbb11b003ea607dc498eddda0c290a2b974bc Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Tue, 5 Jul 2022 18:21:07 +0200 Subject: [PATCH] Limit -java subpackage to %%java_arches --- libwebp.spec | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/libwebp.spec b/libwebp.spec index 317dc67..f462405 100644 --- a/libwebp.spec +++ b/libwebp.spec @@ -1,5 +1,11 @@ %global _hardened_build 1 +%ifarch %{java_arches} +%bcond_without java +%else +%bcond_with java +%endif + Name: libwebp Version: 1.2.2 Release: 5%{?dist} @@ -20,12 +26,14 @@ BuildRequires: cmake BuildRequires: freeglut-devel BuildRequires: gcc BuildRequires: giflib-devel -BuildRequires: java-devel -BuildRequires: jpackage-utils BuildRequires: libjpeg-devel BuildRequires: libpng-devel BuildRequires: libtiff-devel +%if %{with java} +BuildRequires: java-devel +BuildRequires: jpackage-utils BuildRequires: swig +%endif BuildRequires: mingw32-filesystem >= 95 BuildRequires: mingw32-gcc @@ -73,6 +81,7 @@ developers can use WebP to compress, archive and distribute digital images more efficiently. +%if %{with java} %package java Summary: Java bindings for libwebp, a library for the WebP format Requires: %{name}%{?_isa} = %{version}-%{release} @@ -81,6 +90,7 @@ Requires: jpackage-utils %description java Java bindings for libwebp. +%endif %package -n mingw32-%{name} @@ -115,6 +125,7 @@ MinGW Windows %{name} library. %mingw_cmake -DWEBP_BUILD_VWEBP=OFF %mingw_make_build +%if %{with java} # SWIG generated Java bindings cp %{SOURCE1} . cd swig @@ -135,6 +146,7 @@ gcc %{__global_ldflags} %{optflags} -shared \ cd java javac com/google/webp/libwebp.java jar cvf ../libwebp.jar com/google/webp/*.class +%endif %install @@ -148,9 +160,11 @@ rm -rf %{buildroot}%{mingw64_mandir} find "%{buildroot}/%{_libdir}" -type f -name "*.la" -delete +%if %{with java} # SWIG generated Java bindings mkdir -p %{buildroot}/%{_libdir}/%{name}-java cp swig/*.jar swig/*.so %{buildroot}/%{_libdir}/%{name}-java/ +%endif %mingw_debug_install_post @@ -187,10 +201,11 @@ cp swig/*.jar swig/*.so %{buildroot}/%{_libdir}/%{name}-java/ %{_bindir}/vwebp %{_mandir}/man*/* - +%if %{with java} %files java %doc libwebp_jni_example.java %{_libdir}/%{name}-java/ +%endif %files -n mingw32-libwebp %license PATENTS COPYING @@ -240,6 +255,9 @@ cp swig/*.jar swig/*.so %{buildroot}/%{_libdir}/%{name}-java/ %changelog +* Tue Jul 05 2022 Sandro Mani - 1.2.2-6 +- Limit -java subpackage to %%java_arches + * Fri Mar 25 2022 Sandro Mani - 1.2.2-5 - Rebuild with mingw-gcc-12