mbooth pushed to eclipse-subclipse (master). "Update to latest upstream release"

[notifications at fedoraproject.org]

>From 2ee816c11453494668953ec455b6c54af7f70462 Mon Sep 17 00:00:00 2001
From: Mat Booth <mat.booth at redhat.com>
Date: Sat, 4 Apr 2015 15:57:01 +0100
Subject: Update to latest upstream release


diff --git a/eclipse-subclipse.spec b/eclipse-subclipse.spec
index 693bf97..c7b90ea 100644
--- a/eclipse-subclipse.spec
+++ b/eclipse-subclipse.spec
@@ -1,8 +1,8 @@
 %global install_loc        %{_datadir}/eclipse/dropins
 
 Name:           eclipse-subclipse
-Version:        1.10.5
-Release:        2%{?dist}
+Version:        1.10.9
+Release:        1%{?dist}
 Summary:        Subversion Eclipse plugin
 
 License:        EPL and CC-BY
@@ -18,8 +18,8 @@ BuildRequires:          eclipse-pde >= 4.3.2
 BuildRequires:          eclipse-gef
 Requires:               eclipse-platform >= 4.3.2
 
-BuildRequires:          subversion-javahl >= 1.8.9
-Requires:               subversion-javahl >= 1.8.9
+BuildRequires:          subversion-javahl >= 1.8.11
+Requires:               subversion-javahl >= 1.8.11
 
 %description
 Subclipse is an Eclipse plugin that adds Subversion integration to the Eclipse
@@ -45,7 +45,7 @@ ln -s %{_javadir}/svn-javahl.jar org.tigris.subversion.clientadapter.javahl
 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.feature
 
 eclipse-pdebuild -f org.tigris.subversion.clientadapter.javahl.feature
  
@@ -61,17 +61,15 @@ eclipse-pdebuild -f org.tigris.subversion.subclipse.graph.feature -d gef-core
 install -d -m 755 $RPM_BUILD_ROOT%{install_loc}
 
 # installing features
-install -d -m 755 $RPM_BUILD_ROOT%{install_loc}/subclipse-clientadapter
-unzip -q -d $RPM_BUILD_ROOT%{install_loc}/subclipse-clientadapter build/rpmBuild/org.tigris.subversion.clientadapter.feature.zip
-unzip -q -d $RPM_BUILD_ROOT%{install_loc}/subclipse-clientadapter build/rpmBuild/org.tigris.subversion.clientadapter.javahl.feature.zip
-#unzip -q -d $RPM_BUILD_ROOT%{install_loc}/subclipse-clientadapter build/rpmBuild/org.tigris.subversion.clientadapter.svnkit.feature.zip
 install -d -m 755 $RPM_BUILD_ROOT%{install_loc}/subclipse
+unzip -q -d $RPM_BUILD_ROOT%{install_loc}/subclipse build/rpmBuild/org.tigris.subversion.clientadapter.feature.zip
+unzip -q -d $RPM_BUILD_ROOT%{install_loc}/subclipse build/rpmBuild/org.tigris.subversion.clientadapter.javahl.feature.zip
 unzip -q -d $RPM_BUILD_ROOT%{install_loc}/subclipse build/rpmBuild/org.tigris.subversion.subclipse.zip
 install -d -m 755 $RPM_BUILD_ROOT%{install_loc}/subclipse-graph
 unzip -q -d $RPM_BUILD_ROOT%{install_loc}/subclipse-graph build/rpmBuild/org.tigris.subversion.subclipse.graph.feature.zip
 
 # replacing jar with links to system libraries
-pushd $RPM_BUILD_ROOT%{install_loc}/subclipse-clientadapter/eclipse/plugins/
+pushd $RPM_BUILD_ROOT%{install_loc}/subclipse/eclipse/plugins/
 ADAPTER_JAVAHL=$(ls org.tigris.subversion.clientadapter.javahl_*.jar)
 unzip $ADAPTER_JAVAHL -d ${ADAPTER_JAVAHL%.jar}
 rm $ADAPTER_JAVAHL
@@ -83,7 +81,6 @@ popd
 %files
 %doc org.tigris.subversion.subclipse.feature/license.html
 %{install_loc}/subclipse
-%{install_loc}/subclipse-clientadapter
 
 %files graph
 %doc org.tigris.subversion.subclipse.graph.feature/license.html
@@ -91,6 +88,9 @@ popd
 %{install_loc}/subclipse-graph
 
 %changelog
+* Tue Mar 03 2015 Mat Booth <mat.booth at redhat.com> - 1.10.9-1
+- Update to latest upstream release
+
 * Thu Jan 15 2015 Alexander Kurtakov <akurtako at redhat.com> 1.10.5-2
 - Adapt pde-build.sh call to gef path change.
 
diff --git a/sources b/sources
index 6514497..2a602e6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-724668328027821486f7258c80d151fa  subclipse-1.10.5.tar.xz
+2f55bcd1b7b33198c1f101f2f0595300  subclipse-1.10.9.tar.xz
diff --git a/subclipse-fetch.sh b/subclipse-fetch.sh
index 46f22ce..bba9bd3 100755
--- a/subclipse-fetch.sh
+++ b/subclipse-fetch.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-VERSION=1.10.5
+VERSION=1.10.9
 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!
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/eclipse-subclipse.git/commit/?h=master&id=2ee816c11453494668953ec455b6c54af7f70462