[eclipse-subclipse] Update to 1.8.21.

[Krzysztof Daniel]

commit 11b246922056690ac9d48573c6cfb618ef9251e9
Author: Krzysztof Daniel <kdaniel at redhat.com>
Date:   Wed Jun 19 13:49:44 2013 +0200

    Update to 1.8.21.

 .gitignore                                  |    2 ++
 eclipse-subclipse-1.8.13-dependencies.patch |    2 +-
 eclipse-subclipse.spec                      |   14 ++++++++++----
 sources                                     |    2 +-
 subclipse-fetch.sh                          |    7 ++++++-
 5 files changed, 20 insertions(+), 7 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 08c8c0e..71e0522 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,5 @@ subclipse-1.8.5.tar.xz
 /subclipse-*
 subclipse-1.8.13.tar.xz
 /.project
+/adapter-1.8.21
+/adapter-1.8.22
diff --git a/eclipse-subclipse-1.8.13-dependencies.patch b/eclipse-subclipse-1.8.13-dependencies.patch
index 2bfd046..5f72a07 100644
--- a/eclipse-subclipse-1.8.13-dependencies.patch
+++ b/eclipse-subclipse-1.8.13-dependencies.patch
@@ -45,7 +45,7 @@ index ed6b62e..65be0be 100644
 @@ -7,6 +7,8 @@ Bundle-Activator: org.tigris.subversion.clientadapter.javahl.Activator
  Bundle-Vendor: tigris.org
  Require-Bundle: org.eclipse.core.runtime,
-  org.tigris.subversion.clientadapter;bundle-version="[1.8.4,1.9.0)"
+  org.tigris.subversion.clientadapter;bundle-version="[1.8.5,1.9.0)"
 +Bundle-ClassPath: clientadapter-javahl.jar,
 + svn-javahl.jar
  Eclipse-LazyStart: true
diff --git a/eclipse-subclipse.spec b/eclipse-subclipse.spec
index f06d993..442cf87 100644
--- a/eclipse-subclipse.spec
+++ b/eclipse-subclipse.spec
@@ -1,13 +1,13 @@
 %global eclipse_name       eclipse
 %global eclipse_base       %{_libdir}/%{eclipse_name}
 %global install_loc        %{_datadir}/eclipse/dropins
-%global javahl_plugin_name org.tigris.subversion.clientadapter.javahl_1.7.9.1
+%global javahl_plugin_name org.tigris.subversion.clientadapter.javahl_1.7.9.2
 
 # Add a comment to have something to commit to try to reproduce Adam
 # Williamson's deadlock bug.
 
 Name:           eclipse-subclipse
-Version:        1.8.20
+Version:        1.8.21
 Release:        1%{?dist}
 Summary:        Subversion Eclipse plugin
 
@@ -61,12 +61,15 @@ sed -i 's/\r//' org.tigris.subversion.subclipse.graph/icons/readme.txt
 
 %build
 eclipse-pdebuild -f org.tigris.subversion.clientadapter.feature 
-eclipse-pdebuild -f org.tigris.subversion.clientadapter.javahl.feature 
+
+eclipse-pdebuild -f org.tigris.subversion.clientadapter.javahl.feature
+ 
 # Do not build svnkit as our svnkit package is outdated
 #%{eclipse_base}/buildscripts/pdebuild -a "-DjavacSource=1.5 -DjavacTarget=1.5"     \
 #  -f org.tigris.subversion.clientadapter.svnkit.feature \
 #  -d svnkit
-eclipse-pdebuild -f org.tigris.subversion.subclipse  
+eclipse-pdebuild -f org.tigris.subversion.subclipse
+  
 eclipse-pdebuild -f org.tigris.subversion.subclipse.graph.feature -d gef
 
 
@@ -107,6 +110,9 @@ popd
 
 
 %changelog
+* Wed Jun 19 2013 Krzysztof Daniel <kdaniel at redhat.com> 1.8.21-1
+- Update to 1.8.21.
+
 * Fri May 3 2013 Krzysztof Daniel <kdaniel at redhat.com> 1.8.20-1
 - Update to latest upstream release.
 
diff --git a/sources b/sources
index bcdd6e6..421e7d8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5f68ef052039475bb89725fb738289ed  subclipse-1.8.20.tar.xz
+205e04f0e67add6ed80000b497ebfdaf  subclipse-1.8.21.tar.xz
diff --git a/subclipse-fetch.sh b/subclipse-fetch.sh
index 0158627..d2d952d 100755
--- a/subclipse-fetch.sh
+++ b/subclipse-fetch.sh
@@ -1,5 +1,10 @@
 #!/bin/sh
-VERSION=1.8.20
+VERSION=1.8.21
 svn export --username guest --password "" http://subclipse.tigris.org/svn/subclipse/tags/subclipse/$VERSION/subclipse subclipse-$VERSION
+
+#those sources are missing from the plugin, so copy them back!
+svn export --username guest --password "" http://subclipse.tigris.org/svn/subclipse/tags/subclipse/$VERSION/svnClientAdapter/src/main adapter-$VERSION/
+cp -r adapter-$VERSION/* subclipse-$VERSION/org.tigris.subversion.clientadapter/src
+
 rm -rf ./subclipse-$VERSION/org.tigris.subversion.clientadapter.javahl.win*
 tar -caf subclipse-$VERSION.tar.xz subclipse-$VERSION