[eclipse-ptp/f17] Fix qualifiers to match upstream ptp and photran features/plugins.

Jeff Johnston jjohnstn at fedoraproject.org
Thu Apr 19 20:21:21 UTC 2012


commit bd8e412a0b73d31f28cbe487e2f1696d3d0011d8
Author: Jeff Johnston <jjohnstn at redhat.com>
Date:   Wed Apr 18 18:24:16 2012 -0400

    Fix qualifiers to match upstream ptp and photran features/plugins.

 eclipse-ptp.spec |   14 ++++++++++++--
 1 files changed, 12 insertions(+), 2 deletions(-)
---
diff --git a/eclipse-ptp.spec b/eclipse-ptp.spec
index df41a94..68f18ac 100644
--- a/eclipse-ptp.spec
+++ b/eclipse-ptp.spec
@@ -10,6 +10,8 @@
 %else
 %global pdebuild                %{eclipse_arch_base}/buildscripts/pdebuild
 %endif
+%global ptp_build_id		201203201256
+%global photran_build_id	201203151905
 
 Summary:        Eclipse Parallel Tools Platform
 Name:           eclipse-ptp
@@ -337,12 +339,20 @@ rm -rf cdtdb-4.0.3-eclipse
 # main feature and others.  Use -Dnoclean=true so the aggregate features don't remove
 # needed pre-built dependencies
 # remotejars attempts to run git and fails to build
-for feature in org.eclipse.ptp.{utils,services,remote,remotetools,core} org.eclipse.photran org.eclipse.photran.{intel,xlf} org.eclipse.ptp.rdt{.editor,,.sync,.sync.fortran,.xlc} org.eclipse.ptp.core org.eclipse.ptp.rm.jaxb{,.contrib} org.eclipse.ptp org.eclipse.ptp.{etfw.{ppw,tau,tau.fortran},gem,pldt.{fortran,upc},remote.rse,sci,sdk}
+for feature in org.eclipse.ptp.{utils,services,remote,remotetools,core} org.eclipse.photran org.eclipse.ptp.rdt{.editor,,.sync,.sync.fortran,.xlc} org.eclipse.ptp.core org.eclipse.ptp.rm.jaxb{,.contrib} org.eclipse.ptp org.eclipse.ptp.{etfw.{ppw,tau,tau.fortran},gem,pldt.{fortran,upc},remote.rse,sci,sdk}
 do
   %{pdebuild} -d "cdt cdt-parsers jgit rse" \
-    -f $feature -a "-DjavacSource=1.5 -DjavacTarget=1.5 -Dnoclean=true"
+    -f $feature -a "-DjavacSource=1.6 -DjavacTarget=1.6 \
+    -Dnoclean=true -DforceContextQualifier=%{ptp_build_id}"
 done
 
+# some features use a different timestamp qualifier
+for feature in org.eclipse.photran org.eclipse.photran.{intel,xlf}
+do
+  %{pdebuild} -d "cdt cdt-parsers jgit rse" \
+    -f $feature -a "-DjavacSource=1.6 -DjavacTarget=1.6 \
+    -Dnoclean=true -DforceContextQualifier=%{photran_build_id}"
+done
 
 %install
 rm -rf ${RPM_BUILD_ROOT}


More information about the scm-commits mailing list