Merge pull request #2356 from iahmad-khan/sherpa-changes

changes sherpa spec files for pyext , scons and swig to work

cmssw-tool-conf.spec

@@ -158,6 +158,7 @@ Requires: utm-toolfile
 Requires: libffi-toolfile
 Requires: CSCTrackFinderEmulation-toolfile
 Requires: tinyxml-toolfile
+Requires: scons-toolfile
 
 # Only for Linux platform.
 %if %islinux

scons-toolfile.spec

@@ -0,0 +1,19 @@
+### RPM external scons-toolfile 1.0
+Requires: scons
+
+%prep
+%build
+%install
+mkdir -p %i/etc/scram.d
+cat << \EOF_TOOLFILE >%i/etc/scram.d/scons.xml
+<tool name="scons" version="@TOOL_VERSION@">
+  <info url="http://prdownloads.sourceforge.net/scons/"/>
+  <client>
+    <environment name="SCONS_BASE" default="@TOOL_ROOT@"/>
+    <environment name="BINDIR" default="$SCONS_BASE/bin"/>
+  </client>
+  <runtime name="SCONS_LIB_DIR" value="$SCONS_BASE/lib"/>  
+</tool>
+EOF_TOOLFILE
+
+## IMPORT scram-tools-post

sherpa.spec

@@ -3,8 +3,8 @@
 %define branch cms/v%realversion
 %define github_user cms-externals
 Source: git+https://github.com/%github_user/%{n}.git?obj=%{branch}/%{tag}&export=%{n}-%{realversion}&output=/%{n}-%{realversion}-%{tag}.tgz
-Requires: hepmc lhapdf blackhat sqlite fastjet openssl
-BuildRequires: mcfm
+Requires: hepmc lhapdf blackhat sqlite fastjet openssl scons
+BuildRequires: mcfm swig
 
 %if "%(case %cmsplatf in (slc*) echo true ;; (*) echo false ;; esac)" == "true"
 Requires: openloops
@@ -43,6 +43,7 @@ esac
             --enable-hepmc2=$HEPMC_ROOT \
             --enable-lhapdf=$LHAPDF_ROOT \
             --enable-blackhat=$BLACKHAT_ROOT \
+            --enable-pyext \
             ${OPENLOOPS_ROOT+--enable-openloops=$OPENLOOPS_ROOT}\
             --with-sqlite3=$SQLITE_ROOT \
             CXX="%cms_cxx" \
@@ -53,3 +54,12 @@ make %{makeprocesses}
 
 %install
 make install
+find %{i}/lib -name '*.la' -delete
+
+%post
+%{relocateConfig}lib/python2.7/site-packages/ufo_interface/sconstruct_template
+%{relocateConfig}bin/make2scons
+%{relocateConfig}share/SHERPA-MC/makelibs
+%{relocateConfig}bin/Sherpa-config
+%{relocateConfig}bin/Sherpa-generate-model
+%{relocateConfig}include/SHERPA-MC/ATOOLS/Org/CXXFLAGS.H