commit afeccb92b8d7c76348880d047e0b3fecd407857a
Author: Jan Palus <[email protected]>
Date: Fri Jul 7 11:10:39 2023 +0200
switch to %use_default_jdk
openwsman.spec | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/openwsman.spec b/openwsman.spec
index a4af09b..fe8b1ff 100644
--- a/openwsman.spec
+++ b/openwsman.spec
@@ -16,6 +16,9 @@
%undefine with_python2
%undefine with_python3
%endif
+
+%{?with_java:%{?use_default_jdk}}
+
Summary: Implementation of the Web Services Management specification
(WS-Management)
Summary(pl.UTF-8): Implementacja specyfikacji Web Services Management
(WS-Management)
Name: openwsman
@@ -36,7 +39,7 @@ BuildRequires: curl-devel >= 7.12.0
BuildRequires: glibc-localedb-all
%endif
%endif
-BuildRequires: jdk
+%{?with_java:%{?use_jdk:%buildrequires_jdk}%{!?use_jdk:BuildRequires: jdk}}
BuildRequires: libstdc++-devel
BuildRequires: libxml2-devel >= 2.0
BuildRequires: openssl-devel
@@ -45,7 +48,7 @@ BuildRequires: pam-devel
BuildRequires: pkgconfig
%{?with_python2:BuildRequires: python-devel >= 2}
%{?with_python3:BuildRequires: python3-devel >= 1:3.2}
-BuildRequires: rpmbuild(macros) >= 1.606
+BuildRequires: rpmbuild(macros) >= 2.021
%{?with_ruby:BuildRequires: ruby-devel >= 1.9}
%{?with_cim:BuildRequires: sblim-sfcc-devel}
BuildRequires: sed >= 4.0
@@ -177,6 +180,7 @@ install -d build
cd build
%cmake .. \
%if %{with java}
+ -DJAVA_HOME:PATH="%{java_home}" \
-DJAVA_INCLUDE_PATH=%{java_home}/include \
%else
-DBUILD_JAVA=OFF \
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/openwsman.git/commitdiff/7915c74e88f1560ab8bd1902b7597715bc572238
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
