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

Mat Booth mbooth at fedoraproject.org
Tue Jul 22 13:09:14 UTC 2014


commit 3fc9772eea5e6f89f2558916ab4c0aa2e6de2ac9
Author: Mat Booth <mat.booth at redhat.com>
Date:   Sat Jul 19 17:10:48 2014 +0100

    SCL-ise

 eclipse-remote.spec |   26 ++++++++++++++++++--------
 1 files changed, 18 insertions(+), 8 deletions(-)
---
diff --git a/eclipse-remote.spec b/eclipse-remote.spec
index 26ee5a7..07f0b16 100644
--- a/eclipse-remote.spec
+++ b/eclipse-remote.spec
@@ -1,9 +1,12 @@
+%{?scl:%scl_package eclipse-remote}
+%{!?scl:%global pkg_name %{name}}
+
 %global eclipse_dropin %{_datadir}/eclipse/dropins
 %global git_tag R1_0
 
-Name:           eclipse-remote
+Name:           %{?scl_prefix}eclipse-remote
 Version:        1.0.0
-Release:        1%{?dist}
+Release:        1.1%{?dist}
 Summary:        Eclipse Remote Services plug-in
 License:        EPL
 URL:            https://www.eclipse.org/ptp/
@@ -13,15 +16,15 @@ Source0:        http://git.eclipse.org/c/ptp/org.eclipse.remote.git/snapshot/org
 BuildArch:      noarch
 
 BuildRequires:    maven-local
-BuildRequires:    tycho
-BuildRequires:    tycho-extras
-BuildRequires:    feclipse-maven-plugin
+BuildRequires:    %{?scl_prefix}tycho
+BuildRequires:    %{?scl_prefix}tycho-extras
+BuildRequires:    %{?scl_prefix}feclipse-maven-plugin
 BuildRequires:    jsch
-BuildRequires:    eclipse-pde >= 1:4.3.2
-BuildRequires:    eclipse-license
+BuildRequires:    %{?scl_prefix}eclipse-pde >= 1:4.3.2
+BuildRequires:    %{?scl_prefix}eclipse-license
 
 Requires:         jsch
-Requires:         eclipse-platform >= 1:4.3.2
+Requires:         %{?scl_prefix}eclipse-platform >= 1:4.3.2
 
 %description
 Remote Services provides an extensible remote services framework.
@@ -33,19 +36,26 @@ find -name *.jar -exec rm -rf {} \;
 find -name *.class -exec rm -rf {} \;
 
 %build
+%{?scl:scl enable %{scl} - << "EOF"}
 xmvn -o clean verify -f releng/org.eclipse.remote.build/pom.xml
+%{?scl:EOF}
 
 %install
+%{?scl:scl enable %{scl} - << "EOF"}
 xmvn -o org.fedoraproject:feclipse-maven-plugin:install \
   -Dfeatures=org.eclipse.remote \
   -DsourceRepo=releng/org.eclipse.remote.repo/target/repository \
   -DtargetLocation=%{buildroot}%{eclipse_dropin}/remote/eclipse
+%{?scl:EOF}
 
 %files
 %doc features/org.eclipse.remote-feature/*.html
 %{eclipse_dropin}/remote
 
 %changelog
+* Sat Jul 19 2014 Mat Booth <mat.booth at redhat.com> - 1.0.0-1.1
+- SCL-ise
+
 * Fri Jun 27 2014 Mat Booth <mat.booth at redhat.com> - 1.0.0-1
 - Update to upstream released version
 - Add BR on eclipse-license


More information about the scm-commits mailing list