Hello community, here is the log from the commit of package SHERPA-MC for openSUSE:Factory checked in at 2016-06-21 11:30:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/SHERPA-MC (Old) and /work/SRC/openSUSE:Factory/.SHERPA-MC.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "SHERPA-MC" Changes: -------- --- /work/SRC/openSUSE:Factory/SHERPA-MC/SHERPA-MC.changes 2014-07-02 15:04:41.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.SHERPA-MC.new/SHERPA-MC.changes 2016-06-21 12:29:17.000000000 +0200 @@ -1,0 +2,12 @@ +Sun Jun 19 09:30:25 UTC 2016 - [email protected] + +- RPM group classification +- run install_info in preun to avoid errors of missing files +- Shared library subpackage is supposed to include the number + +------------------------------------------------------------------- +Thu Jun 16 12:12:35 UTC 2016 - [email protected] + +- new gcc6_char_cast.patch + +------------------------------------------------------------------- New: ---- gcc6_char_cast.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ SHERPA-MC.spec ++++++ --- /var/tmp/diff_new_pack.Wu4lcB/_old 2016-06-21 12:29:18.000000000 +0200 +++ /var/tmp/diff_new_pack.Wu4lcB/_new 2016-06-21 12:29:18.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package SHERPA-MC # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,7 +16,7 @@ # -%define soname lib%{name} +%define soname lib%{name}0 Name: SHERPA-MC Version: 2.1.1 @@ -26,6 +26,7 @@ Group: Development/Libraries/C and C++ Url: https://sherpa.hepforge.org/ Source: http://www.hepforge.org/archive/sherpa/%{name}-%{version}.tar.gz +Patch1: gcc6_char_cast.patch BuildRequires: HepMC-devel BuildRequires: LHAPDF-devel BuildRequires: Rivet-devel @@ -70,7 +71,9 @@ %package -n %soname Summary: MC event generator for Simulation of High-Energy Reactions of PArticles -Group: Development/Libraries/C and C++ +Group: System/Libraries +Obsoletes: libSHERPA-MC < %version-%release +Provides: libSHERPA-MC = %version-%release %description -n %soname Sherpa is a Monte Carlo event generator for the Simulation of @@ -102,7 +105,7 @@ %package -n python-%{name} Summary: Python extensions for SHERPA-MC -Group: Development/Libraries/C and C++ +Group: Development/Languages/Python %description -n python-%{name} Sherpa is a Monte Carlo event generator for the Simulation of @@ -117,6 +120,7 @@ %prep %setup -q +%patch1 -p1 %build %configure \ @@ -147,16 +151,14 @@ %fdupes %{buildroot}%{_datadir}/%{name}/ %fdupes %{buildroot}%{python_sitelib}/ -%post -n %soname -/sbin/ldconfig +%post -n %soname -p /sbin/ldconfig %post devel %install_info --info-dir=%{_infodir} %{_infodir}/Sherpa.*.gz -%postun -n %soname -/sbin/ldconfig +%postun -n %soname -p /sbin/ldconfig -%postun devel +%preun devel %install_info_delete --info-dir=%{_infodir} %{_infodir}/Sherpa.*.gz %files -n %soname ++++++ gcc6_char_cast.patch ++++++ --- MODEL/Interaction_Models/Vertex.C | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) Index: SHERPA-MC-2.1.1/MODEL/Interaction_Models/Vertex.C =================================================================== --- SHERPA-MC-2.1.1.orig/MODEL/Interaction_Models/Vertex.C +++ SHERPA-MC-2.1.1/MODEL/Interaction_Models/Vertex.C @@ -444,10 +444,10 @@ int Vertex::SetVertex(Single_Vertex& ori void Vertex::ColorExchange(Color_Function* colfunc,int new0,int new1,int new2,int new3) { //T[0,1,2] -> T[new0,new1,new2] - int partarg[3] ={-1,-1,-1}; - char strarg[3] ={-1,-1,-1}; - int partargn[3] ={-1,-1,-1}; - char strargn[3] ={-1,-1,-1}; + int partarg[3] ={(char)-1,(char)-1,(char)-1}; + char strarg[3] ={(char)-1,(char)-1,(char)-1}; + int partargn[3] ={(char)-1,(char)-1,(char)-1}; + char strargn[3] ={(char)-1,(char)-1,(char)-1}; for (short int i=0;i<3;i++) { if (colfunc->Type()==cf::D && i==2) break;
