[eclipse-ptp/scl] Add SCL macros

Orion Poplawski orion at fedoraproject.org
Tue Nov 25 22:52:37 UTC 2014 

commit 2c6de3a0b6592602e7be7b8210ec7db7e09dd0cd
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Tue Nov 25 15:52:16 2014 -0700

    Add SCL macros

 eclipse-ptp.spec |   64 ++++++++++++++++++++++++++++++-----------------------
 1 files changed, 36 insertions(+), 28 deletions(-)
---
diff --git a/eclipse-ptp.spec b/eclipse-ptp.spec
index e763758..ac04cff 100644
--- a/eclipse-ptp.spec
+++ b/eclipse-ptp.spec
@@ -1,3 +1,5 @@
+%{?scl:%scl_package eclipse-ptp}
+
 %global eclipse_base            %{_datadir}/eclipse
 %global cdtreq                  1:8.1.0
 %global pdereq                  1:4.2.0
@@ -19,7 +21,7 @@
 %endif
 
 Summary:        Eclipse Parallel Tools Platform
-Name:           eclipse-ptp
+Name:           %{?scl_prefix}eclipse-ptp
 Version:        8.1.0
 Release:        1%{?dist}
 License:        EPL
@@ -46,20 +48,22 @@ BuildRequires:  java-devel >= 1.5.0
 BuildRequires:  maven-local
 # Need tycho-extras for core/org.eclipse.ptp.doc.isv
 BuildRequires:  tycho-extras
-BuildRequires:  eclipse-cdt-parsers >= %{cdtreq}
-BuildRequires:  eclipse-license
-BuildRequires:  eclipse-jgit
-BuildRequires:  eclipse-pde >= %{pdereq}
-BuildRequires:  eclipse-photran-intel
-BuildRequires:  eclipse-photran-xlf
-BuildRequires:  eclipse-rse >= %{rsereq}
-BuildRequires:  eclipse-remote
-BuildRequires:  lpg-java-compat = 1.1.0
-
-Requires:       eclipse-cdt >= %{cdtreq}
-Requires:       eclipse-remote
+BuildRequires:  %{?scl_prefix}eclipse-cdt-parsers >= %{cdtreq}
+%{!?scl:BuildRequires:  eclipse-license}
+BuildRequires:  %{?scl_prefix}eclipse-jgit
+BuildRequires:  %{?scl_prefix}eclipse-pde >= %{pdereq}
+BuildRequires:  %{?scl_prefix}eclipse-photran-intel
+BuildRequires:  %{?scl_prefix}eclipse-photran-xlf
+BuildRequires:  %{?scl_prefix}eclipse-rse >= %{rsereq}
+BuildRequires:  %{?scl_prefix}eclipse-remote
+BuildRequires:  %{?scl_prefix}lpg-java-compat = 1.1.0
+
+Requires:       %{?scl_prefix}eclipse-cdt >= %{cdtreq}
+Requires:       %{?scl_prefix}eclipse-remote
 # Pulled in by rdt.remotetools being in ptp main
 Requires:       %{name}-rdt = %{version}-%{release}
+%{?scl:Requires: %scl_runtime}
+
 Provides:       %{name}-cdt-compilers = %{version}-%{release}
 Obsoletes:      %{name}-cdt-compilers < %{version}-%{release}
 Provides:       %{name}-etfw-ppw = %{version}-%{release}
@@ -98,7 +102,7 @@ This package contains the main PTP run-time features.
 %package        master
 Summary:        Complete PTP package
 Group:          Development/Libraries
-Requires:       eclipse-cdt >= %{cdtreq}
+Requires:       %{?scl_prefix}eclipse-cdt >= %{cdtreq}
 Requires:       %{name} = %{version}-%{release}
 
 #master package is a virtual package that requires all of the components
@@ -116,9 +120,9 @@ Requires:       %{name}-rm-contrib = %{version}-%{release}
 Requires:       %{name}-sci = %{version}-%{release}
 Requires:       %{name}-sdk = %{version}-%{release}
 Requires:       %{name}-sdm = %{version}-%{release}
-Requires:       eclipse-photran
-Requires:       eclipse-photran-intel
-Requires:       eclipse-photran-xlf
+Requires:       %{?scl_prefix}eclipse-photran
+Requires:       %{?scl_prefix}eclipse-photran-intel
+Requires:       %{?scl_prefix}eclipse-photran-xlf
 
 %description    master
 The package will bring in all of the PTP components.
@@ -150,7 +154,7 @@ Summary:        PTP External Tools Framework: TAU Fortran Enabler
 Group:          Development/Libraries
 BuildArch:      noarch
 Requires:       %{name}-etfw-tau = %{version}-%{release}
-Requires:       eclipse-photran
+Requires:       %{?scl_prefix}eclipse-photran
 
 %description    etfw-tau-fortran
 Adds selective instrumentation functionality for Fortran via the
@@ -165,9 +169,9 @@ Requires:       %{name} = %{version}-%{release}
 Requires:       %{name}-etfw-tau-fortran = %{version}-%{release}
 Requires:       %{name}-pldt-fortran = %{version}-%{release}
 Requires:       %{name}-rdt-sync-fortran = %{version}-%{release}
-Requires:       eclipse-photran
-Requires:       eclipse-photran-intel
-Requires:       eclipse-photran-xlf
+Requires:       %{?scl_prefix}eclipse-photran
+Requires:       %{?scl_prefix}eclipse-photran-intel
+Requires:       %{?scl_prefix}eclipse-photran-xlf
 
 %description    fortran
 Adds Fortran support to PTP.
@@ -216,9 +220,9 @@ http://cs.utah.edu/fv/gklee
 Summary:        PTP Parallel Language Development Tools Fortran Support
 Group:          Development/Libraries
 BuildArch:      noarch
-Requires:       eclipse-cdt-parsers >= %{cdtreq}
+Requires:       %{?scl_prefix}eclipse-cdt-parsers >= %{cdtreq}
 Requires:       %{name} = %{version}-%{release}
-Requires:       eclipse-photran
+Requires:       %{?scl_prefix}eclipse-photran
 
 %description    pldt-fortran
 Adds a range of static analysis and programming assistance tools for Fortran.
@@ -228,7 +232,7 @@ Adds a range of static analysis and programming assistance tools for Fortran.
 Summary:        PTP Parallel Language Development Tools UPC Support
 Group:          Development/Libraries
 BuildArch:      noarch
-Requires:       eclipse-cdt-parsers >= %{cdtreq}
+Requires:       %{?scl_prefix}eclipse-cdt-parsers >= %{cdtreq}
 Requires:       %{name} = %{version}-%{release}
 
 %description    pldt-upc
@@ -242,8 +246,8 @@ Summary:        PTP Remote Development Tools
 Group:          Development/Libraries
 BuildArch:      noarch
 Requires:       %{name} = %{version}-%{release}
-Requires:       eclipse-jgit
-Requires:       eclipse-rse >= %{rsereq}
+Requires:       %{?scl_prefix}eclipse-jgit
+Requires:       %{?scl_prefix}eclipse-rse >= %{rsereq}
 
 %description    rdt
 PTP components for supporting Remote Development Tools.
@@ -264,7 +268,7 @@ Summary:        PTP Remote Development Tools XL C/C++ Compiler Support
 Group:          Development/Libraries
 BuildArch:      noarch
 Requires:       %{name}-rdt = %{version}-%{release}
-Requires:       eclipse-cdt-parsers >= %{cdtreq}
+Requires:       %{?scl_prefix}eclipse-cdt-parsers >= %{cdtreq}
 
 %description    rdt-xlc
 Remote support for the IBM XL C/C++ compilers.
@@ -327,6 +331,7 @@ Provides support for remote services using RSE.
 
 %prep
 %setup -q -n org.eclipse.ptp-%{ptp_git_tag}
+%{?scl:sed -i -e '/org.eclipse.license/d' releng/*/feature.xml}
 
 %patch0 -p2 -b .noremote
 %patch1 -p2 -b .tycho-build
@@ -349,6 +354,8 @@ rm -r releng/org.eclipse.ptp.linux/os/linux
 
 
 %build
+%{?scl:scl enable %{scl} - <<"EOF"}
+%{?scl:set -x}
 export JAVA_HOME=%{java_home}
 export PATH=/usr/bin:$PATH
 export MAVEN_OPTS="-XX:CompileCommand=exclude,org/eclipse/tycho/core/osgitools/EquinoxResolver,newState ${MAVEN_OPTS}"
@@ -362,6 +369,7 @@ cp -p debug/org.eclipse.ptp.debug.sdm/bin/sdm releng/org.eclipse.ptp.linux/os/li
 
 # Build the project
 xmvn -o clean verify -DforceContextQualifier=%{ptp_build_id}
+%{?scl:EOF}
 
 
 %install
@@ -395,7 +403,7 @@ done
 cp -u releng/org.eclipse.ptp.repo/target/repository/plugins/*.jar \
    %{buildroot}%{eclipse_base}/dropins/ptp/eclipse/plugins/
 # Remove external plugins
-rm %{buildroot}%{eclipse_base}/dropins/ptp/eclipse/plugins/org.eclipse.{photran,rephraserengine,remote}*
+rm -f %{buildroot}%{eclipse_base}/dropins/ptp/eclipse/plugins/org.eclipse.{photran,rephraserengine,remote}*
 
 # Remove disabled modules from filelist
 sed -i -e '\,plugins/org.eclipse.ptp.remote.remotetools_,d' \

More information about the scm-commits mailing list