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

[Mat Booth]

commit ee3493f1ccd053d3e223c9c052c3d35d664f19d3
Author: Mat Booth <mat.booth at redhat.com>
Date:   Tue Aug 19 12:17:35 2014 +0100

    SCL-ise

 eclipse-ecf.spec |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)
---
diff --git a/eclipse-ecf.spec b/eclipse-ecf.spec
index 1929d38..f3e957c 100644
--- a/eclipse-ecf.spec
+++ b/eclipse-ecf.spec
@@ -8,7 +8,7 @@
 
 Name:           %{?scl_prefix}eclipse-ecf
 Version:        3.9.0
-Release:        1%{?dist}
+Release:        1.1%{?dist}
 Summary:        Eclipse Communication Framework (ECF) Eclipse plug-in
 
 License:        EPL
@@ -17,7 +17,7 @@ Source0:        http://git.eclipse.org/c/ecf/org.eclipse.ecf.git/snapshot/org.ec
 
 BuildRequires:  java-devel >= 1.7.0 
 BuildRequires:  jpackage-utils
-BuildRequires:  eclipse-pde >= 4.3.0
+BuildRequires:  %{?scl_prefix}eclipse-pde >= 4.3.0
 BuildRequires:  httpcomponents-client
 BuildRequires:  httpcomponents-core
 BuildRequires:  apache-commons-codec
@@ -67,14 +67,17 @@ rm -rf `ls | grep -v "ecf"`
 find . -type f -name "*.jar" -exec rm {} \;
 find . -type f -name "*.class" -exec rm {} \;
 
+%{?scl:scl enable %{scl} - << "EOF"}
 mkdir -p deps
 build-jar-repository -s -p deps \
   httpcomponents/httpclient httpcomponents/httpcore commons-codec commons-logging
+%{?scl:EOF}
 
 # Allow building on java > 1.4
 sed -i -e 's#(Object) ((URIID) o)#((URIID) o)#g' ecf/plugins/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/identity/URIID.java
 
 %build
+%{?scl:scl enable %{scl} - << "EOF"}
 eclipse-pdebuild -f org.eclipse.ecf.core.feature \
   -j "-DforceContextQualifier=%{contextQualifier}" -o `pwd`/deps
 eclipse-pdebuild -f org.eclipse.ecf.core.ssl.feature \
@@ -87,6 +90,7 @@ eclipse-pdebuild -f org.eclipse.ecf.filetransfer.httpclient4.feature \
   -j "-DforceContextQualifier=%{contextQualifier}" -o `pwd`/deps
 eclipse-pdebuild -f org.eclipse.ecf.filetransfer.httpclient4.ssl.feature \
   -j "-DforceContextQualifier=%{contextQualifier}" -o `pwd`/deps
+%{?scl:EOF}
 
 %install
 install -d -m 755 %{buildroot}%{_javadir}/ecf
@@ -119,6 +123,9 @@ popd
 %doc ecf/features/org.eclipse.ecf.core.feature/*.html
 
 %changelog
+* Tue Aug 19 2014 Mat Booth <mat.booth at redhat.com> - 3.9.0-1.1
+- SCL-ise
+
 * Tue Aug 19 2014 Mat Booth <mat.booth at redhat.com> - 3.9.0-1
 - Update to latest upstream release
 - Drop unneeded patch