[eclipse-collabnet-merge/eclipse-luna] SCL-ise

[Mat Booth]

commit 02ed4cc11362bf0bac5458d6d2681fd79f4b4bd2
Author: Mat Booth <mat.booth at redhat.com>
Date:   Fri Jul 18 17:39:13 2014 +0100

    SCL-ise

 eclipse-collabnet-merge.spec |   20 ++++++++++++++------
 1 files changed, 14 insertions(+), 6 deletions(-)
---
diff --git a/eclipse-collabnet-merge.spec b/eclipse-collabnet-merge.spec
index a9fc72a..2bea281 100644
--- a/eclipse-collabnet-merge.spec
+++ b/eclipse-collabnet-merge.spec
@@ -1,8 +1,11 @@
+%{?scl:%scl_package eclipse-collabnet-merge}
+%{!?scl:%global pkg_name %{name}}
+
 %global eclipse_dropin   %{_datadir}/eclipse/dropins
 
-Name:      eclipse-collabnet-merge
+Name:      %{?scl_prefix}eclipse-collabnet-merge
 Version:   4.0.2
-Release:   1%{?dist}
+Release:   1.1%{?dist}
 Summary:   CollabNet Merge Client for Subclipse
 License:   EPL
 URL:       https://desktop-eclipse.open.collab.net/
@@ -15,10 +18,10 @@ Source1:   get-collabnet-merge.sh
 
 BuildArch:     noarch
 
-BuildRequires: eclipse-pde >= 4.3.2
-BuildRequires: eclipse-subclipse >= 1.10.5
-Requires:      eclipse-platform >= 4.3.2
-Requires:      eclipse-subclipse >= 1.10.5
+BuildRequires: %{?scl_prefix}eclipse-pde >= 4.3.2
+BuildRequires: %{?scl_prefix}eclipse-subclipse >= 1.10.5
+Requires:      %{?scl_prefix}eclipse-platform >= 4.3.2
+Requires:      %{?scl_prefix}eclipse-subclipse >= 1.10.5
 
 %description
 The CollabNet Merge Client has been built on top of Eclipse and Subclipse.
@@ -41,9 +44,11 @@ find -name *.class -delete
 find -name *.jar -delete
 
 %build
+%{?scl:scl enable %{scl} - << "EOF"}
 # build collabnet-merge features
 eclipse-pdebuild -f com.collabnet.subversion.merge.feature \
   -d "subclipse subclipse-clientadapter"
+%{?scl:EOF}
 
 %install
 install -d -m 755 %{buildroot}%{eclipse_dropin}
@@ -54,6 +59,9 @@ unzip -q -n -d %{buildroot}%{eclipse_dropin}/collabnet-merge build/rpmBuild/com.
 %doc com.collabnet.subversion.merge.feature/license.html
 
 %changelog
+* Fri Jul 18 2014 Mat Booth <mat.booth at redhat.com> - 4.0.2-1.1
+- SCL-ise
+
 * Fri Jul 18 2014 Mat Booth <mat.booth at redhat.com> - 4.0.2-1
 - Update to latest upstream release
 - Update project URL