Fridrich Strba 2023-10-06 11:08:56 +00:00 committed by Git OBS Bridge
parent 3e6e1f4ba4
commit 31a18ee0d4
5 changed files with 14 additions and 30 deletions

View File

@ -1,26 +0,0 @@
From 55bae4b1398715c987537b0957c08c8616ea8b61 Mon Sep 17 00:00:00 2001
From: Mat Booth <mat.booth@redhat.com>
Date: Fri, 7 Dec 2018 10:04:44 +0000
Subject: [PATCH 1/2] Ensure the correct classpath is set for the jgit command
line tool
---
org.eclipse.jgit.pgm/jgit.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/org.eclipse.jgit.pgm/jgit.sh b/org.eclipse.jgit.pgm/jgit.sh
index a369220..2dd26aa 100644
--- a/org.eclipse.jgit.pgm/jgit.sh
+++ b/org.eclipse.jgit.pgm/jgit.sh
@@ -60,7 +60,7 @@ esac
this_script=`which "$0" 2>/dev/null`
[ $? -gt 0 -a -f "$0" ] && this_script="$0"
cp=$this_script
-
+export JGIT_CLASSPATH="$(build-classpath jgit slf4j/api slf4j/simple args4j jzlib jsch commons-compress xz-java javaewah httpcomponents/httpcore httpcomponents/httpclient commons-logging commons-codec eddsa apache-sshd/sshd-osgi apache-sshd/sshd-sftp)"
platform="`uname`"
if [ -n "$JGIT_CLASSPATH" ]
then
--
2.28.0

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Fri Oct 6 11:04:41 UTC 2023 - Fridrich Strba <fstrba@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
-------------------------------------------------------------------
Wed May 31 19:51:51 UTC 2023 - Fridrich Strba <fstrba@suse.com>

View File

@ -27,7 +27,6 @@ Group: Development/Libraries/Java
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 @@ A pure Java implementation of the Git version control system.
%prep
%setup -q -n jgit-%{gittag}
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1

View File

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

View File

@ -27,7 +27,6 @@ URL: https://www.eclipse.org/egit/
# 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
@ -100,7 +99,6 @@ Group: Documentation/HTML
%prep
%setup -q -n jgit-%{gittag}
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1