OBS-URL: https://build.opensuse.org/package/show/Java:packages/eclipse-jgit?expand=0&rev=45

jgit.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Oct  6 11:00:40 UTC 2023 - Fridrich Strba <fstrba@suse.com>
+
+- 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 <fstrba@suse.com>
 

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,
+# All the jars that need to be on the classpath for the script to work
-# But the jgit script needs that jar on classpath
+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}
+%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}
-install -m 755 org.eclipse.jgit.pgm/jgit.sh %{buildroot}%{_bindir}/jgit
 
 # Ant task configuration
 install -dm 755 %{buildroot}%{_sysconfdir}/ant.d