[packages/mysql-workbench] make some java adjustments

atler atler at pld-linux.org
Sat Dec 28 02:19:53 CET 2024


commit 8052974ac6628d11fdd1d70530c39c1d668d8ee8
Author: Jan Palus <atler at pld-linux.org>
Date:   Sat Dec 28 00:25:20 2024 +0100

    make some java adjustments

 mysql-workbench.spec | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/mysql-workbench.spec b/mysql-workbench.spec
index 5609bfc..90bd35e 100644
--- a/mysql-workbench.spec
+++ b/mysql-workbench.spec
@@ -9,7 +9,8 @@
 %bcond_without	gnome_keyring	# build with gnome-keyring
 
 # has been compiled by Java Runtime with class file version 55.0
-%{?use_default_jdk:%use_default_jdk 11}
+%define		min_jdk_version	11
+%{?use_default_jdk:%use_default_jdk}
 
 Summary:	Extensible modeling tool for MySQL
 Summary(pl.UTF-8):	Narzędzie do modelowania baz danych dla MySQL-a
@@ -66,7 +67,7 @@ BuildRequires:	python3-devel >= 1:3.6
 BuildRequires:	rapidjson-devel
 BuildRequires:	readline-devel
 BuildRequires:	rpm-pythonprov
-BuildRequires:	rpmbuild(macros) >= 1.658
+BuildRequires:	rpmbuild(macros) >= 2.021
 BuildRequires:	sqlite3-devel
 BuildRequires:	swig
 BuildRequires:	swig-python
@@ -139,6 +140,7 @@ cp -p %{SOURCE1} linux-res/bin
 install -d build-dir
 cd build-dir
 %cmake \
+	-DJAVA_HOME:PATH="%{java_home}" \
 	-DUSE_UNIXODBC=ON \
 	-DODBC_LIBRARIES="`%{_bindir}/odbc_config --libs`" \
 	-DODBC_INCLUDE_DIRS=%{_includedir} \
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/mysql-workbench.git/commitdiff/8052974ac6628d11fdd1d70530c39c1d668d8ee8



More information about the pld-cvs-commit mailing list