commit 24ddbe28a5aae3e1fd24d5e43b3fa30ee2cacfcd
Author: Jan Palus <[email protected]>
Date: Fri Jul 7 19:32:52 2023 +0200
switch to %use_default_jdk
qdbm.spec | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
---
diff --git a/qdbm.spec b/qdbm.spec
index 73631c9..2104499 100644
--- a/qdbm.spec
+++ b/qdbm.spec
@@ -11,6 +11,8 @@
%ifnarch i586 i686 pentium3 pentium4 athlon %{x8664}
%undefine with_java
%endif
+
+%{?with_java:%{?use_default_jdk}}
#
#
Summary: Quick Database Manager
@@ -28,12 +30,13 @@ Patch2: %{name}-ruby1.9.patch
URL: https://dbmx.net/qdbm/
BuildRequires: autoconf
BuildRequires: automake
-%{?with_java:BuildRequires: jdk}
+%{?with_java:%buildrequires_jdk}
BuildRequires: libstdc++-devel
BuildRequires: libtool >= 2:1.5
%if %{with perl}
BuildRequires: perl-devel >= 1:5.8.0
BuildRequires: rpm-perlprov >= 4.1-13
+BuildRequires: rpmbuild(macros) >= 2.021
%endif
%{?with_ruby:BuildRequires: ruby-devel}
%{?with_ruby:BuildConflicts: qdbm-devel}
@@ -223,6 +226,7 @@ cd java
%{__aclocal}
%{__autoconf}
%{__automake}
+export JAVA_HOME="%{java_home}"
%configure \
--disable-static
%{__make} -j1
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/qdbm.git/commitdiff/24ddbe28a5aae3e1fd24d5e43b3fa30ee2cacfcd
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
