[packages/openconnect] fix build without java

atler atler at pld-linux.org
Wed Jun 16 20:11:57 CEST 2021


commit 86acfad5963756507f2610c9ec45eaa30ab01192
Author: Jan Palus <atler at pld-linux.org>
Date:   Wed Jun 16 18:11:34 2021 +0000

    fix build without java

 openconnect.spec | 4 ++++
 1 file changed, 4 insertions(+)
---
diff --git a/openconnect.spec b/openconnect.spec
index 5ffcc72..7011cb0 100644
--- a/openconnect.spec
+++ b/openconnect.spec
@@ -143,10 +143,12 @@ rm -rf $RPM_BUILD_ROOT
 # obsoleted by pkg-config
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/libopenconnect.la
 # JNI module
+%if %{with java}
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/libopenconnect-wrapper.la
 %if %{with static_libs}
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/libopenconnect-wrapper.a
 %endif
+%endif
 
 # uses non-Linux /system/bin/sh
 %{__rm} $RPM_BUILD_ROOT%{_libexecdir}/openconnect/hipreport-android.sh
@@ -189,11 +191,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libopenconnect.a
 %endif
 
+%if %{with java}
 %files -n java-openconnect
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libopenconnect-wrapper.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libopenconnect-wrapper.so.0
 %attr(755,root,root) %{_libdir}/libopenconnect-wrapper.so
+%endif
 
 %files -n bash-completion-openconnect
 %defattr(644,root,root,755)
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/openconnect.git/commitdiff/86acfad5963756507f2610c9ec45eaa30ab01192



More information about the pld-cvs-commit mailing list