Merge pull request cms-sw#1046 from cms-sw/revert-1028-topythia8200pre1

Revert "Use a private pythia8 200pre1 tarball in cmsdist 73x with some o...

pythia8-toolfile.spec

@@ -10,12 +10,13 @@ mkdir -p %i/etc/scram.d
 cat << \EOF_TOOLFILE >%i/etc/scram.d/pythia8.xml
 <tool name="pythia8" version="@TOOL_VERSION@">
   <lib name="pythia8"/>
+  <lib name="pythia8tohepmc"/>
   <client>
     <environment name="PYTHIA8_BASE" default="@TOOL_ROOT@"/>
     <environment name="LIBDIR" default="$PYTHIA8_BASE/lib"/>
     <environment name="INCLUDE" default="$PYTHIA8_BASE/include"/>
   </client>
-  <runtime name="PYTHIA8DATA" value="$PYTHIA8_BASE/share/Pythia8/xmldoc"/>
+  <runtime name="PYTHIA8DATA" value="$PYTHIA8_BASE/xmldoc"/>
   <use name="hepmc"/>
   <use name="lhapdf"/>
 </tool>

pythia8.spec

@@ -1,9 +1,8 @@
-### RPM external pythia8 200pre1
+### RPM external pythia8 185
 
-Requires: hepmc lhapdf
+Requires: hepmc
 
-#Source: http://cern.ch/service-spi/external/MCGenerators/distribution/%{n}/%{n}-%{realversion}-src.tgz
-Source: https://cms-project-generators.web.cern.ch/cms-project-generators/%{n}-%{realversion}-src.tgz
+Source: http://cern.ch/service-spi/external/MCGenerators/distribution/%{n}/%{n}-%{realversion}-src.tgz
 
 %if "%{?cms_cxxflags:set}" != "set"
 %define cms_cxxflags -std=c++0x
@@ -13,9 +12,9 @@ Source: https://cms-project-generators.web.cern.ch/cms-project-generators/%{n}-%
 %setup -q -n %{n}/%{realversion}
 
 export USRCXXFLAGS="%cms_cxxflags"
-export HEPMCLOCATION=${HEPMC_ROOT}  
-export HEPMCVERSION=${HEPMC_VERSION}
-./configure --prefix=%i --enable-shared --with-hepmc2=${HEPMC_ROOT} --with-lhapdf5=${LHAPDF_ROOT}
+export HEPMCLOCATION=${HEPMC_ROOT} 
+export HEPMCVERSION=${HEPMC_VERSION} 
+./configure --prefix=%i --enable-shared --with-hepmc=${HEPMC_ROOT}
 
 %build
 make %makeprocesses