From eadb0de2ef0c6c5450af1f695cad432964dcafe6 Mon Sep 17 00:00:00 2001
From: Roland Grunberg <rgrunber@redhat.com>
Date: Feb 21 2013 18:50:29 +0000
Subject: Update to 2.3.1 release.


---

diff --git a/eclipse-jgit.spec b/eclipse-jgit.spec
index e4283df..4e3c822 100644
--- a/eclipse-jgit.spec
+++ b/eclipse-jgit.spec
@@ -1,9 +1,9 @@
 %global install_loc    %{_datadir}/eclipse/dropins/jgit
-%global version_suffix 201212191850-r
+%global version_suffix 201302201838-r
 
 Name:           eclipse-jgit
-Version:        2.2.0
-Release:        3%{?dist}
+Version:        2.3.1
+Release:        1%{?dist}
 Summary:        Eclipse JGit
 
 Group:          Development/Tools
@@ -58,13 +58,13 @@ Command line Git tool built entirely in Java.
 %prep
 %setup -n jgit-%{version}.%{version_suffix} -q
 sed -i -e "s|\${bundle-manifest}|\${source-bundle-manifest}|g" \
- org.eclipse.jgit/pom.xml org.eclipse.jgit.ui/pom.xml  org.eclipse.jgit.console/pom.xml \
- org.eclipse.jgit.iplog/pom.xml org.eclipse.jgit.iplog/pom.xml org.eclipse.jgit.pgm/pom.xml
+ org.eclipse.jgit/pom.xml org.eclipse.jgit.ui/pom.xml org.eclipse.jgit.console/pom.xml \
+ org.eclipse.jgit.pgm/pom.xml
 
 %patch0
 
 find . -name MANIFEST.MF -exec sed -i -e 's|7.6.0,8.0.0|7.6.0,8.6.0|g' {} \;
-sed -i -e 's|org.kohsuke.args4j|args4j|g' org.eclipse.jgit.packaging/org.eclipse.jgit.orbit.feature/feature.xml
+sed -i -e 's|org.kohsuke.args4j|args4j|g' org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml
 %build
 mkdir -p deps/plugins
 pushd deps/
@@ -77,7 +77,7 @@ popd
 %{_bindir}/eclipse-pdebuild -f org.eclipse.jgit -o `pwd`/deps
 # build JARs
 mvn-rpmbuild -Dtranslate-qualifier=true install \
- -pl "org.eclipse.jgit,org.eclipse.jgit.ui,org.eclipse.jgit.console,org.eclipse.jgit.iplog,org.eclipse.jgit.pgm"
+ -pl "org.eclipse.jgit,org.eclipse.jgit.ui,org.eclipse.jgit.console,org.eclipse.jgit.pgm"
 
 %install
 install -d -m 755 %{buildroot}%{install_loc}
@@ -85,9 +85,7 @@ install -d -m 755 %{buildroot}%{install_loc}
 %{__unzip} -q -d %{buildroot}%{install_loc} \
      build/rpmBuild/org.eclipse.jgit.zip
 pushd %{buildroot}%{install_loc}/eclipse/plugins
-	rm args4j_*.jar
 	rm com.jcraft.jsch_*.jar
-	rm org.apache.commons.compress_*.jar
 	ln -s %{_javadir}/args4j.jar
 	ln -s %{_javadir}/commons-compress.jar
 	ln -s %{_javadir}/xz-java.jar
@@ -98,27 +96,23 @@ install -d -m 0755 %{buildroot}%{_javadir}/jgit
 install -m 644 org.eclipse.jgit/target/org.eclipse.jgit-%{version}.%{version_suffix}.jar   %{buildroot}%{_javadir}/jgit/jgit.jar
 install -m 644 org.eclipse.jgit.ui/target/org.eclipse.jgit.ui-%{version}.%{version_suffix}.jar   %{buildroot}%{_javadir}/jgit/ui.jar
 install -m 644 org.eclipse.jgit.console/target/org.eclipse.jgit.console-%{version}.%{version_suffix}.jar   %{buildroot}%{_javadir}/jgit/console.jar
-install -m 644 org.eclipse.jgit.iplog/target/org.eclipse.jgit.iplog-%{version}.%{version_suffix}.jar   %{buildroot}%{_javadir}/jgit/iplog.jar
 install -m 644 org.eclipse.jgit.pgm/target/org.eclipse.jgit.pgm-%{version}.%{version_suffix}.jar   %{buildroot}%{_javadir}/jgit/pgm.jar
 # Javadocs
 install -d -m 755 %{buildroot}%{_javadocdir}/jgit
 cp -rp org.eclipse.jgit/target/apidocs %{buildroot}%{_javadocdir}/jgit
 cp -rp org.eclipse.jgit.ui/target/apidocs %{buildroot}%{_javadocdir}/jgit
 cp -rp org.eclipse.jgit.console/target/apidocs %{buildroot}%{_javadocdir}/jgit
-cp -rp org.eclipse.jgit.iplog/target/apidocs %{buildroot}%{_javadocdir}/jgit
 # POM Files
 install -d -m 755 %{buildroot}%{_mavenpomdir}
 install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-jgit-parent.pom
 install -pm 644 org.eclipse.jgit/pom.xml %{buildroot}%{_mavenpomdir}/JPP.jgit-jgit.pom
 install -pm 644 org.eclipse.jgit.ui/pom.xml %{buildroot}%{_mavenpomdir}/JPP.jgit-ui.pom
 install -pm 644 org.eclipse.jgit.console/pom.xml %{buildroot}%{_mavenpomdir}/JPP.jgit-console.pom
-install -pm 644 org.eclipse.jgit.iplog/pom.xml %{buildroot}%{_mavenpomdir}/JPP.jgit-iplog.pom
 install -pm 644 org.eclipse.jgit.pgm/pom.xml %{buildroot}%{_mavenpomdir}/JPP.jgit-pgm.pom
 
 %add_maven_depmap JPP.jgit-jgit.pom jgit/jgit.jar
 %add_maven_depmap JPP.jgit-ui.pom jgit/ui.jar
 %add_maven_depmap JPP.jgit-console.pom jgit/console.jar
-%add_maven_depmap JPP.jgit-iplog.pom jgit/iplog.jar
 %add_maven_depmap JPP.jgit-pgm.pom jgit/pgm.jar
 %add_maven_depmap JPP-jgit-parent.pom
 # Binary
@@ -151,6 +145,9 @@ install -m 755 org.eclipse.jgit.pgm/jgit.sh %{buildroot}%{_bindir}/jgit
 %doc README.md
 
 %changelog
+* Thu Feb 21 2013 Roland Grunberg <rgrunber@redhat.com> - 2.3.1-1
+- Update to 2.3.1 release.
+
 * Thu Feb 14 2013 Roland Grunberg <rgrunber@redhat.com> - 2.2.0-3
 - jgit subpackage should own its symlinked dependencies.