[eclipse-photran/scl] Add SCL macros

Orion Poplawski orion at fedoraproject.org
Tue Nov 25 21:55:19 UTC 2014


commit f3bbc48c631f7b82a219ee324753a85d582113d1
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Tue Nov 25 14:53:52 2014 -0700

    Add SCL macros

 eclipse-photran.spec |   21 ++++++++++++++-------
 1 files changed, 14 insertions(+), 7 deletions(-)
---
diff --git a/eclipse-photran.spec b/eclipse-photran.spec
index a320fe6..f9ced19 100644
--- a/eclipse-photran.spec
+++ b/eclipse-photran.spec
@@ -1,10 +1,12 @@
+%{?scl:%scl_package eclipse-photran}
+
 %global eclipse_base            %{_datadir}/eclipse
 %global cdtreq                  1:8.1.0
 %global photran_git_tag         PTP_8_1_0
 %global photran_build_id        201409161342
 
 Summary:        Fortran Development Tools (Photran) for Eclipse
-Name:           eclipse-photran
+Name:           %{?scl_prefix}eclipse-photran
 Version:        9.0.0
 Release:        1%{?dist}
 License:        EPL
@@ -16,10 +18,11 @@ Source0:        http://git.eclipse.org/c/ptp/org.eclipse.photran.git/snapshot/or
 
 BuildRequires:  maven-local
 BuildRequires:  tycho
-BuildRequires:  eclipse-cdt >= %{cdtreq}
-BuildRequires:  eclipse-license
+BuildRequires:  %{?scl_prefix}eclipse-cdt >= %{cdtreq}
+%{!?scl:BuildRequires:  eclipse-license}
 BuildArch:      noarch
-Requires:       eclipse-cdt >= %{cdtreq}
+Requires:       %{?scl_prefix}eclipse-cdt >= %{cdtreq}
+%{?scl:Requires: %scl_runtime}
 
 %description
 An Eclipse-based Integrated Development Environment for Fortran.
@@ -28,7 +31,7 @@ An Eclipse-based Integrated Development Environment for Fortran.
 %package intel
 Summary:        Intel Fortran compiler support for Photran
 Group:          Development/Libraries
-Requires:       eclipse-photran = %{version}-%{release}
+Requires:       %{?scl_prefix}eclipse-photran = %{version}-%{release}
 
 %description intel
 This feature packages the plugins required to support
@@ -38,7 +41,7 @@ the Intel Fortran compiler in Photran/FDT.
 %package xlf
 Summary:        IBM XLF Compiler Support
 Group:          Development/Libraries
-Requires:       eclipse-photran = %{version}-%{release}
+Requires:       %{?scl_prefix}eclipse-photran = %{version}-%{release}
 
 %description xlf
 Error parser and managed build tool chain for the IBM XLF compiler.
@@ -46,6 +49,7 @@ Error parser and managed build tool chain for the IBM XLF compiler.
 
 %prep
 %setup -q -n org.eclipse.photran-%{photran_git_tag}
+%{?scl:sed -i -e '/org.eclipse.license/d' */feature.xml}
 
 # We need to rebuild this jar from the sources within it
 pwd
@@ -63,11 +67,13 @@ sed -i -e 's/os="linux"//' org.eclipse.photran.intel-feature/feature.xml
 
 
 %build
+%{?scl:scl enable %{scl} - <<"EOF"}
+%{?scl:set -x}
 export JAVA_HOME=%{java_home}
 export PATH=/usr/bin:$PATH
 # Build the helper jar first
 pushd cdtdb-4.0.3-eclipse
-classpath=$(echo /usr/lib*/eclipse/plugins/org.eclipse.equinox.common_*.jar | sed -e 's/ /:/g')
+classpath=$(echo %{_libdir}/eclipse/plugins/org.eclipse.equinox.common_*.jar | sed -e 's/ /:/g')
 find -name \*java -exec javac -classpath $classpath '{}' +
 jar cf ../org.eclipse.photran.core.vpg/lib/cdtdb-4.0.3-eclipse.jar *
 popd
@@ -75,6 +81,7 @@ popd
 rm -rf cdtdb-4.0.3-eclipse
 # Build the projects
 xmvn -o -DforceContextQualifier=%{photran_build_id} verify
+%{?scl:EOF}
 
 
 %install


More information about the scm-commits mailing list