commit de83a41c0440f04822b07133f139a134b3bea993
Author: Jan Palus <[email protected]>
Date: Fri Feb 3 18:55:36 2023 +0100
enforce openjdk8
pl.spec | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/pl.spec b/pl.spec
index 0ce8e9f..61a81f8 100644
--- a/pl.spec
+++ b/pl.spec
@@ -16,6 +16,8 @@
# No poin in building debug packages without debug info
%define _enable_debug_packages 0
+%define use_jdk openjdk8
+
Summary: SWI Prolog Language
Summary(pl.UTF-8): Język SWI Prolog
Name: pl
@@ -38,7 +40,7 @@ BuildRequires: db-devel
BuildRequires: fontconfig-devel
BuildRequires: freetype-devel
BuildRequires: gmp-devel >= 4.2.0
-%{?with_java:BuildRequires: jdk}
+%{?with_java:%buildrequires_jdk}
BuildRequires: libjpeg-devel
BuildRequires: ncurses-devel
BuildRequires: openssl-devel
@@ -83,7 +85,7 @@ Summary: Dynamic, bidirectional interface between
SWI-Prolog and Java
Summary(pl.UTF-8): Dynamiczny, dwukierunkowy interfejs pomiędzy
SWI-Prologiem a Javą
Group: Development/Languages
Requires: %{name} = %{version}-%{release}
-Requires: jdk
+Requires: jdk >= 8
%description jpl
JPL 3.x is a dynamic, bidirectional interface between SWI-Prolog 5.2.0
@@ -165,6 +167,8 @@ Prolog.
CFLAGS=$(echo %{rpmcflags} | sed 's|-march=[^ ]*||')
export CFLAGS
+%{?with_java:export JAVA_HOME="%{java_home}"}
+
cd src
cp -f /usr/share/automake/config.sub .
%{__aclocal}
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/pl.git/commitdiff/de83a41c0440f04822b07133f139a134b3bea993
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
