diff --git a/rivet.spec b/rivet.spec index 73ccccafcff..9edf2af8346 100644 --- 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 @@ -61,4 +61,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 index 4b2b7a837da..233458598c9 100644 --- a/sherpa.spec +++ b/sherpa.spec @@ -3,7 +3,7 @@ %define branch cms/v%realversion %define github_user cms-externals Source: http://www.hepforge.org/archive/sherpa/SHERPA-MC-%{realversion}.tar.gz -Requires: hepmc lhapdf blackhat sqlite python3 fastjet openmpi rivet +Requires: hepmc lhapdf blackhat sqlite python3 fastjet openmpi BuildRequires: mcfm swig autotools Patch0: sherpa-2.2.10-hepmcshort @@ -34,7 +34,6 @@ export PYTHON=$(which python3) ./configure --prefix=%i --enable-analysis --disable-silent-rules \ --enable-fastjet=$FASTJET_ROOT \ --enable-hepmc2=$HEPMC_ROOT \ - --enable-rivet=$RIVET_ROOT \ --enable-lhapdf=$LHAPDF_ROOT \ --enable-blackhat=$BLACKHAT_ROOT \ --enable-pyext \ diff --git a/yoda.spec b/yoda.spec index 61b8fce5d8b..292fc5c0011 100644 --- 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