[eclipse-jgit/f17: 2/3] - Tweak .spec so as to avoid modifying to much of the .spec file - Fix upstream 1.3 release sources.

[jerboaa]

commit 29e6e7a34f1ced0c38f09651582d15612a368fd0
Author: Severin Gehwolf <sgehwolf at redhat.com>
Date:   Thu Apr 26 15:34:57 2012 -0400

    - Tweak .spec so as to avoid modifying to much of the .spec file
    - Fix upstream 1.3 release sources.

 .gitignore        |    1 +
 eclipse-jgit.spec |   23 ++++++++++++++---------
 sources           |    2 +-
 3 files changed, 16 insertions(+), 10 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5af8bc7..94c2c75 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ jgit*.bz2
 jgit-v1.1.0.201109151100-r.tar.bz2
 jgit-a069e90fa9ab0262df471797e9b77505a3396f23.tar.bz2
 jgit-f54e760232cd8a9552bb7723ed1f8fdc391b4cd2.tar.bz2
+jgit-1.3.0.201202151440-r.tar.bz2
diff --git a/eclipse-jgit.spec b/eclipse-jgit.spec
index 5968790..9c432a5 100644
--- a/eclipse-jgit.spec
+++ b/eclipse-jgit.spec
@@ -1,16 +1,17 @@
 %global eclipse_base   %{_libdir}/eclipse
 %global install_loc    %{_datadir}/eclipse/dropins/jgit
+%global version_suffix 201202151440-r
 
 Name:           eclipse-jgit
 Version:        1.3.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Eclipse JGit
 
 Group:          Development/Tools
 License:        BSD
 URL:            http://www.eclipse.org/egit/
-# Fetched from http://egit.eclipse.org/w/?p=jgit.git;a=snapshot;h=f54e760232cd8a9552bb7723ed1f8fdc391b4cd2;sf=tbz2
-Source0:        jgit-f54e760232cd8a9552bb7723ed1f8fdc391b4cd2.tar.bz2
+# Fetched from http://git.eclipse.org/c/cbi/jgit.git/snapshot/jgit-1.3.0.201202151440-r.tar.bz2
+Source0:        jgit-%{version}.%{version_suffix}.tar.bz2
 Patch0:         fix_jgit_sh.patch
 
 BuildArch: noarch
@@ -52,7 +53,7 @@ Requires:       jpackage-utils
 Command line Git tool built entirely in Java.
 
 %prep
-%setup -n jgit -q
+%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
@@ -73,11 +74,11 @@ install -d -m 755 %{buildroot}%{install_loc}
      build/rpmBuild/org.eclipse.jgit.zip 
 # JARs
 install -d -m 0755 %{buildroot}%{_javadir}/jgit
-install -m 644 org.eclipse.jgit/target/org.eclipse.jgit-1.3.0-SNAPSHOT.jar   %{buildroot}%{_javadir}/jgit/jgit.jar
-install -m 644 org.eclipse.jgit.ui/target/org.eclipse.jgit.ui-1.3.0-SNAPSHOT.jar   %{buildroot}%{_javadir}/jgit/ui.jar
-install -m 644 org.eclipse.jgit.console/target/org.eclipse.jgit.console-1.3.0-SNAPSHOT.jar   %{buildroot}%{_javadir}/jgit/console.jar
-install -m 644 org.eclipse.jgit.iplog/target/org.eclipse.jgit.iplog-1.3.0-SNAPSHOT.jar   %{buildroot}%{_javadir}/jgit/iplog.jar
-install -m 644 org.eclipse.jgit.pgm/target/org.eclipse.jgit.pgm-1.3.0-SNAPSHOT.jar   %{buildroot}%{_javadir}/jgit/pgm.jar
+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
@@ -123,6 +124,10 @@ install -m 755 org.eclipse.jgit.pgm/jgit.sh %{buildroot}%{_bindir}/jgit
 %doc README
 
 %changelog
+* Thu Apr 26 2012 Severin Gehwolf <sgehwolf at redhat.com> 1.3.0-2
+- Tweak .spec so as to avoid modifying to much of the .spec file
+- Fix upstream 1.3 release sources.
+
 * Fri Feb 17 2012 Andrew Robinson <arobinso at redhat.com> 1.3.0-1
 - Update to 1.3.0 upstream release.
 
diff --git a/sources b/sources
index 3d4b2a8..678d166 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-65fed423e5260fbfb62a5d0028f30f88  jgit-f54e760232cd8a9552bb7723ed1f8fdc391b4cd2.tar.bz2
+52bfa84c0e21f95ba788519a8a2ba9f2  jgit-1.3.0.201202151440-r.tar.bz2