Merge pull request #1771 from mkirsano/toevtgen140p1_1

upgrade to evtgen 1.4.0p1

evtgen.spec

@@ -1,11 +1,11 @@
-### RPM external evtgen 1.3.0
+### RPM external evtgen 1.4.0p1
 
 Requires: hepmc
 Requires: pythia8
 Requires: tauolapp
 Requires: photospp
 
-Source: http://service-spi.web.cern.ch/service-spi/external/MCGenerators/distribution/evtgen/evtgen-1.3.0-src.tgz
+Source: http://service-spi.web.cern.ch/service-spi/external/MCGenerators/distribution/%{n}/%{n}-%{realversion}-src.tgz
 
 %if "%{?cms_cxx:set}" != "set"
 %define cms_cxx c++
@@ -18,23 +18,14 @@ Source: http://service-spi.web.cern.ch/service-spi/external/MCGenerators/distrib
 %define keep_archives true
 
 %prep
-%setup -q -n evtgen/%{realversion}
+%setup -q -n %{n}/%{realversion}
 
 case %cmsplatf in
   osx*)
   ;;
 esac
 
-export HEPMCLOCATION=${HEPMC_ROOT}
-export HEPMCVERSION=${HEPMC_VERSION}
-export PYTHIA8_LOCATION=${PYTHIA8_ROOT}
-export TAUOLAPP_LOCATION=${TAUOLAPP_ROOT}
-export PHOTOSPP_LOCATION=${PHOTOSPP_ROOT}
-
-
 ./configure --prefix=%{i} --hepmcdir=$HEPMC_ROOT --pythiadir=$PYTHIA8_ROOT --tauoladir=$TAUOLAPP_ROOT --photosdir=$PHOTOSPP_ROOT CXXFLAGS="%cms_cxxflags" 
-#remove obsolete pythia8 library
-sed -ibak 's/PYTHIALIBLIST = -lpythia8 -llhapdfdummy/PYTHIALIBLIST = -lpythia8/g' config.mk
 
 # One more fix-up for OSX (in addition to the patch above)
 case %cmsplatf in
@@ -51,4 +42,3 @@ make install
 find %i/lib/archive -name "*.a" -exec mv {} %i/lib \;
 rm -rf %i/lib/archive
 ls %{i}/lib/
-