[eclipse-jgit] Update to 3.2.0.

[Alexander Kurtakov]

commit 6193697d292487748b7f0fcb49bd5d2b8a57644b
Author: Alexander Kurtakov <akurtako at redhat.com>
Date:   Sun Dec 29 15:53:20 2013 +0200

    Update to 3.2.0.

 eclipse-jgit.spec  |   24 +++++++++++-------------
 fix_category.patch |   21 +++++++++++++++++++++
 sources            |    2 +-
 3 files changed, 33 insertions(+), 14 deletions(-)
---
diff --git a/eclipse-jgit.spec b/eclipse-jgit.spec
index d4e1975..5ff8606 100644
--- a/eclipse-jgit.spec
+++ b/eclipse-jgit.spec
@@ -1,12 +1,12 @@
 %global install_loc    %{_datadir}/eclipse/dropins/jgit
-%global version_suffix 201310021548-r
+%global version_suffix 201312181205-r
 
 %{?scl:%scl_package eclipse-jgit}
 %{!?scl:%global pkg_name %{name}}
 
 
 Name:           %{?scl_prefix}eclipse-jgit
-Version:        3.1.0
+Version:        3.2.0
 Release:        1%{?dist}
 Summary:        Eclipse JGit
 
@@ -16,12 +16,13 @@ URL:            http://www.eclipse.org/egit/
 Source0:        http://git.eclipse.org/c/jgit/jgit.git/snapshot/jgit-%{version}.%{version_suffix}.tar.bz2
 Patch0:         fix_jgit_sh.patch
 Patch1:			eclipse-jgit-413163.patch
+Patch2:         fix_category.patch
 
 BuildArch: noarch
 
 BuildRequires: java-devel
 BuildRequires: %{?scl_prefix}eclipse-pde >= 1:3.5.0
-BuildRequires:  jpackage-utils
+BuildRequires:  javapackages-tools
 BuildRequires:  maven-local
 BuildRequires:  maven-compiler-plugin
 BuildRequires:  maven-install-plugin
@@ -51,7 +52,7 @@ A pure Java implementation of the Git version control system.
 %package -n     %{?scl_prefix}jgit-javadoc
 Summary:        API documentation for %{pkg_name}
 Group:          Documentation
-Requires:       jpackage-utils
+Requires:       javapackages-tools
 
 %description -n %{?scl_prefix}jgit-javadoc
 %{summary}.
@@ -63,7 +64,7 @@ Requires:       args4j >= 2.0.12
 Requires:       java >= 1.6.0
 Requires:       apache-commons-compress
 Requires:       xz-java >= 1.1-2
-Requires:       jpackage-utils
+Requires:       javapackages-tools
 Requires:       javaewah
 
 %description -n %{?scl_prefix}jgit
@@ -74,8 +75,9 @@ Command line Git tool built entirely in Java.
 
 %patch0
 %patch1 -p1
+%patch2
 
-#javaevah change
+#javaewah change
 sed -i -e 's/javaewah/com.googlecode.javaewah/g' org.eclipse.jgit/META-INF/MANIFEST.MF
 find -name *.java -exec sed -i -e "s/javaewah/com.googlecode.javaewah/g" {} \;
 sed -i -e "s/javaewah/com.googlecode.javaewah.JavaEWAH/g" org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml
@@ -92,15 +94,10 @@ sed -i -e "s/javaewah/com.googlecode.javaewah.JavaEWAH/g" org.eclipse.jgit.packa
 %pom_disable_module org.eclipse.jgit.target org.eclipse.jgit.packaging
 %pom_xpath_remove "pom:build/pom:pluginManagement/pom:plugins/pom:plugin/pom:configuration/pom:target" org.eclipse.jgit.packaging/pom.xml
 
-%pom_disable_module org.eclipse.jgit.java7.feature org.eclipse.jgit.packaging
-%pom_disable_module org.eclipse.jgit.source.feature org.eclipse.jgit.packaging
 %pom_disable_module org.eclipse.jgit.junit.feature org.eclipse.jgit.packaging
 %pom_disable_module org.eclipse.jgit.pgm.feature org.eclipse.jgit.packaging
 %pom_disable_module org.eclipse.jgit.pgm.source.feature org.eclipse.jgit.packaging
 
-# remove all features except for jgit
-sed -i -e '9,23d' org.eclipse.jgit.packaging/org.eclipse.jgit.repository/category.xml
-
 sed -i -e 's/\, multiValued = true//' org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Status.java
 
 %build
@@ -111,9 +108,7 @@ mvn-rpmbuild -Dmaven.test.skip=true -f org.eclipse.jgit.packaging/pom.xml verify
 %install
 install -d -m 755 %{buildroot}%{install_loc}
 
-
 mvn-rpmbuild org.fedoraproject:feclipse-maven-plugin:install  \
-               -DskipTychoVersionCheck \
                -DsourceRepo=`pwd`/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/target/repository \
                -DtargetLocation=%{buildroot}%{install_loc}/eclipse
 
@@ -181,6 +176,9 @@ install -m 755 org.eclipse.jgit.pgm/jgit.sh %{buildroot}%{_bindir}/jgit
 %doc README.md
 
 %changelog
+* Sun Dec 29 2013 Alexander Kurtakov <akurtako at redhat.com> 3.2.0-1
+- Update to 3.2.0.
+
 * Thu Oct 3 2013 Krzysztof Daniel <kdaniel at redhat.com> 3.1.0-1
 - Update to Kepler SR1.
 
diff --git a/fix_category.patch b/fix_category.patch
new file mode 100644
index 0000000..c845128
--- /dev/null
+++ b/fix_category.patch
@@ -0,0 +1,21 @@
+--- org.eclipse.jgit.packaging/org.eclipse.jgit.repository/category.xml.sav	2013-12-18 19:05:20.000000000 +0200
++++ org.eclipse.jgit.packaging/org.eclipse.jgit.repository/category.xml	2013-12-29 15:32:39.582590062 +0200
+@@ -6,18 +6,9 @@
+    <feature url="features/org.eclipse.jgit_0.0.0.qualifier.jar" id="org.eclipse.jgit" version="0.0.0" patch="true">
+       <category name="JGit"/>
+    </feature>
+-   <feature url="features/org.eclipse.jgit.pgm_0.0.0.qualifier.jar" id="org.eclipse.jgit.pgm" version="0.0.0" patch="true">
+-      <category name="JGit"/>
+-   </feature>
+    <feature url="features/org.eclipse.jgit.source_0.0.0.qualifier.jar" id="org.eclipse.jgit.source" version="0.0.0" patch="true">
+       <category name="JGit"/>
+    </feature>
+-   <feature url="features/org.eclipse.jgit.pgm.source_0.0.0.qualifier.jar" id="org.eclipse.jgit.pgm.source" version="0.0.0" patch="true">
+-      <category name="JGit"/>
+-   </feature>
+-   <feature url="features/org.eclipse.jgit.junit_0.0.0.qualifier.jar" id="org.eclipse.jgit.junit" version="0.0.0" patch="true">
+-      <category name="JGit"/>
+-   </feature>
+    <feature url="features/org.eclipse.jgit.java7_0.0.0.qualifier.jar" id="org.eclipse.jgit.java7" version="0.0.0" patch="true">
+       <category name="JGit"/>
+    </feature>
diff --git a/sources b/sources
index c432ded..f2430ac 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-878728ab6aa1a92292c8c8f58b57d3b6  jgit-3.1.0.201310021548-r.tar.bz2
+3d8650bf64e9999c0ba8c2e5c37dd9b2  jgit-3.2.0.201312181205-r.tar.bz2