[eclipse-jgit] Update to upstream 3.7.0.

[Roland Grunberg]

commit b852dfe86ba93810f5059829cd6648bffbb3e609
Author: Roland Grunberg <rgrunber at redhat.com>
Date:   Mon Mar 2 12:20:39 2015 -0500

    Update to upstream 3.7.0.

 eclipse-jgit.spec | 16 +++++++++++++---
 fix_jgit_sh.patch |  2 +-
 sources           |  2 +-
 3 files changed, 15 insertions(+), 5 deletions(-)
---
diff --git a/eclipse-jgit.spec b/eclipse-jgit.spec
index 95493f4..5fb681b 100644
--- a/eclipse-jgit.spec
+++ b/eclipse-jgit.spec
@@ -1,11 +1,11 @@
-%global version_suffix 201501210735-r
+%global version_suffix 201502260915-r
 
 %{?scl:%scl_package eclipse-jgit}
 %{!?scl:%global pkg_name %{name}}
 
 Name:           %{?scl_prefix}eclipse-jgit
-Version:        3.6.2
-Release:        2%{?dist}
+Version:        3.7.0
+Release:        1%{?dist}
 Summary:        Eclipse JGit
 
 License:        BSD
@@ -25,6 +25,7 @@ BuildRequires:  apache-commons-compress
 BuildRequires:  xz-java >= 1.1-2
 BuildRequires:  javaewah
 BuildRequires:  jacoco-maven-plugin
+BuildRequires:  slf4j-log4j12
 %{?scl:Requires: %scl_runtime}
 Requires:       %{?scl_prefix}eclipse-platform
 Requires:       %{?scl_prefix}jgit = %{version}-%{release}
@@ -89,6 +90,12 @@ sed -i -e 's/0.7.9,0.8.0/0.7.9,0.9.0/g' org.eclipse.jgit.test/META-INF/MANIFEST.
 # Don't attach shell script artifact
 %pom_remove_plugin org.codehaus.mojo:build-helper-maven-plugin org.eclipse.jgit.pgm
 
+# org.slf4j.api -> slf4j.api
+# org.slf4j.impl.log4j12 -> slf4j.log4j12
+sed -i 's/org\.slf4j\.api/slf4j\.api/
+        s/org\.slf4j\.impl\.log4j12/slf4j\.log4j12/' \
+org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml
+
 %build
 # Due to a current limitation of Tycho it is not possible to mix pom-first and
 # manifest-first builds in the same reactor build hence two separate invocations
@@ -131,6 +138,9 @@ install -m 755 org.eclipse.jgit.pgm/jgit.sh %{buildroot}%{_bindir}/jgit
 %doc LICENSE README.md
 
 %changelog
+* Mon Mar 02 2015 Roland Grunberg <rgrunber at redhat.com> - 3.7.0-1
+- Update to upstream 3.7.0.
+
 * Fri Jan 23 2015 Roland Grunberg <rgrunber at redhat.com> - 3.6.2-2
 - Use Equinox's OSGi runtime instead of Felix's.
 
diff --git a/fix_jgit_sh.patch b/fix_jgit_sh.patch
index c519dbe..8ccf895 100644
--- a/fix_jgit_sh.patch
+++ b/fix_jgit_sh.patch
@@ -6,6 +6,6 @@
  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"
+ platform="`uname`"
  if [ -n "$JGIT_CLASSPATH" ]
  then
- 	cp="$cp:$JGIT_CLASSPATH"
diff --git a/sources b/sources
index 8b77a25..3fbf410 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b2d98a51459827cbbc8b39d4854ea917  jgit-3.6.2.201501210735-r.tar.bz2
+580f856e0c6ae63f403d917d05178e08  jgit-3.7.0.201502260915-r.tar.bz2