[eclipse-jgit] Update to 3.3.0.

[Alexander Kurtakov]

commit fda449b946aa0d92647d04620aa2229811fb7360
Author: Alexander Kurtakov <akurtako at redhat.com>
Date:   Tue Mar 11 09:57:10 2014 +0200

    Update to 3.3.0.

 eclipse-jgit.spec  |   11 +++++++----
 fix_category.patch |   40 +++++++++-------------------------------
 sources            |    2 +-
 3 files changed, 17 insertions(+), 36 deletions(-)
---
diff --git a/eclipse-jgit.spec b/eclipse-jgit.spec
index f821863..3837846 100644
--- a/eclipse-jgit.spec
+++ b/eclipse-jgit.spec
@@ -1,12 +1,12 @@
 %global install_loc    %{_datadir}/eclipse/dropins/jgit
-%global version_suffix 201312181205-r
+%global version_suffix 201403021825-r
 
 %{?scl:%scl_package eclipse-jgit}
 %{!?scl:%global pkg_name %{name}}
 
 
 Name:           %{?scl_prefix}eclipse-jgit
-Version:        3.2.0
+Version:        3.3.0
 Release:        1%{?dist}
 Summary:        Eclipse JGit
 
@@ -78,12 +78,11 @@ Command line Git tool built entirely in Java.
 %patch2 -b .sav
 
 #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
 
 #don't try to get it from local *maven* repo, use tycho resolved one
 %pom_remove_dep com.googlecode.javaewah:JavaEWAH
+%pom_remove_dep org.eclipse.jgit:org.eclipse.jgit.junit.http org.eclipse.jgit.packaging/org.eclipse.jgit.repository
 
 #those bundles don't compile with latest jetty
 %pom_disable_module org.eclipse.jgit.http.test
@@ -96,6 +95,7 @@ sed -i -e "s/javaewah/com.googlecode.javaewah.JavaEWAH/g" org.eclipse.jgit.packa
 %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
+%pom_disable_module org.eclipse.jgit.http.apache.feature org.eclipse.jgit.packaging
 
 sed -i -e 's/\, multiValued = true//' org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Status.java
 
@@ -175,6 +175,9 @@ install -m 755 org.eclipse.jgit.pgm/jgit.sh %{buildroot}%{_bindir}/jgit
 %doc README.md
 
 %changelog
+* Tue Mar 11 2014 Alexander Kurtakov <akurtako at redhat.com> 3.3.0-1
+- Update to 3.3.0.
+
 * Sun Dec 29 2013 Alexander Kurtakov <akurtako at redhat.com> 3.2.0-1
 - Update to 3.2.0.
 
diff --git a/fix_category.patch b/fix_category.patch
index eba87f0..9928e25 100644
--- a/fix_category.patch
+++ b/fix_category.patch
@@ -1,6 +1,6 @@
---- 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 @@
+--- org.eclipse.jgit.packaging/org.eclipse.jgit.repository/category.xml.sav	2014-03-03 01:26:54.000000000 +0200
++++ org.eclipse.jgit.packaging/org.eclipse.jgit.repository/category.xml	2014-03-10 17:45:40.762278933 +0200
+@@ -6,24 +6,12 @@
     <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>
@@ -19,31 +19,9 @@
     <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>
---- org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml.orig	2013-12-18 19:05:20.000000000 +0200
-+++ org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml	2013-12-29 16:37:45.939666155 +0200
-@@ -69,25 +69,5 @@
- 	  <artifactId>org.eclipse.jgit.java7</artifactId>
- 	  <version>${project.version}</version>
- 	</dependency>
--    <dependency>
--      <groupId>org.eclipse.jgit</groupId>
--      <artifactId>org.eclipse.jgit.pgm</artifactId>
--      <version>${project.version}</version>
--    </dependency>
--    <dependency>
--      <groupId>org.eclipse.jgit</groupId>
--      <artifactId>org.eclipse.jgit.junit</artifactId>
--      <version>${project.version}</version>
--    </dependency>
--    <dependency>
--      <groupId>org.eclipse.jgit</groupId>
--      <artifactId>org.eclipse.jgit.junit.http</artifactId>
--      <version>${project.version}</version>
--    </dependency>
--    <dependency>
--      <groupId>org.eclipse.jgit</groupId>
--      <artifactId>org.eclipse.jgit.http.server</artifactId>
--      <version>${project.version}</version>
--    </dependency>
-   </dependencies>
- </project>
+-   <feature url="features/org.eclipse.jgit.http.apache_0.0.0.qualifier.jar" id="org.eclipse.jgit.http.apache" version="0.0.0" patch="true">
+-      <category name="JGit"/>
+-   </feature>
+    <category-def name="JGit" label="JGit">
+       <description>
+          JGit
diff --git a/sources b/sources
index f2430ac..d59c284 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3d8650bf64e9999c0ba8c2e5c37dd9b2  jgit-3.2.0.201312181205-r.tar.bz2
+82bd5df30949b81f9f5b1502c432eacc  jgit-3.3.0.201403021825-r.tar.bz2