Merge pull request #1338 from cms-sw/revert-1337-reset_hf_pythia8_71X

Revert "Revert changes to HF shower libraries and pythia8."

data-SimG4CMS-Calo.spec

@@ -6,8 +6,8 @@
 %define base_url "http://cmsdoc.cern.ch/cms/data/CMSSW"
 
 cat << CMS_EOF >> ./sources
-SimG4CMS/Calo/data/HFShowerLibrary_npmt_noatt_eta4_16en.root
-SimG4CMS/Calo/data/HFShowerLibrary_oldpmt_noatt_eta4_16en.root
+SimG4CMS/Calo/data/HFShowerLibrary_npmt_noatt_eta4_16en_v3.root
+SimG4CMS/Calo/data/HFShowerLibrary_oldpmt_noatt_eta4_16en_v3.root
 CMS_EOF
 
 ## IMPORT data-package-build

pythia8-201-fix-gcc-options.patch → pythia8-205-fix-gcc-options.patch

@@ -1,7 +1,6 @@
-diff -ur orig/pythia8201/configure new/pythia8201/configure
---- orig/pythia8201/configure	2014-10-13 20:20:55.000000000 +0200
-+++ new/pythia8201/configure	2014-11-17 20:16:44.910305252 +0100
-@@ -207,7 +207,8 @@
+--- ../pythia8205/configure	2015-01-24 11:55:07.649516367 +0100
++++ pythia8205/configure	2015-01-24 11:54:46.626182422 +0100
+@@ -209,7 +209,8 @@
      if [ "$ARCH" = "LINUX" ];  then CXX_SHARED="-shared"; fi
      if [ "$ARCH" = "DARWIN" ]; then 
  	CXX_SHARED="-dynamiclib -flat_namespace"

pythia8.spec

@@ -1,21 +1,19 @@
-### RPM external pythia8 201
+### RPM external pythia8 205
 
 Requires: hepmc lhapdf
 
-Source: http://cern.ch/service-spi/external/MCGenerators/distribution/%{n}/%{n}-%{realversion}-src.tgz
+Source: http://home.thep.lu.se/~torbjorn/pythia8/%{n}%{realversion}.tgz
 
-Patch0: pythia8-201-fix-gcc-options
-Patch1: pythia8-201-fix-init
+Patch0: pythia8-205-fix-gcc-options
 
 %if "%{?cms_cxxflags:set}" != "set"
 %define cms_cxxflags -std=c++0x
 %endif
 
 %prep
-%setup -q -n %{n}/%{realversion}
+%setup -q -n %{n}%{realversion}
 %patch0 -p2
-%patch1 -p2
-
+
 export USRCXXFLAGS="%cms_cxxflags"
 export HEPMCLOCATION=${HEPMC_ROOT}  
 export HEPMCVERSION=${HEPMC_VERSION}