From 3e6e1f4ba454d537ee24c53fc778c267d1a9c28b4c1f0997766590f7171c0ff0 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Fri, 6 Oct 2023 11:02:17 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/Java:packages/eclipse-jgit?expand=0&rev=45 --- jgit.changes | 7 +++++++ jgit.spec | 19 +++++++++++++++---- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/jgit.changes b/jgit.changes index 8b34927..b2a0e97 100644 --- a/jgit.changes +++ b/jgit.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Oct 6 11:00:40 UTC 2023 - Fridrich Strba + +- Craft the jgit script from the real Main class of the jar file + instead of using some superfluous jar launcher. + Fixes bsc#1209646 + ------------------------------------------------------------------- Wed May 31 19:51:51 UTC 2023 - Fridrich Strba diff --git a/jgit.spec b/jgit.spec index ff0cb7f..33f4377 100644 --- a/jgit.spec +++ b/jgit.spec @@ -69,8 +69,20 @@ BuildRequires: mvn(org.osgi:osgi.core) BuildRequires: mvn(org.slf4j:slf4j-api) BuildRequires: mvn(org.slf4j:slf4j-simple) BuildRequires: mvn(org.tukaani:xz) -# This is only optional dependency of commons-compress, -# But the jgit script needs that jar on classpath +# All the jars that need to be on the classpath for the script to work +Requires: apache-commons-codec +Requires: apache-commons-compress +Requires: apache-commons-logging +Requires: apache-sshd +Requires: args4j +Requires: ed25519-java +Requires: httpcomponents-client +Requires: httpcomponents-core +Requires: javaewah +Requires: javapackages-tools +Requires: jsch +Requires: jzlib +Requires: slf4j Requires: xz-java Obsoletes: %{name}-bootstrap BuildArch: noarch @@ -150,8 +162,7 @@ done %fdupes -s %{buildroot}%{_javadocdir} # Binary -install -dm 755 %{buildroot}%{_bindir} -install -m 755 org.eclipse.jgit.pgm/jgit.sh %{buildroot}%{_bindir}/jgit +%jpackage_script org.eclipse.jgit.pgm.Main "" "" javaewah:jzlib:jsch:jgit/org.eclipse.jgit:slf4j/api:slf4j/simple:args4j:commons-compress:httpcomponents/httpcore:httpcomponents/httpclient:commons-logging:commons-codec:eddsa:apache-sshd/sshd-osgi:apache-sshd/sshd-sftp %{name} # Ant task configuration install -dm 755 %{buildroot}%{_sysconfdir}/ant.d