24.0.5

.abf.yml

@@ -1,2 +1,3 @@
 sources:
+  OpenJDK17U-jdk_x64_linux_hotspot_17.0.11_9.tar.gz: 3590daf5672a23a2644485271d63a7be2e9b1679
   dbeaver-24.0.5.tar.gz: 9de7682cbafd771d65b6c908b66acd0ae5bb218a

dbeaver.spec

@@ -1,6 +1,8 @@
 %define		debug           %nil
 %define		debug_package	%nil
-#define		_JAVA8		/usr/lib/jvm/java-1.8.0/
+%define		_jdk_path	/opt/jdk17/jdk/bin
+%define     jdk_ver 17.0.11
+%define     liberica_rel 13
 
 Name:		dbeaver
 Version:	24.0.5
@@ -8,16 +10,20 @@ Release:	1
 Summary:	Universal database manager and SQL client
 URL:		https://dbeaver.io
 Source0:	https://github.com/dbeaver/dbeaver/archive/%{version}/%{name}-%{version}.tar.gz
+#Source1:    https://github.com/bell-sw/Liberica/releases/download/%{jdk_ver}%2B%{liberica_rel}/bellsoft-jdk%{jdk_ver}+%{liberica_rel}-linux-amd64-crac.tar.gz
+Source1:    https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.11%2B9/OpenJDK17U-jdk_x64_linux_hotspot_17.0.11_9.tar.gz
 Source100:	%{name}.rpmlintrc
 Group:		Development/Databases
 License:	ASL 2.0
 ExcludeArch: 	x86 i386 i486 i586 i686
-BuildRequires:	maven >= 3
+BuildRequires:	maven >= 3.9
 #BuildRequires:	java-devel >= 11
-BuildRequires:  jdk17
+#BuildRequires:  jdk17
 BuildRequires:  imagemagick
+BuildRequires:  git-core
 Requires:   jdk17
 
+
 %description
 Free multi-platform database tool for developers, 
 SQL programmers, database administrators and analysts. 
@@ -37,9 +43,16 @@ HSQLDB, Derby, Teradata, Vertica, Netezza, Informix.
 %prep
 %setup -q
 
+tar -xf %{SOURCE1}
+
+
 %build
-export JAVA_HOME=/opt/jdk17/bin
-mvn clean install
+[ ! -d ../dbeaver-common ] && git clone https://github.com/dbeaver/dbeaver-common.git ../dbeaver-common
+
+cd product/aggregate
+JAVA_HOME=../../jdk-17.0.11+9/  mvn clean install -T 1C
+cd ../..
+
 
 %install
 install -d %{buildroot}%{_bindir}
@@ -48,7 +61,7 @@ install -d %{buildroot}%{_datadir}/applications
 install -d %{buildroot}%{_iconsdir}/hicolor/{16x16,24x24,32x32}/apps
 
 #ifarch x86_64
-pushd product/standalone/target/products/org.jkiss.dbeaver.core.product/linux/gtk/x86_64
+pushd product/community/target/products/org.jkiss.dbeaver.core.product/linux/gtk/x86_64/
 cp -a %{name} %{buildroot}%{_datadir}
 popd
 #else
@@ -61,8 +74,7 @@ popd
 cat > %{buildroot}%{_bindir}/%{name} <<EOF
 #!/bin/bash
 
-%{_datadir}/%{name}/%{name} 
-#-vm %{_JAVA8}/bin
+%{_datadir}/%{name}/%{name} -vm %{_jdk_path}/bin
 
 EOF
 
@@ -78,7 +90,7 @@ GenericName=DBeaver
 GenericName[ru]=DBeaver
 Comment=Free universal database manager and SQL client
 Comment[ru]=Универсальный менеджер баз данных SQL
-Exec=%{name}
+Exec=%{name} -vm %{_jdk_path}
 Icon=%{name}
 Terminal=false
 Type=Application