From 8e8361bcc932207b31863eefad23e4b7c36e67ac Mon Sep 17 00:00:00 2001
From: Mat Booth <mat.booth@redhat.com>
Date: Nov 29 2015 14:57:41 +0000
Subject: Fix a problem with command line "jgit daemon" invocation


- This should also fix rhbz#1228138

---

diff --git a/eclipse-jgit-args4j-final-fields.patch b/eclipse-jgit-args4j-final-fields.patch
new file mode 100644
index 0000000..46ea63b
--- /dev/null
+++ b/eclipse-jgit-args4j-final-fields.patch
@@ -0,0 +1,37 @@
+--- ./org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Daemon.java.orig	2015-11-29 14:35:18.361976569 +0000
++++ ./org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Daemon.java	2015-11-29 14:35:32.350797701 +0000
+@@ -76,22 +76,22 @@
+ 	int timeout = -1;
+ 
+ 	@Option(name = "--enable", metaVar = "metaVar_service", usage = "usage_enableTheServiceInAllRepositories")
+-	final List<String> enable = new ArrayList<String>();
++	List<String> enable = new ArrayList<String>();
+ 
+ 	@Option(name = "--disable", metaVar = "metaVar_service", usage = "usage_disableTheServiceInAllRepositories")
+-	final List<String> disable = new ArrayList<String>();
++	List<String> disable = new ArrayList<String>();
+ 
+ 	@Option(name = "--allow-override", metaVar = "metaVar_service", usage = "usage_configureTheServiceInDaemonServicename")
+-	final List<String> canOverride = new ArrayList<String>();
++	List<String> canOverride = new ArrayList<String>();
+ 
+ 	@Option(name = "--forbid-override", metaVar = "metaVar_service", usage = "usage_configureTheServiceInDaemonServicename")
+-	final List<String> forbidOverride = new ArrayList<String>();
++	List<String> forbidOverride = new ArrayList<String>();
+ 
+ 	@Option(name = "--export-all", usage = "usage_exportWithoutGitDaemonExportOk")
+ 	boolean exportAll;
+ 
+ 	@Argument(required = true, metaVar = "metaVar_directory", usage = "usage_directoriesToExport")
+-	final List<File> directory = new ArrayList<File>();
++	List<File> directory = new ArrayList<File>();
+ 
+ 	@Override
+ 	protected boolean requiresRepository() {
+@@ -159,4 +159,4 @@
+ 			throw die(MessageFormat.format(CLIText.get().serviceNotSupported, n));
+ 		return svc;
+ 	}
+-}
+\ No newline at end of file
++}
diff --git a/eclipse-jgit.spec b/eclipse-jgit.spec
index a966409..6b0b0de 100644
--- a/eclipse-jgit.spec
+++ b/eclipse-jgit.spec
@@ -2,7 +2,7 @@
 
 Name:           eclipse-jgit
 Version:        4.1.0
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Eclipse JGit
 
 License:        BSD
@@ -10,6 +10,7 @@ URL:            http://www.eclipse.org/egit/
 Source0:        http://git.eclipse.org/c/jgit/jgit.git/snapshot/jgit-%{version}.%{version_suffix}.tar.xz
 Patch0:         fix_jgit_sh.patch
 Patch1:         eclipse-jgit-413163.patch
+Patch2:         eclipse-jgit-args4j-final-fields.patch
 
 BuildArch: noarch
 
@@ -22,7 +23,7 @@ BuildRequires:  apache-commons-compress
 BuildRequires:  xz-java >= 1.1-2
 BuildRequires:  javaewah
 BuildRequires:  jacoco-maven-plugin
-BuildRequires:  slf4j-log4j12
+BuildRequires:  slf4j
 Requires:       eclipse-filesystem
 Requires:       jgit = %{version}-%{release}
 
@@ -46,6 +47,7 @@ Command line Git tool built entirely in Java.
 
 %patch0
 %patch1 -p1
+%patch2 -p0
 
 #javaewah change
 sed -i -e "s/javaewah/com.googlecode.javaewah.JavaEWAH/g" org.eclipse.jgit.packaging/org.eclipse.jgit{,.pgm}.feature/feature.xml
@@ -138,6 +140,10 @@ install -m 755 org.eclipse.jgit.pgm/jgit.sh %{buildroot}%{_bindir}/jgit
 %doc LICENSE README.md
 
 %changelog
+* Sun Nov 29 2015 Mat Booth <mat.booth@redhat.com> - 4.1.0-6
+- Fix a problem with command line "jgit daemon" invocation
+- This should also fix rhbz#1228138
+
 * Mon Nov 16 2015 Alexander Kurtakov <akurtako@redhat.com> 4.1.0-5
 - Rebuild for latest slf4j.
 
diff --git a/fix_jgit_sh.patch b/fix_jgit_sh.patch
index 8ccf895..1757244 100644
--- a/fix_jgit_sh.patch
+++ b/fix_jgit_sh.patch
@@ -5,7 +5,7 @@
  [ $? -gt 0 -a -f "$0" ] && this_script="$0"
  cp=$this_script
 -
-+export JGIT_CLASSPATH="/usr/share/java/jgit/*:/usr/share/java/args4j.jar:/usr/share/java/jsch.jar:/usr/share/java/commons-compress.jar:/usr/share/java/xz-java.jar:/usr/share/java/javaewah/JavaEWAH.jar"
++export JGIT_CLASSPATH="$(build-classpath jgit slf4j/api slf4j/simple args4j jsch commons-compress xz-java javaewah)"
  platform="`uname`"
  if [ -n "$JGIT_CLASSPATH" ]
  then