From 4eb3d6db28ac34d5af3a6ab0847888ad1bd87e96 Mon Sep 17 00:00:00 2001 From: David Abdurachmanov Date: Sun, 28 Apr 2013 08:30:12 +0200 Subject: [PATCH] herwig: update version to 6.521; drop %ifos macro Updates version to 6.521 and drops %ifos macro from SPEC. Request: https://twiki.cern.ch/twiki/bin/viewauth/CMS/OfflineComputingPlanningMeeting20130426 Signed-off-by: David Abdurachmanov --- herwig.spec | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/herwig.spec b/herwig.spec index 55d3039976a..f3fbdd799e0 100644 --- a/herwig.spec +++ b/herwig.spec @@ -1,8 +1,9 @@ -### RPM external herwig 6.520 -Source: http://cern.ch/service-spi/external/MCGenerators/distribution/%{n}-%{realversion}-src.tgz +### RPM external herwig 6.521 +Source: http://cern.ch/service-spi/external/MCGenerators/distribution/%{n}/%{n}-%{realversion}-src.tgz Requires: lhapdf photos Patch1: herwig-6.520-tauoladummy +%define isDarwin %(case %{cmsos} in (osx*) echo 1 ;; (*) echo 0 ;; esac) %define keep_archives true %prep @@ -33,8 +34,8 @@ make install # then hack include area as jimmy depends on missing header file.. # but only on slc*. On macosx HERWIG65.INC == herwig65.inc # what is actually needed is a link to herwig6510.inc -%ifos darwin -ln -sf herwig6520.inc %{i}/include/herwig65.inc +%if %isDarwin +ln -sf herwig6521.inc %{i}/include/herwig65.inc %else ln -sf HERWIG65.INC %{i}/include/herwig65.inc %endif