Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Pythia 8.205 (71x) #1334

Merged
merged 1 commit into from Jan 28, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 0 additions & 14 deletions pythia8-201-fix-init.patch

This file was deleted.

@@ -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"
Expand Down
12 changes: 5 additions & 7 deletions 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}
Expand Down