Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package eclipse-jgit for openSUSE:Factory checked in at 2023-10-06 21:14:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/eclipse-jgit (Old) and /work/SRC/openSUSE:Factory/.eclipse-jgit.new.28202 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "eclipse-jgit" Fri Oct 6 21:14:25 2023 rev:13 rq:1116023 version:5.11.0 Changes: -------- --- /work/SRC/openSUSE:Factory/eclipse-jgit/eclipse-jgit.changes 2023-06-01 17:19:35.366184943 +0200 +++ /work/SRC/openSUSE:Factory/.eclipse-jgit.new.28202/eclipse-jgit.changes 2023-10-06 21:17:15.977974557 +0200 @@ -1,0 +2,7 @@ +Fri Oct 6 11:04:41 UTC 2023 - Fridrich Strba <fst...@suse.com> + +- Removed patch: + * 0001-Ensure-the-correct-classpath-is-set-for-the-jgit-com.patch + + no need to patch the jgit.sh launcher that we do not use + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/eclipse-jgit/jgit.changes 2023-06-01 17:19:35.422185275 +0200 +++ /work/SRC/openSUSE:Factory/.eclipse-jgit.new.28202/jgit.changes 2023-10-06 21:17:15.997975279 +0200 @@ -1,0 +2,14 @@ +Fri Oct 6 11:04:41 UTC 2023 - Fridrich Strba <fst...@suse.com> + +- Removed patch: + * 0001-Ensure-the-correct-classpath-is-set-for-the-jgit-com.patch + + no need to patch the jgit.sh launcher that we do not use + +------------------------------------------------------------------- +Fri Oct 6 11:00:40 UTC 2023 - Fridrich Strba <fst...@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 + +------------------------------------------------------------------- Old: ---- 0001-Ensure-the-correct-classpath-is-set-for-the-jgit-com.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ eclipse-jgit.spec ++++++ --- /var/tmp/diff_new_pack.ryM2lW/_old 2023-10-06 21:17:18.938081500 +0200 +++ /var/tmp/diff_new_pack.ryM2lW/_new 2023-10-06 21:17:18.954082078 +0200 @@ -27,7 +27,6 @@ URL: https://www.eclipse.org/egit/ Source0: https://git.eclipse.org/c/jgit/jgit.git/snapshot/jgit-%{gittag}.tar.xz # Set the correct classpath for the command line tools -Patch0: 0001-Ensure-the-correct-classpath-is-set-for-the-jgit-com.patch # Switch to feature requirements for third-party bundles, also makes the following changes: # javaewah -> com.googlecode.javaewah.JavaEWAH # org.slf4j.api -> slf4j.api @@ -91,7 +90,6 @@ %prep %setup -q -n jgit-%{gittag} -%patch0 -p1 %patch1 -p1 %patch2 -p1 %patch3 -p1 ++++++ jgit.spec ++++++ --- /var/tmp/diff_new_pack.ryM2lW/_old 2023-10-06 21:17:19.334095807 +0200 +++ /var/tmp/diff_new_pack.ryM2lW/_new 2023-10-06 21:17:19.346096240 +0200 @@ -27,7 +27,6 @@ # Use github mirror for now, see: https://bugs.eclipse.org/bugs/show_bug.cgi?id=522144 Source0: https://git.eclipse.org/c/jgit/jgit.git/snapshot/jgit-%{gittag}.tar.xz # Set the correct classpath for the command line tools -Patch0: 0001-Ensure-the-correct-classpath-is-set-for-the-jgit-com.patch # Switch to feature requirements for third-party bundles, also makes the following changes: # javaewah -> com.googlecode.javaewah.JavaEWAH # org.slf4j.api -> slf4j.api @@ -69,8 +68,20 @@ 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 @@ -88,7 +99,6 @@ %prep %setup -q -n jgit-%{gittag} -%patch0 -p1 %patch1 -p1 %patch2 -p1 %patch3 -p1 @@ -150,8 +160,7 @@ %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
