Merge pull request #6725 from davidlange6/dl210312

draft hepmc with cmake; cleanup old patches

hepmc.spec

@@ -1,31 +1,34 @@
 ### RPM external hepmc 2.06.10
 
-%define tag d262dcafa9855927846f7b140a4bc3b31667ef03
+%define tag 91c4c217572ac25669e9ad8fdc0111d1d5c82289
 %define branch cms/%{realversion}
 Source: git+https://github.com/cms-externals/hepmc.git?obj=%{branch}/%{tag}&export=HepMC-%{realversion}&output=/HepMC-%{realversion}.tgz
 
-Requires: autotools
+BuildRequires: cmake
 
 %define keep_archives true
 %define drop_files %i/share
 
 %prep
 %setup -q -n HepMC-%{realversion}
 
-F77="$(which gfortran) -fPIC"
-CXX="$(which g++) -fPIC"
-PLATF_CONFIG_OPTS="--enable-static --disable-shared"
-
-perl -p -i -e 's|glibtoolize|libtoolize|g' ./bootstrap
+%build
 
-export HEPMC_NODOC=1
+rm -rf ../build
+mkdir ../build
+cd ../build
 
-./bootstrap
-./configure $PLATF_CONFIG_OPTS --prefix=%{i} --with-momentum=GEV --with-length=MM F77="$F77" CXX="$CXX"
+cmake ../HepMC-%{realversion} \
+    -DCMAKE_INSTALL_PREFIX=%{i} \
+    -DCMAKE_CXX_FLAGS="-fPIC" \
+    -DCMAKE_BUILD_TYPE="Release" \
+    -Dmomentum:STRING=GEV \
+    -Dlength:STRING=MM 
 
-%build
 make %makeprocesses
 
 %install
+cd ../build
 make install
+rm -rf %i/lib/*.so
 rm -rf %i/lib/*.la

rivet.spec

@@ -5,7 +5,7 @@
 Source: git+https://gitlab.com/hepcedar/rivet.git?obj=master/%{n}-%{realversion}&export=%{n}-%{realversion}&output=/%{n}-%{realversion}.tgz
 
 Requires: hepmc fastjet fastjet-contrib yoda
-BuildRequires: python py2-cython py2-setuptools
+BuildRequires: python py2-cython py2-setuptools autotools
 
 Patch0: rivet-140-313
 

sherpa.spec

@@ -4,7 +4,7 @@
 %define github_user cms-externals
 Source: http://www.hepforge.org/archive/sherpa/SHERPA-MC-%{realversion}.tar.gz
 Requires: hepmc lhapdf blackhat sqlite fastjet openssl scons python openmpi rivet
-BuildRequires: mcfm swig
+BuildRequires: mcfm swig autotools
 Patch0: sherpa-2.2.10-hepmcshort
 
 %ifos linux