Merge pull request #8109 from mseidel42/patch-8

Rivet 3.1.7 & YODA 1.9.7
cms-sw · Oct 27, 2022 · 22592a9 · 22592a9
2 parents 5e2643b + 0b6554a
commit 22592a9
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 8 deletions.
diff --git a/rivet.spec b/rivet.spec
@@ -1,4 +1,4 @@
-### RPM external rivet 3.1.6
+### RPM external rivet 3.1.7
 ## INITENV +PATH PYTHON3PATH %{i}/${PYTHON3_LIB_SITE_PACKAGES}
 ## OLD GENSER Source: http://cern.ch/service-spi/external/MCGenerators/distribution/rivet/rivet-%{realversion}-src.tgz
 Source: git+https://gitlab.com/hepcedar/rivet.git?obj=master/%{n}-%{realversion}&export=%{n}-%{realversion}&output=/%{n}-%{realversion}.tgz
@@ -59,4 +59,3 @@ sed -i -e 's|^#!.*python.*|#!/usr/bin/env python3|' %{i}/bin/*
 %{relocateConfig}bin/rivet-config
 %{relocateConfig}bin/rivet-buildplugin
 %{relocateConfig}bin/rivet-build
-%{relocateConfig}lib/python*/site-packages/rivet-*egg-info/SOURCES.txt
diff --git a/sherpa.spec b/sherpa.spec
@@ -47,7 +47,7 @@ export PYTHON=$(which python3)
             CXX="mpicxx" \
             MPICXX="mpicxx" \
             FC="mpifort" \
-            CXXFLAGS="-fuse-cxa-atexit $ARCH_CMSPLATF -O2 -std=c++0x -I$LHAPDF_ROOT/include -I$BLACKHAT_ROOT/include -I$RIVET_ROOT/include" \
+            CXXFLAGS="-fuse-cxa-atexit $ARCH_CMSPLATF -O2 -std=c++17 -I$LHAPDF_ROOT/include -I$BLACKHAT_ROOT/include -I$RIVET_ROOT/include" \
             LDFLAGS="-ldl -L$BLACKHAT_ROOT/lib/blackhat -L$QD_ROOT/lib"
 
 make %{makeprocesses}

diff --git a/yoda.spec b/yoda.spec
@@ -1,4 +1,4 @@
-### RPM external yoda 1.9.6
+### RPM external yoda 1.9.7
 ## INITENV +PATH PYTHON3PATH %i/${PYTHON3_LIB_SITE_PACKAGES}
 
 Source: git+https://gitlab.com/hepcedar/yoda.git?obj=main/%{n}-%{realversion}&export=%{n}-%{realversion}&output=/%{n}-%{realversion}.tgz
@@ -13,9 +13,6 @@ autoreconf -fiv
 
 %build
 
-sed -i -e "s|lPyROOT|lcppyyX.X|" ./pyext/setup.py.in
-
-sed -i -e "s|lcppyy...|lcppyy$(echo %{cms_python3_major_minor_version} | tr . _)|" ./pyext/setup.py.in
 PYTHON=$(which python3) ./configure --prefix=%i --enable-root
 sed -i "s|env python|env python3|" bin/*
 make %{makeprocesses} all
@@ -25,4 +22,3 @@ make install
 
 %post
 %{relocateConfig}bin/yoda-config
-%{relocateConfig}lib/python*/site-packages/yoda*egg-info/SOURCES.txt