[eclipse-subclipse/eclipse-luna] SCL-ise

[Mat Booth]

commit 3bc655db43bd4f6fea306375cc0ac3a4adf2e8ac
Author: Mat Booth <mat.booth at redhat.com>
Date:   Fri Jul 18 16:21:05 2014 +0100

    SCL-ise

 eclipse-subclipse.spec |   22 +++++++++++++++-------
 1 files changed, 15 insertions(+), 7 deletions(-)
---
diff --git a/eclipse-subclipse.spec b/eclipse-subclipse.spec
index 69fa663..377d70c 100644
--- a/eclipse-subclipse.spec
+++ b/eclipse-subclipse.spec
@@ -1,8 +1,11 @@
+%{?scl:%scl_package eclipse-subclipse}
+%{!?scl:%global pkg_name %{name}}
+
 %global install_loc        %{_datadir}/eclipse/dropins
 
-Name:           eclipse-subclipse
+Name:           %{?scl_prefix}eclipse-subclipse
 Version:        1.10.5
-Release:        1%{?dist}
+Release:        1.1%{?dist}
 Summary:        Subversion Eclipse plugin
 
 License:        EPL and CC-BY
@@ -14,9 +17,9 @@ Patch0:         eclipse-subclipse-1.8.13-dependencies.patch
 
 BuildArch:              noarch
 
-BuildRequires:          eclipse-pde >= 4.3.2
-BuildRequires:          eclipse-gef
-Requires:               eclipse-platform >= 4.3.2
+BuildRequires:          %{?scl_prefix}eclipse-pde >= 4.3.2
+BuildRequires:          %{?scl_prefix}eclipse-gef
+Requires:               %{?scl_prefix}eclipse-platform >= 4.3.2
 
 BuildRequires:          subversion-javahl >= 1.8.9
 Requires:               subversion-javahl >= 1.8.9
@@ -28,7 +31,7 @@ IDE.
 %package graph
 Summary:        Subversion Revision Graph
 Requires:       %{name} = %{version}
-Requires:       eclipse-gef
+Requires:       %{?scl_prefix}eclipse-gef
 
 %description graph
 Subversion Revision Graph for Subclipse.
@@ -39,12 +42,13 @@ Subversion Revision Graph for Subclipse.
 
 # remove javahl sources
 rm -rf org.tigris.subversion.clientadapter.javahl/src/org/tigris/subversion/javahl
-ln -s %{_javadir}/svn-javahl.jar org.tigris.subversion.clientadapter.javahl
+ln -s /usr/share/java/svn-javahl.jar org.tigris.subversion.clientadapter.javahl
 
 # fixing wrong-file-end-of-line-encoding warnings
 sed -i 's/\r//' org.tigris.subversion.subclipse.graph/icons/readme.txt
 
 %build
+%{?scl:scl enable %{scl} - << "EOF"}
 eclipse-pdebuild -f org.tigris.subversion.clientadapter.feature 
 
 eclipse-pdebuild -f org.tigris.subversion.clientadapter.javahl.feature
@@ -56,6 +60,7 @@ eclipse-pdebuild -f org.tigris.subversion.subclipse
   
 eclipse-pdebuild -f org.tigris.subversion.subclipse.graph.feature -d gef
 
+%{?scl:EOF}
 
 %install
 install -d -m 755 $RPM_BUILD_ROOT%{install_loc}
@@ -91,6 +96,9 @@ popd
 %{install_loc}/subclipse-graph
 
 %changelog
+* Fri Jul 18 2014 Mat Booth <mat.booth at redhat.com> - 1.10.5-1.1
+- SCL-ise
+
 * Fri Jul 18 2014 Mat Booth <mat.booth at redhat.com> - 1.10.5-1
 - Update to latest upstream release
 - Drop ancient obsoletes on subclipse-book, drop unnecessary BRs