[eclipse-subclipse/f15: 1/2] Update to 1.6.18.

[Alexander Kurtakov]

commit f96abc49848ebf051d62bb368a2745c68f728f79
Author: Alexander Kurtakov <akurtako at redhat.com>
Date:   Tue Jul 12 11:58:49 2011 +0300

    Update to 1.6.18.

 .gitignore                                 |    1 +
 eclipse-subclipse-1.6.0-dependencies.patch |    2 +-
 eclipse-subclipse.spec                     |   12 ++++++------
 sources                                    |    2 +-
 subclipse-fetch.sh                         |    2 +-
 5 files changed, 10 insertions(+), 9 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 700e9e9..d8cce77 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@ subclipse-1.6.12.tgz
 subclipse-1.6.15.tar.xz
 subclipse-1.6.16.tar.xz
 /subclipse-1.6.17.tar.xz
+subclipse-1.6.18.tar.xz
diff --git a/eclipse-subclipse-1.6.0-dependencies.patch b/eclipse-subclipse-1.6.0-dependencies.patch
index b9d0004..68c320c 100644
--- a/eclipse-subclipse-1.6.0-dependencies.patch
+++ b/eclipse-subclipse-1.6.0-dependencies.patch
@@ -41,7 +41,7 @@ diff -Naur subclipse-1.6.4original/org.tigris.subversion.clientadapter.javahl.fe
 --- subclipse-1.6.4original/org.tigris.subversion.clientadapter.javahl/META-INF/MANIFEST.MF.orig	2010-10-11 17:29:58.000000000 +0300
 +++ subclipse-1.6.4original/org.tigris.subversion.clientadapter.javahl/META-INF/MANIFEST.MF	2010-11-09 11:02:01.622059432 +0200
 @@ -5,6 +5,8 @@ Bundle-SymbolicName: org.tigris.subversi
- Bundle-Version: 1.6.15
+ Bundle-Version: 1.6.17
  Bundle-Activator: org.tigris.subversion.clientadapter.javahl.Activator
  Bundle-Vendor: tigris.org
 +Bundle-ClassPath: clientadapter-javahl.jar,
diff --git a/eclipse-subclipse.spec b/eclipse-subclipse.spec
index 35fcd34..9367739 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.6.15
+%global javahl_plugin_name org.tigris.subversion.clientadapter.javahl_1.6.17
 
 # Add a comment to have something to commit to try to reproduce Adam
 # Williamson's deadlock bug.
 
 Name:           eclipse-subclipse
-Version:        1.6.17
+Version:        1.6.18
 Release:        1%{?dist}
 Summary:        Subversion Eclipse plugin
 
@@ -51,7 +51,7 @@ Subversion Revision Graph for Subclipse.
 
 %prep
 %setup -q -n subclipse-%{version}
-%patch0 -p1
+%patch0 -p1 -b .sav
 
 # remove javahl sources
 rm -rf org.tigris.subversion.clientadapter.javahl/src/org/tigris/subversion/javahl
@@ -99,18 +99,18 @@ rm $installBase/subclipse-clientadapter-javahl/eclipse/plugins/%{javahl_plugin_n
 ln -s %{_javadir}/svn-javahl.jar $installBase/subclipse-clientadapter-javahl/eclipse/plugins/%{javahl_plugin_name}
 
 %files
-%defattr(-,root,root)
 %{install_loc}/subclipse
 %{install_loc}/subclipse-clientadapter*
 %doc org.tigris.subversion.subclipse.graph/icons/readme.txt
 
-
 %files graph
-%defattr(-,root,root)
 %{install_loc}/subclipse-graph
 
 
 %changelog
+* Tue Jul 12 2011 Alexander Kurtakov <akurtako at redhat.com> 1.6.18-1
+- Update to 1.6.18.
+
 * Fri Feb 25 2011 Alexander Kurtakov <akurtako at redhat.com> 1.6.17-1
 - Update to 1.6.17.
 
diff --git a/sources b/sources
index ed84266..6e2a0e8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4cb69d797e468c9ad3c3a8fc99d209dc  subclipse-1.6.17.tar.xz
+d66e87cf5a12cc6f9c2146b7181e5dea  subclipse-1.6.18.tar.xz
diff --git a/subclipse-fetch.sh b/subclipse-fetch.sh
index 2fa5722..d0c6dff 100644
--- a/subclipse-fetch.sh
+++ b/subclipse-fetch.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-VERSION=1.6.17
+VERSION=1.6.18
 svn export --username guest --password "" http://subclipse.tigris.org/svn/subclipse/tags/subclipse/$VERSION/subclipse subclipse-$VERSION
 rm -rf ./subclipse-$VERSION/org.tigris.subversion.clientadapter.javahl.win32
 tar -caf subclipse-$VERSION.tar.xz subclipse-$VERSION