The package rpms/HepMC.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/HepMC.git/commit/?id=212b3d673083....
Change:
-%ifarch aarch64 %{power64} s390 s390x
Thanks.
Full change:
============
commit 212b3d6730839c6c3c64c57f1126b41e461ab4a6
Author: Mattias Ellert <mattias.ellert(a)physics.uu.se>
Date: Thu Aug 1 23:21:37 2019 +0200
Update to version 2.06.10
Drop patches - all fixed in the new version
Drop the -ffp-contract=off hack
Remove redundant m_outstream->setf(std::ios::fixed)
Fix GenEventCopmpare
Adjust expected test output for changes in the code
diff --git a/HepMC-GenEvent-compare.patch b/HepMC-GenEvent-compare.patch
new file mode 100644
index 0000000..7af6398
--- /dev/null
+++ b/HepMC-GenEvent-compare.patch
@@ -0,0 +1,155 @@
+From 72acdcdbb3032b571c1a3a6a79a554359518f7ea Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert(a)physics.uu.se>
+Date: Fri, 26 Jul 2019 16:22:07 +0200
+Subject: [PATCH 1/2] In GenEvents, the heavy_ion() and pdf_info() are
+ pointers. In order to compare two GenEvents it is not sufficient to compare
+ the pointers, but the objects the pointers are pointing to should be
+ compared.
+
+This fixes a failure in the testMultipleCopies test.
+---
+ HepMC/CompareGenEvent.h | 4 +++-
+ src/CompareGenEvent.cc | 52 ++++++++++++++++++++++++++++-------------
+ 2 files changed, 39 insertions(+), 17 deletions(-)
+
+diff --git a/HepMC/CompareGenEvent.h b/HepMC/CompareGenEvent.h
+index 90f2be4..712d85f 100644
+--- a/HepMC/CompareGenEvent.h
++++ b/HepMC/CompareGenEvent.h
+@@ -20,8 +20,10 @@ bool compareGenEvent( GenEvent*, GenEvent* );
+ bool compareSignalProcessVertex( GenEvent*, GenEvent* );
+ bool compareBeamParticles( GenEvent*, GenEvent* );
+ bool compareWeights( GenEvent*, GenEvent* );
+-bool compareVertices( GenEvent*, GenEvent* );
++bool compareHeavyIons( GenEvent*, GenEvent* );
++bool comparePdfInfo( GenEvent*, GenEvent* );
+ bool compareParticles( GenEvent*, GenEvent* );
++bool compareVertices( GenEvent*, GenEvent* );
+ bool compareVertex( GenVertex* v1, GenVertex* v2 );
+
+ } // HepMC
+diff --git a/src/CompareGenEvent.cc b/src/CompareGenEvent.cc
+index 69efeba..c40efe5 100644
+--- a/src/CompareGenEvent.cc
++++ b/src/CompareGenEvent.cc
+@@ -48,14 +48,8 @@ bool compareGenEvent( GenEvent* e1, GenEvent* e2)
+ std::cerr << "compareGenEvent: random states differ " <<
std::endl;
+ return false;
+ }
+- if( e1->heavy_ion() != e2->heavy_ion() ) {
+- std::cerr << "compareGenEvent: heavy ions differ " <<
std::endl;
+- return false;
+- }
+- if( e1->pdf_info() != e2->pdf_info() ) {
+- std::cerr << "compareGenEvent: pdf info differs " <<
std::endl;
+- return false;
+- }
++ if ( !compareHeavyIons( e1, e2 ) ) { return false; }
++ if ( !comparePdfInfo( e1, e2 ) ) { return false; }
+ if ( !compareParticles( e1, e2 ) ) { return false; }
+ if ( !compareVertices( e1, e2 ) ) { return false; }
+ return true;
+@@ -95,6 +89,32 @@ bool compareWeights( GenEvent* e1, GenEvent* e2 ) {
+ return false;
+ }
+
++bool compareHeavyIons( GenEvent* e1, GenEvent* e2 ) {
++ // compare heavy ions
++ HeavyIon* h1 = e1->heavy_ion();
++ HeavyIon* h2 = e2->heavy_ion();
++ if( h1 && h2 ) {
++ if( (*h1) != (*h2) ) {
++ std::cerr << "compareHeavyIons: heavy ions differ " <<
std::endl;
++ return false;
++ }
++ }
++ return true;
++}
++
++bool comparePdfInfo( GenEvent* e1, GenEvent* e2 ) {
++ // compare pdf info
++ PdfInfo* p1 = e1->pdf_info();
++ PdfInfo* p2 = e2->pdf_info();
++ if( p1 && p2 ) {
++ if( (*p1) != (*p2) ) {
++ std::cerr << "comparePdfInfo: PDF info differs " <<
std::endl;
++ return false;
++ }
++ }
++ return true;
++}
++
+ bool compareParticles( GenEvent* e1, GenEvent* e2 ) {
+ if( e1->particles_size() != e2->particles_size() ) {
+ std::cerr << "compareParticles: number of particles differs "
<< std::endl;
+@@ -109,7 +129,7 @@ bool compareParticles( GenEvent* e1, GenEvent* e2 ) {
+ << std::endl; */
+ if ( **p1 != **p2 ) {
+ std::cerr << "compareParticles: particle "
+- << (*p1)->barcode() << " differs from "
++ << (*p1)->barcode() << " differs from "
+ << (*p2)->barcode() << std::endl;
+ return false;
+ }
+@@ -125,13 +145,13 @@ bool compareVertices( GenEvent* e1, GenEvent* e2 ) {
+ for ( GenEvent::vertex_const_iterator v = e1->vertices_begin();
+ v != e1->vertices_end(); ++v ) {
+ //std::cout << "compareVertices: comparing vertex "
+- // << (*v)->barcode() << std::endl;
++ // << (*v)->barcode() << std::endl;
+ GenVertex* v1 = (*v);
+ GenVertex* v2 = e2->barcode_to_vertex((*v)->barcode());
+ compareVertex( (*v), e2->barcode_to_vertex((*v)->barcode()));
+ if ( (*v1) != (*v2) ) {
+ std::cerr << "compareVertices: vertex "
+- << (*v)->barcode() << " differs" <<
std::endl;
++ << (*v)->barcode() << " differs" << std::endl;
+ return false;
+ }
+ }
+@@ -141,13 +161,13 @@ bool compareVertices( GenEvent* e1, GenEvent* e2 ) {
+ bool compareVertex( GenVertex* v1, GenVertex* v2 ) {
+ if ( v1->position() != v2->position() ) {
+ std::cerr << "compareVertex: position "
+- << v1->barcode() << " differs" <<
std::endl;
++ << v1->barcode() << " differs" << std::endl;
+ return false;
+ }
+ // if the size of the inlist differs, return false.
+ if ( v1->particles_in_size() != v2->particles_in_size() ) {
+ std::cerr << "compareVertex: particles_in_size "
+- << v1->barcode() << " differs" <<
std::endl;
++ << v1->barcode() << " differs" << std::endl;
+ return false;
+ }
+ // loop over the inlist and ensure particles are identical
+@@ -158,7 +178,7 @@ bool compareVertex( GenVertex* v1, GenVertex* v2 ) {
+ ia != v1->particles_in_const_end(); ia++, ib++ ){
+ if ( **ia != **ib ) {
+ std::cerr << "compareVertex: incoming particle "
+- << v1->barcode() << " differs: "
++ << v1->barcode() << " differs: "
+ << (*ia)->barcode() << " " << (*ib)->barcode()
+ << std::endl;
+ //return false;
+@@ -168,7 +188,7 @@ bool compareVertex( GenVertex* v1, GenVertex* v2 ) {
+ // if the size of the outlist differs, return false.
+ if ( v1->particles_out_size() != v2->particles_out_size() ) {
+ std::cerr << "compareVertex: particles_out_size "
+- << v1->barcode() << " differs" <<
std::endl;
++ << v1->barcode() << " differs" << std::endl;
+ return false;
+ }
+ // loop over the outlist and ensure particles are identical
+@@ -179,7 +199,7 @@ bool compareVertex( GenVertex* v1, GenVertex* v2 ) {
+ ia != v1->particles_out_const_end(); ia++, ib++ ){
+ if ( **ia != **ib ) {
+ std::cerr << "compareVertex: outgoing particle "
+- << v1->barcode() << " differs: "
++ << v1->barcode() << " differs: "
+ << (*ia)->barcode() << " " <<
(*ib)->barcode()
+ << std::endl;
+ //return false;
+--
+2.21.0
+
diff --git a/HepMC-continue-vs-break.patch b/HepMC-continue-vs-break.patch
deleted file mode 100644
index 2c75bac..0000000
--- a/HepMC-continue-vs-break.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur HepMC-2.06.09.orig/src/WeightContainer.cc HepMC-2.06.09/src/WeightContainer.cc
---- HepMC-2.06.09.orig/src/WeightContainer.cc 2010-05-17 17:23:44.000000000 +0200
-+++ HepMC-2.06.09/src/WeightContainer.cc 2018-12-08 22:22:50.073203625 +0100
-@@ -57,7 +57,7 @@
- {
- if( m->second == vit ) {
- m_names.erase(m->first);
-- continue;
-+ break;
- }
- }
- m_weights.pop_back();
diff --git a/HepMC-epsilon.patch b/HepMC-epsilon.patch
deleted file mode 100644
index fcb8897..0000000
--- a/HepMC-epsilon.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur HepMC-2.06.09.orig/test/testSimpleVector.cc
HepMC-2.06.09/test/testSimpleVector.cc
---- HepMC-2.06.09.orig/test/testSimpleVector.cc 2009-06-02 20:45:23.000000000 +0200
-+++ HepMC-2.06.09/test/testSimpleVector.cc 2015-03-06 20:01:29.894088753 +0100
-@@ -14,7 +14,7 @@
-
- HepMC::ThreeVector v3copy( v3 );
-
-- double eps = 1.e-15; // allowed differnce between doubles
-+ double eps = 2.e-15; // allowed difference between doubles
- int numbad = 0;
-
- double x = v3.x();
diff --git a/HepMC-examples-hwaend.patch b/HepMC-examples-hwaend.patch
deleted file mode 100644
index 134ac82..0000000
--- a/HepMC-examples-hwaend.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-provide dummy hwaend_ function in examples.
-
---- a/examples/fio/example_MyHerwig.cc
-+++ b/examples/fio/example_MyHerwig.cc
-@@ -21,6 +21,8 @@
- #include "HepMC/GenEvent.h"
- #include "HepMC/HEPEVT_Wrapper.h"
-
-+extern "C" void hwaend_() {}
-+
- int main() {
- //
- //........................................HEPEVT
---- a/examples/fio/testHerwigCopies.cc
-+++ b/examples/fio/testHerwigCopies.cc
-@@ -13,6 +13,8 @@
- #include "HepMC/CompareGenEvent.h"
- #include "HepMC/HEPEVT_Wrapper.h"
-
-+extern "C" void hwaend_() {}
-+
- int main() {
- //
- //........................................HEPEVT
diff --git a/HepMC-examples-makefile.patch b/HepMC-examples-makefile.patch
deleted file mode 100644
index 74c6101..0000000
--- a/HepMC-examples-makefile.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- a/examples/fio/GNUmakefile.example.in
-+++ b/examples/fio/GNUmakefile.example.in
-@@ -12,18 +12,16 @@
- # You may have to change GENSERdir and/or other variables
- #
- HepMCdir = @prefix@
-- HepMClib = -L$(HepMCdir)/lib -lHepMC
-- HepMCfiolib = -L$(HepMCdir)/lib -lHepMCfio
-+ HepMClib = -lHepMC
-+ HepMCfiolib = -lHepMCfio
- GENSERdir = @GENSERdir@
-- Pythia_LIB = -L$(GENSERdir)/lib -Wl,-rpath -Wl,$(GENSERdir)/lib \
-- -lpythia6_403 -lpythia6_403_dumm -lpythia6_403_pdfdumm
-- Herwig_LIB = -L$(GENSERdir)/lib -Wl,-rpath -Wl,$(GENSERdir)/lib \
-- -lherwig6_510 -lherwig6_510_dumm -lherwig6_510_pdfdumm
-+ Pythia_LIB = -lpythia6
-+ Herwig_LIB = -lherwig6
-
- ################################################################################
Compiler options
- #
- CXX = @CXX@
-- F77 = @F77@
-+ F77 = gfortran
- INCLUDES = -I$(HepMCdir)/include -I$(CLHEPdir)/include
- CXXFLAGS = @AM_CXXFLAGS@ @CXXFLAGS@ $(INCLUDES)
- ifeq "$(CXX)" "g++"
---- a/examples/pythia8/GNUmakefile.example.in
-+++ b/examples/pythia8/GNUmakefile.example.in
-@@ -14,15 +14,13 @@
- #
- HepMCdir = @prefix@
- HEPMCLOCATION = $(HepMCdir)
-- HepMClib = -L$(HEPMCLOCATION)/lib -Wl,-rpath -Wl,$(HEPMCLOCATION)/lib \
-- -lHepMC
-- Pythia_LIB = -L$(PYTHIA8_HOME)/lib -Wl,-rpath -Wl,$(PYTHIA8_HOME)/lib \
-- -lpythia8 -llhapdfdummy -lhepmcinterface
-+ HepMClib = -lHepMC
-+ Pythia_LIB = -lpythia8 -lLHAPDF -lhepmcinterface
-
- ################################################################################
Compiler options
- #
- CXX = @CXX@
-- INCLUDES = -I$(HEPMCLOCATION)/include -I$(PYTHIA8_HOME)/include
-+ INCLUDES = -I/usr/include/pythia8
- CXXFLAGS = @AM_CXXFLAGS@ @CXXFLAGS@ -Wshadow -fbounds-check $(INCLUDES)
- ifeq "$(CXX)" "g++"
- FLAGS = $(DFLG) -fno-second-underscore $(INCDIR)
diff --git a/HepMC-fix-typo-hierachy-hierarchy.patch
b/HepMC-fix-typo-hierachy-hierarchy.patch
deleted file mode 100644
index 0efed0c..0000000
--- a/HepMC-fix-typo-hierachy-hierarchy.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-commit 59755b58f1a6e2fe1521223a4dcf0d17a51f7181
-Author: Lifeng Sun <lifongsun(a)gmail.com>
-Date: Sun Apr 3 08:22:36 2011 +0800
-
- fix typo: hierachy -> hierarchy.
-
-diff --git a/fio/HEPEVT_Wrapper.cc b/fio/HEPEVT_Wrapper.cc
-index 1f382a8..9906002 100644
---- a/fio/HEPEVT_Wrapper.cc
-+++ b/fio/HEPEVT_Wrapper.cc
-@@ -186,7 +186,7 @@ namespace HepMC {
- << "\n relationships ... but all other information "
- << "\n (4-vectors etc) will be correctly transferred."
- << "\n In order for HepMC to be able to interpret the mother/"
-- << "\n daughter hierachy, it MUST be given consistent input."
-+ << "\n daughter hierarchy, it MUST be given consistent input."
- << "\n This is one of the design criteria of HepMC: "
- << "\n consistency is enforced by the code.";
- os << "\nThere is a switch in IO_HEPEVT, set-able using "
diff --git a/HepMC-linking.patch b/HepMC-linking.patch
deleted file mode 100644
index 2793acc..0000000
--- a/HepMC-linking.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -ur HepMC-2.06.09.orig/fio/Makefile.am HepMC-2.06.09/fio/Makefile.am
---- HepMC-2.06.09.orig/fio/Makefile.am 2011-10-31 20:05:37.000000000 +0100
-+++ HepMC-2.06.09/fio/Makefile.am 2012-11-16 16:22:11.373692129 +0100
-@@ -10,6 +10,8 @@
-
- lib_LTLIBRARIES = libHepMCfio.la
-
-+libHepMCfio_la_LIBADD = $(top_builddir)/src/libHepMC.la
-+
- if BUILD_VISUAL
- lib_shared = HepMC.$(SHEXT)
- else
-diff -ur HepMC-2.06.09.orig/fio/Makefile.in HepMC-2.06.09/fio/Makefile.in
---- HepMC-2.06.09.orig/fio/Makefile.in 2012-06-05 22:50:44.000000000 +0200
-+++ HepMC-2.06.09/fio/Makefile.in 2012-11-16 16:23:07.581987610 +0100
-@@ -55,7 +55,7 @@
- am__installdirs = "$(DESTDIR)$(libdir)"
- libLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(lib_LTLIBRARIES)
--libHepMCfio_la_LIBADD =
-+libHepMCfio_la_LIBADD = $(top_builddir)/src/libHepMC.la
- am_libHepMCfio_la_OBJECTS = HEPEVT_Wrapper.lo IO_HEPEVT.lo \
- IO_HERWIG.lo HerwigWrapper.lo
- libHepMCfio_la_OBJECTS = $(am_libHepMCfio_la_OBJECTS)
diff --git a/HepMC-no-hexfloat.patch b/HepMC-no-hexfloat.patch
deleted file mode 100644
index 3d09418..0000000
--- a/HepMC-no-hexfloat.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -ur HepMC-2.06.09.orig/src/IO_AsciiParticles.cc
HepMC-2.06.09/src/IO_AsciiParticles.cc
---- HepMC-2.06.09.orig/src/IO_AsciiParticles.cc 2010-05-17 17:23:44.000000000 +0200
-+++ HepMC-2.06.09/src/IO_AsciiParticles.cc 2015-03-06 17:38:41.860507302 +0100
-@@ -156,14 +156,14 @@
-
- xmassi = (*part)->generatedMass();
- if(fabs(xmassi) < 0.0001) xmassi =0.;
-- m_outstream->setf(std::ios::fixed);
-+ m_outstream->unsetf(std::ios::floatfield);
- m_outstream->precision(3);
- m_outstream->width(8);
- *m_outstream << xmassi << " ";
- m_outstream->setf(std::ios::scientific,std::ios::floatfield);
- m_outstream->precision(m_precision);
-
-- m_outstream->setf(std::ios::fixed);
-+ m_outstream->unsetf(std::ios::floatfield);
- m_outstream->precision(3);
- m_outstream->width(6);
- etai = (*part)->momentum().eta();
diff --git a/HepMC-remove-redundant-setf-std-ios-fixed.patch
b/HepMC-remove-redundant-setf-std-ios-fixed.patch
new file mode 100644
index 0000000..977aa58
--- /dev/null
+++ b/HepMC-remove-redundant-setf-std-ios-fixed.patch
@@ -0,0 +1,44 @@
+From 1690bc6c36a5b378677d6f606a1e70df0bd9222f Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert(a)physics.uu.se>
+Date: Thu, 4 Jul 2019 08:44:32 +0200
+Subject: [PATCH] Remove redundant m_outstream->setf(std::ios::fixed)
+
+The following call to m_outstream->unsetf(std::ios_base::floatfield) a
+few line further down clears the fixed bit again, and no output is
+sent to the output stream between these lines, so setting the fixed
+bit here has no effect.
+---
+ src/IO_AsciiParticles.cc | 6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/src/IO_AsciiParticles.cc b/src/IO_AsciiParticles.cc
+index 178c1ba..d5de480 100644
+--- a/src/IO_AsciiParticles.cc
++++ b/src/IO_AsciiParticles.cc
+@@ -156,21 +156,19 @@ namespace HepMC {
+
+ xmassi = (*part)->generatedMass();
+ if(fabs(xmassi) < 0.0001) xmassi =0.;
+- m_outstream->setf(std::ios::fixed);
+ m_outstream->precision(3);
+ m_outstream->width(8);
+- m_outstream->unsetf(std::ios_base::floatfield);
++ m_outstream->unsetf(std::ios_base::floatfield);
+ *m_outstream << xmassi << " ";
+ m_outstream->setf(std::ios::scientific,std::ios::floatfield);
+ m_outstream->precision(m_precision);
+
+- m_outstream->setf(std::ios::fixed);
+ m_outstream->precision(3);
+ m_outstream->width(6);
+ etai = (*part)->momentum().eta();
+ if(etai > 999.)etai = 999.;
+ if(etai < -999.)etai = -999.;
+- m_outstream->unsetf(std::ios_base::floatfield);
++ m_outstream->unsetf(std::ios_base::floatfield);
+ *m_outstream << etai << std::endl;
+ m_outstream->setf(std::ios::scientific,std::ios::floatfield);
+ m_outstream->precision(m_precision);
+--
+2.21.0
+
diff --git a/HepMC-test-fixes.patch b/HepMC-test-fixes.patch
new file mode 100644
index 0000000..3c6aef1
--- /dev/null
+++ b/HepMC-test-fixes.patch
@@ -0,0 +1,105 @@
+From 77671d78a5208bf61bbb137c07f9eb745ae3081b Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert(a)physics.uu.se>
+Date: Fri, 26 Jul 2019 16:35:27 +0200
+Subject: [PATCH 2/2] Due to changes in the the code there are new lines in the
+ output that must be added to the expected output files.
+
+This fixes failures in testHepMC.sh, testMass.sh and testStreamIO.sh
+---
+ test/testCrossSection.dat | 2 ++
+ test/testHepMC.dat | 3 +++
+ test/testMass1.dat | 2 ++
+ test/testWithWeight.dat | 2 ++
+ 4 files changed, 9 insertions(+)
+
+diff --git a/test/testCrossSection.dat b/test/testCrossSection.dat
+index 0ace3a0..fc4e5bc 100644
+--- a/test/testCrossSection.dat
++++ b/test/testCrossSection.dat
+@@ -5,6 +5,7 @@ E 1 65 -1.0000000000000000e+00 -1.0000000000000000e+00
-1.0000000000000000e+00 2
+ N 3 "0" "second weight name" "weightName"
+ U GEV MM
+ C 3.3260000000000000e-03 1.0000000000000000e-04
++H 0 0 0 0 0 0 0 0 0 0 0 0 0
+ V -1 0 0 0 0 0 1 3 0
+ P 1 2212 0 0 6.9999999371178146e+03 7.0000000000000000e+03 9.3827000000000005e-01 3 0 0
-1 0
+ P 3 -1 7.2521029125687850e-02 4.0916270130125820e-01 2.3327360517627892e+02
2.3327397528518750e+02 0 3 0 0 -3 0
+@@ -1412,6 +1413,7 @@ E 39 4 -1.0000000000000000e+00 -1.0000000000000000e+00
-1.0000000000000000e+00 2
+ N 3 "0" "second weight name" "weightName"
+ U GEV MM
+ C 3.2685771680665248e+01 4.0912561144384779e-01
++H 0 0 0 0 0 0 0 0 0 0 0 0 0
+ V -1 0 0 0 0 0 1 2 0
+ P 1 2212 0 0 6.9999999371178146e+03 7.0000000000000000e+03 9.3827000000000005e-01 3 0 0
-1 0
+ P 3 1 1.5073383106491554e+00 -1.2993365623313919e+00 2.7209201338025518e+03
2.7209208615607290e+03 0 3 0 0 -3 0
+diff --git a/test/testHepMC.dat b/test/testHepMC.dat
+index 89b814b..d3a58b2 100644
+--- a/test/testHepMC.dat
++++ b/test/testHepMC.dat
+@@ -4,6 +4,7 @@ HepMC::IO_GenEvent-START_EVENT_LISTING
+ E 9 51 -1.0000000000000000e+00 -1.0000000000000000e+00 -1.0000000000000000e+00 20 0 309
1 2 0 4 2.3000000000000001e-01 3.4000000000000002e-01 1.1000000000000000e-01
6.5000000000000002e-02
+ N 4 "0" "1" "2" "3"
+ U GEV MM
++H 0 0 0 0 0 0 0 0 0 0 0 0 0
+ V -1 0 0 0 0 0 1 3 0
+ P 1 2212 0 0 6.9999999371178146e+03 7.0000000000000000e+03 9.3827000000000005e-01 3 0 0
-1 0
+ P 3 21 -9.5802904850995474e-01 3.4892974578914365e-01 1.5677975928920182e+01
1.5711094833049845e+01 0 3 0 0 -3 0
+@@ -1245,6 +1246,7 @@ P 929 130 1.5144574134495588e+00 7.2590137012971407e+00
-2.3983943019256262e+01
+ E 18 40 -1.0000000000000000e+00 -1.0000000000000000e+00 -1.0000000000000000e+00 20 0 219
1 2 0 5 2.3000000000000001e-01 1.4000000000000000e-02 3.5400000000000000e+00
1.3400000000000001e+00 1.2000000000000000e-01
+ N 5 "0" "3" "4" "p 2" "p1"
+ U GEV MM
++H 0 0 0 0 0 0 0 0 0 0 0 0 0
+ V -1 0 0 0 0 0 1 2 0
+ P 1 2212 0 0 6.9999999371178146e+03 7.0000000000000000e+03 9.3827000000000005e-01 3 0 0
-1 0
+ P 3 2 -3.1410233325201048e-01 4.1184766785753961e+00 7.1390134753684538e+02
7.1391329622395415e+02 0 3 0 0 -3 0
+@@ -2140,6 +2142,7 @@ P 673 -211 -6.7514417930739964e-02 -1.0120446765128294e-02
-1.8254475337189451e+
+ P 674 211 3.0894826880397325e-01 -1.5887730643141576e-01 -1.7377281346698286e+01
1.7381314041766348e+01 1.3957000000000000e-01 1 0 0 0 0
+ E 56 41 -1.0000000000000000e+00 -1.0000000000000000e+00 -1.0000000000000000e+00 20 0 267
1 2 0 0
+ U GEV MM
++H 0 0 0 0 0 0 0 0 0 0 0 0 0
+ V -1 0 0 0 0 0 1 3 0
+ P 1 2212 0 0 6.9999999371178146e+03 7.0000000000000000e+03 9.3827000000000005e-01 3 0 0
-1 0
+ P 3 21 6.3025125034486240e-01 -1.5608419695341000e+00 1.9452414252898802e+01
1.9525108567144983e+01 0 3 0 0 -3 0
+diff --git a/test/testMass1.dat b/test/testMass1.dat
+index 2219505..41deb33 100644
+--- a/test/testMass1.dat
++++ b/test/testMass1.dat
+@@ -1247,6 +1247,7 @@ P 929 130 1.5144574134495588e+00 7.2590137012971407e+00
-2.3983943019256262e+01
+ E 18 40 -1.0000000000000000e+00 -1.0000000000000000e+00 -1.0000000000000000e+00 20 0 219
1 2 0 5 2.3000000000000001e-01 1.4000000000000000e-02 3.5400000000000000e+00
1.3400000000000001e+00 1.2000000000000000e-01
+ N 5 "0" "3" "4" "p 2" "p1"
+ U GEV MM
++H 0 0 0 0 0 0 0 0 0 0 0 0 0
+ V -1 0 0 0 0 0 1 2 0
+ P 1 2212 0 0 6.9999999371178146e+03 7.0000000000000000e+03 9.3827000000000005e-01 3 0 0
-1 0
+ P 3 2 -3.1410233325201048e-01 4.1184766785753961e+00 7.1390134753684538e+02
7.1391329622395415e+02 0 3 0 0 -3 0
+@@ -2142,6 +2143,7 @@ P 673 -211 -6.7514417930739964e-02 -1.0120446765128294e-02
-1.8254475337189451e+
+ P 674 211 3.0894826880397325e-01 -1.5887730643141576e-01 -1.7377281346698286e+01
1.7381314041766348e+01 1.3957000000000000e-01 1 0 0 0 0
+ E 56 41 -1.0000000000000000e+00 -1.0000000000000000e+00 -1.0000000000000000e+00 20 0 267
1 2 0 0
+ U GEV MM
++H 0 0 0 0 0 0 0 0 0 0 0 0 0
+ V -1 0 0 0 0 0 1 3 0
+ P 1 2212 0 0 6.9999999371178146e+03 7.0000000000000000e+03 9.3827000000000005e-01 3 0 0
-1 0
+ P 3 21 6.3025125034486240e-01 -1.5608419695341000e+00 1.9452414252898802e+01
1.9525108567144983e+01 0 3 0 0 -3 0
+diff --git a/test/testWithWeight.dat b/test/testWithWeight.dat
+index 6f07ad2..300984f 100644
+--- a/test/testWithWeight.dat
++++ b/test/testWithWeight.dat
+@@ -4,6 +4,7 @@ HepMC::IO_GenEvent-START_EVENT_LISTING
+ E 1 65 -1.0000000000000000e+00 -1.0000000000000000e+00 -1.0000000000000000e+00 20 0 357
1 2 0 3 3.4560000000000002e-01 9.8563000000000001e-01 9.8595999999999995e-01
+ N 3 "0" "1" "2"
+ U GEV MM
++H 0 0 0 0 0 0 0 0 0 0 0 0 0
+ V -1 0 0 0 0 0 1 3 0
+ P 1 2212 0 0 6.9999999371178146e+03 7.0000000000000000e+03 9.3827000000000005e-01 3 0 0
-1 0
+ P 3 -1 7.2521029125687850e-02 4.0916270130125820e-01 2.3327360517627892e+02
2.3327397528518750e+02 0 3 0 0 -3 0
+@@ -1410,6 +1411,7 @@ P 1046 22 -2.0596811409436391e-01 3.7999759000577560e-01
1.7194504358090985e+00
+ E 39 4 -1.0000000000000000e+00 -1.0000000000000000e+00 -1.0000000000000000e+00 20 0 133
1 2 0 3 3.4560000000000002e-01 9.9222999999999995e-01 9.9256000000000000e-01
+ N 3 "0" "1" "2"
+ U GEV MM
++H 0 0 0 0 0 0 0 0 0 0 0 0 0
+ V -1 0 0 0 0 0 1 2 0
+ P 1 2212 0 0 6.9999999371178146e+03 7.0000000000000000e+03 9.3827000000000005e-01 3 0 0
-1 0
+ P 3 1 1.5073383106491554e+00 -1.2993365623313919e+00 2.7209201338025518e+03
2.7209208615607290e+03 0 3 0 0 -3 0
+--
+2.21.0
+
diff --git a/HepMC.spec b/HepMC.spec
index c10c2b8..4569136 100644
--- a/HepMC.spec
+++ b/HepMC.spec
@@ -1,20 +1,25 @@
Name: HepMC
-Version: 2.06.09
-Release: 24%{?dist}
+Version: 2.06.10
+Release: 1%{?dist}
Summary: C++ Event Record for Monte Carlo Generators
License: GPLv2+
-URL:
http://lcgapp.cern.ch/project/simu/HepMC/
-Source0:
http://lcgapp.cern.ch/project/simu/HepMC/download/%{name}-%{version}.tar.gz
-Patch0: %{name}-fix-typo-hierachy-hierarchy.patch
-Patch1: %{name}-examples-makefile.patch
-Patch2: %{name}-examples-hwaend.patch
-Patch3: %{name}-linking.patch
-Patch4: %{name}-no-hexfloat.patch
-Patch5: %{name}-epsilon.patch
-Patch6: %{name}-continue-vs-break.patch
+URL:
http://hepmc.web.cern.ch/hepmc/
+Source0:
http://hepmc.web.cern.ch/hepmc/releases/%{name}-%{version}.tar.gz
+# Remove redundant m_outstream->setf(std::ios::fixed)
+#
https://gitlab.cern.ch/hepmc/HepMC/merge_requests/7
+Patch0: %{name}-remove-redundant-setf-std-ios-fixed.patch
+# Fix GenEventCopmpare
+#
https://gitlab.cern.ch/hepmc/HepMC/merge_requests/8
+Patch1: %{name}-GenEvent-compare.patch
+# Adjust expected test output for changes in the code
+#
https://gitlab.cern.ch/hepmc/HepMC/merge_requests/8
+Patch2: %{name}-test-fixes.patch
BuildRequires: gcc-c++
+BuildRequires: autoconf
+BuildRequires: automake
+BuildRequires: libtool
%description
The HepMC package is an object oriented event record written in C++
@@ -49,18 +54,9 @@ This package provides HepMC manuals and examples.
%patch0 -p1
%patch1 -p1
%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
%build
-# take care of testSimpleVector failure
-%if %{?fedora}%{!?fedora:0} || %{?rhel}%{!?rhel:0} >= 7
-%ifarch aarch64 %{power64} s390 s390x
-export CXXFLAGS="%{optflags} -ffp-contract=off"
-%endif
-%endif
+autoreconf -i
%configure --with-momentum=GEV --with-length=MM --disable-static
make %{?_smp_mflags}
@@ -113,6 +109,14 @@ make check
%{?_licensedir: %license COPYING}
%changelog
+* Sun Jul 28 2019 Mattias Ellert <mattias.ellert(a)physics.uu.se> - 2.06.10-1
+- Update to version 2.06.10
+- Drop patches - all fixed in the new version
+- Drop the -ffp-contract=off hack
+- Remove redundant m_outstream->setf(std::ios::fixed)
+- Fix GenEventCopmpare
+- Adjust expected test output for changes in the code
+
* Wed Jul 24 2019 Fedora Release Engineering <releng(a)fedoraproject.org> -
2.06.09-24
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
diff --git a/sources b/sources
index 9db317e..cfdc676 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c47627ced4255b40e731b8666848b087 HepMC-2.06.09.tar.gz
+SHA512 (HepMC-2.06.10.tar.gz) =
0f35e88eb488ef060e74993659c829efd07ebeb092a8e0b85af763097c04a4f67c3d2feeb065d266ef9b4f147a07b3ffe9515cc3812fc214a5ea7a0023f82e4b