4:16 p.m.
The package rpms/pythia8.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/pythia8.git/commit/?id=86dbc7184d....
Change:
-%ifarch %{arm}
Thanks.
Full change:
============
commit 86dbc7184dd1737b0e49715d6f211e0b81811113
Author: Mattias Ellert <mattias.ellert(a)physics.uu.se>
Date: Thu Mar 18 22:12:33 2021 +0100
Update to version 8.3.03
diff --git a/pythia8-makefile.patch b/pythia8-makefile.patch
index c4e14c1..feec857 100644
--- a/pythia8-makefile.patch
+++ b/pythia8-makefile.patch
@@ -1,68 +1,71 @@
-diff -ur pythia8243.orig/Makefile pythia8243/Makefile
---- pythia8243.orig/Makefile 2019-07-05 11:02:34.000000000 +0200
-+++ pythia8243/Makefile 2019-07-05 20:12:08.875161403 +0200
-@@ -64,19 +64,19 @@
- endif
+diff -ur pythia8303.orig/Makefile pythia8303/Makefile
+--- pythia8303.orig/Makefile 2020-09-01 13:37:05.000000000 +0200
++++ pythia8303/Makefile 2021-03-18 14:48:44.494291570 +0100
+@@ -36,7 +36,7 @@
+ LOCAL_MKDIRS:=$(shell mkdir -p $(LOCAL_TMP) $(LOCAL_LIB))
+ CXX_COMMON:=-I$(LOCAL_INCLUDE) $(CXX_COMMON)
+ OBJ_COMMON:=-MD $(CXX_COMMON) $(OBJ_COMMON)
+-LIB_COMMON=-Wl,-rpath,$(PREFIX_LIB) -ldl $(GZIP_LIB)
++LIB_COMMON=-ldl $(GZIP_LIB)
- # Python.
--PYTHON_COMMON=-I$(PYTHON_INCLUDE) $(CXX_COMMON) -Wl,-rpath,$(PREFIX_LIB)
-+PYTHON_COMMON=-I$(PYTHON_INCLUDE) $(CXX_COMMON)
- ifeq ($(PYTHON_USE),true)
- TARGETS+=$(LOCAL_LIB)/_pythia8.so
- endif
-
- # GZIP.
- OBJ_COMMON=-MD $(CXX_COMMON)
--LIB_COMMON=-Wl,-rpath,$(PREFIX_LIB) -ldl
-+LIB_COMMON=-ldl
- ifeq ($(GZIP_USE),true)
- PYTHON_COMMON+= -DGZIPSUPPORT -I$(GZIP_INCLUDE)
-- PYTHON_COMMON+= -L$(GZIP_LIB) -Wl,-rpath,$(GZIP_LIB) -lz
-+ PYTHON_COMMON+= -L$(GZIP_LIB) -lz
- OBJ_COMMON+= -DGZIPSUPPORT -I$(GZIP_INCLUDE)
-- LIB_COMMON+= -L$(GZIP_LIB) -Wl,-rpath,$(GZIP_LIB) -lz
-+ LIB_COMMON+= -L$(GZIP_LIB) -lz
- endif
-
- ################################################################################
-@@ -117,23 +117,23 @@
- $(LOCAL_TMP)/LHAPDF%Plugin.o: $(LOCAL_INCLUDE)/Pythia8Plugins/LHAPDF%.h
- $(CXX) -x c++ $< -o $@ -c -MD -w $(CXX_LHAPDF)
- $(LOCAL_LIB)/libpythia8lhapdf5.so: $(LOCAL_TMP)/LHAPDF5Plugin.o\
-- $(LOCAL_LIB)/libpythia8.a
-+ $(LOCAL_LIB)/libpythia8$(LIB_SUFFIX)
- $(CXX) $^ -o $@ $(CXX_COMMON) $(CXX_SHARED) $(CXX_SONAME)$(notdir $@)\
-- -L$(LHAPDF5_LIB) -Wl,-rpath,$(LHAPDF5_LIB) -lLHAPDF -lgfortran
-+ -L$(LHAPDF5_LIB) -lLHAPDF -lgfortran
- $(LOCAL_LIB)/libpythia8lhapdf6.so: $(LOCAL_TMP)/LHAPDF6Plugin.o\
-- $(LOCAL_LIB)/libpythia8.a
-+ $(LOCAL_LIB)/libpythia8$(LIB_SUFFIX)
- $(CXX) $^ -o $@ $(CXX_COMMON) $(CXX_SHARED) $(CXX_SONAME)$(notdir $@)\
-- -L$(LHAPDF6_LIB) -Wl,-rpath,$(LHAPDF6_LIB) -lLHAPDF
-+ -L$(LHAPDF6_LIB) -lLHAPDF
+ # PYTHIA.
+ OBJECTS=$(patsubst $(LOCAL_SRC)/%.cc,$(LOCAL_TMP)/%.o,\
+@@ -108,7 +108,7 @@
+ $(LOCAL_LIB)/libpythia8lhapdf%.so: $(LOCAL_TMP)/LHAPDF%Plugin.o\
+ $(LOCAL_LIB)/libpythia8$(LIB_SUFFIX)
+ $(CXX) $< -o $@ $(CXX_COMMON) $(CXX_SHARED) $(CXX_SONAME)$(notdir $@)\
+- $(LHAPDF$*_LIB) -lLHAPDF -Llib -lpythia8
++ $(LHAPDF$*_LIB) -lLHAPDF $(LOCAL_LIB)/libpythia8$(LIB_SUFFIX)
# POWHEG (exclude any executable ending with sh).
- $(LOCAL_TMP)/POWHEGPlugin.o: $(LOCAL_INCLUDE)/Pythia8Plugins/LHAPowheg.h
- $(CXX) -x c++ $< -o $@ -c -MD -w $(CXX_COMMON)
- $(LOCAL_LIB)/libpythia8powheg%sh.so: $(POWHEG_BIN)/%sh;
- $(LOCAL_LIB)/libpythia8powheg%.so: $(POWHEG_BIN)/% $(LOCAL_TMP)/POWHEGPlugin.o\
-- $(LOCAL_LIB)/libpythia8.a
-+ $(LOCAL_LIB)/libpythia8$(LIB_SUFFIX)
- ln -s $< $(notdir $<); $(CXX) $(notdir $<) $(LOCAL_TMP)/POWHEGPlugin.o\
-- $(LOCAL_LIB)/libpythia8.a -o $@ $(CXX_COMMON) $(CXX_SHARED)\
+ $(LOCAL_TMP)/LHAPowheg.o: $(LOCAL_INCLUDE)/Pythia8Plugins/LHAPowheg.h
+@@ -117,8 +117,8 @@
+ $(LOCAL_LIB)/libpythia8powheg%.so: $(POWHEG_BIN)% $(LOCAL_TMP)/LHAPowheg.o\
+ $(LOCAL_LIB)/libpythia8$(LIB_SUFFIX)
+ ln -s $< $(notdir $<); $(CXX) $(notdir $<) $(LOCAL_TMP)/LHAPowheg.o\
+- -o $@ $(CXX_COMMON) $(CXX_SHARED) -Llib -lpythia8\
- $(CXX_SONAME)$(notdir $@) -Wl,-rpath,$(POWHEG_BIN); rm $(notdir $<)
-+ $(LOCAL_LIB)/libpythia8$(LIB_SUFFIX) -o $@ $(CXX_COMMON) $(CXX_SHARED)\
++ -o $@ $(CXX_COMMON) $(CXX_SHARED) $(LOCAL_LIB)/libpythia8$(LIB_SUFFIX)\
+ $(CXX_SONAME)$(notdir $@); rm $(notdir $<)
- # Python (turn off all warnings for readability).
- $(LOCAL_LIB)/pythia8.py: $(LOCAL_INCLUDE)/Pythia8Plugins/PythonWrapper.h
-@@ -144,8 +144,7 @@
- $(LOCAL_LIB)/pythia8.py $(wildcard $(LOCAL_INCLUDE)/*/*.h) |\
- $(LOCAL_LIB)/libpythia8$(LIB_SUFFIX)
- $(CXX) -x c++ $< -o $@ -w $(PYTHON_COMMON) $(CXX_SHARED)\
-- -Wl,-undefined,dynamic_lookup -Wno-long-long\
-- $(CXX_SONAME)$(notdir $@) -L$(LOCAL_LIB) -lpythia8
-+ $(CXX_SONAME)$(notdir $@) $(LOCAL_LIB)/libpythia8$(LIB_SUFFIX)
+ # MG5 matrix element plugins.
+ mg5mes:
+diff -ur pythia8303.orig/plugins/python/Makefile pythia8303/plugins/python/Makefile
+--- pythia8303.orig/plugins/python/Makefile 2020-09-01 13:37:05.000000000 +0200
++++ pythia8303/plugins/python/Makefile 2021-03-18 16:50:47.170939604 +0100
+@@ -27,8 +27,9 @@
+ LOCAL_INCLUDE=include
+ LOCAL_MKDIRS:=$(shell mkdir -p $(LOCAL_TMP) $(TOP_LIB))
+ OBJ_COMMON=-MD $(CXX_COMMON) -Iinclude $(PYTHON_INCLUDE) -w -fpermissive
+-LIB_COMMON=-Wl,-rpath,$(TOP_LIB) -ldl $(GZIP_LIB)
++LIB_COMMON=-ldl $(GZIP_LIB)
+ PYTHIA=$(TOP_LIB)/libpythia8$(LIB_SUFFIX)
++PYTHON_EXT_SUFFIX=.so
+
+ # Determine the headers.
+ HEADERS=$(patsubst ../../include/Pythia8%.h,$(LOCAL_INCLUDE)/Pythia8%.h,\
+@@ -46,7 +47,7 @@
+ .PHONY: all clean
+
+ # All targets.
+-all: $(TOP_LIB)/pythia8.so
++all: $(TOP_LIB)/pythia8$(PYTHON_EXT_SUFFIX)
+
+ # PYTHIA library.
+ $(PYTHIA):
+@@ -68,11 +69,11 @@
+ $(CXX) $< -o $@ -c $(OBJ_COMMON)
+
+ # Build the library.
+-$(TOP_LIB)/pythia8.so: $(PYTHIA) $(HEADERS) $(OBJECTS)
++$(TOP_LIB)/pythia8$(PYTHON_EXT_SUFFIX): $(PYTHIA) $(HEADERS) $(OBJECTS)
+ $(CXX) $(OBJECTS) -o $@ $(CXX_COMMON) $(CXX_SHARED)\
+- $(CXX_SONAME)$(notdir $@) $(LIB_COMMON) -L$(TOP_LIB)\
+- -Wl,-rpath,$(PREFIX_LIB) -lpythia8 -Wl,-undefined,dynamic_lookup
++ $(CXX_SONAME)$(notdir $@) $(LIB_COMMON)\
++ $(PYTHIA) -Wl,-undefined,dynamic_lookup
- # Install (rsync is used for finer control).
- install: all
+ # Clean.
+ clean:
+- rm -rf $(LOCAL_TMP) $(TOP_LIB)/pythia8.so
++ rm -rf $(LOCAL_TMP) $(TOP_LIB)/pythia8$(PYTHON_EXT_SUFFIX)
diff --git a/pythia8-missing-header.patch b/pythia8-missing-header.patch
new file mode 100644
index 0000000..ab3a2a6
--- /dev/null
+++ b/pythia8-missing-header.patch
@@ -0,0 +1,11 @@
+diff -ur pythia8303.orig/src/Merging.cc pythia8303/src/Merging.cc
+--- pythia8303.orig/src/Merging.cc 2020-09-01 13:38:07.000000000 +0200
++++ pythia8303/src/Merging.cc 2021-03-18 20:48:45.956270630 +0100
+@@ -7,6 +7,7 @@
+ // Function definitions (not found in the header) for the Merging class.
+
+ #include "Pythia8/Merging.h"
++#include <limits>
+
+ namespace Pythia8 {
+
diff --git a/pythia8.spec b/pythia8.spec
index c7320d0..d82401a 100644
--- a/pythia8.spec
+++ b/pythia8.spec
@@ -6,21 +6,23 @@
%endif
Name: pythia8
-Version: 8.2.44
-Release: 3%{?dist}
+Version: 8.3.03
+Release: 1%{?dist}
Summary: Pythia Event Generator for High Energy Physics
License: GPLv2+
URL: http://home.thep.lu.se/~torbjorn/Pythia.html
-Source0: http://home.thep.lu.se/~torbjorn/pythia8/pythia8244.tgz
+Source0: http://home.thep.lu.se/~torbjorn/pythia8/pythia8303.tgz
# Link plugins to the shared library
# Remove rpath
Patch0: %{name}-makefile.patch
+# Add missing include statement (reported to upstream)
+Patch1: %{name}-missing-header.patch
-BuildRequires: make
+BuildRequires: make
+BuildRequires: gcc-c++
BuildRequires: lhapdf-devel
BuildRequires: zlib-devel
-BuildRequires: gcc-c++
%if %{buildpy2}
BuildRequires: python2-devel
%endif
@@ -109,61 +111,42 @@ BuildArch: noarch
This package provides documentation for Pythia 8.
%prep
-%setup -q -n pythia8244
+%setup -q -n pythia8303
%patch0 -p1
+%patch1 -p1
# Remove DOS end-of-line
dos2unix -k share/Pythia8/htmldoc/pythia.css \
- share/Pythia8/phpdoc/pythia.css \
- share/Pythia8/xmldoc/mrstlostarstar.00.dat
+ share/Pythia8/pdfdata/mrstlostarstar.00.dat
%build
./configure --prefix=%{_prefix} --prefix-lib=%{_libdir} \
--cxx-common="%{optflags} -std=c++11 -fPIC" \
- --cxx-shared="%{?__global_ldflags} -Wl,-z,defs -shared" \
+ --cxx-shared="%{?__global_ldflags} -shared" \
--lib-suffix="-%{version}.so" \
- --enable-shared \
--with-lhapdf6 \
--with-gzip
+
%make_build
ln -s libpythia8-%{version}.so lib/libpythia8.so
-make lib/pythia8.py PYTHON_BIN='#'
-mv lib/pythia8.py .
-
-%ifarch %{arm}
-# Reduce memory usage during compilation of the python module on 32 bit arm
-MEMSAVE=-g1
-%endif
-
%if %{buildpy2}
-mkdir py2
-PY2INC=$(pkg-config --cflags python2)
-PY2LIB=$(pkg-config --libs python2)
-g++ -x c++ include/Pythia8Plugins/PythonWrapper.h -c -o py2/PythonWrapper.o \
- ${PY2INC} -Iinclude %{optflags} -std=c++11 -fPIC -DGZIPSUPPORT $MEMSAVE
-g++ py2/PythonWrapper.o -Llib -lpythia8 -o py2/_pythia8.so \
- ${PY2LIB} -ldl %{?__global_ldflags} -shared
+%make_build python \
+ PYTHON_INCLUDE=$(%{__python2}-config --includes) \
+ PYTHON_EXT_SUFFIX=$(%{__python2}-config --extension-suffix) \
+ LOCAL_TMP=tmp-python-2
%endif
-mkdir py3
-PY3INC=$(pkg-config --cflags python3)
-PY3LIB=$(pkg-config --libs python3)
-PY3SOABI=$(%{__python3} -c "from distutils import sysconfig;
print(sysconfig.get_config_vars().get('SOABI'))")
-g++ -x c++ include/Pythia8Plugins/PythonWrapper.h -c -o py3/PythonWrapper.o \
- ${PY3INC} -Iinclude %{optflags} -std=c++11 -fPIC -DGZIPSUPPORT $MEMSAVE
-g++ py3/PythonWrapper.o -Llib -lpythia8 -o py3/_pythia8.${PY3SOABI}.so \
- ${PY3LIB} -ldl %{?__global_ldflags} -shared
+%make_build python \
+ PYTHON_INCLUDE=$(%{__python3}-config --includes) \
+ PYTHON_EXT_SUFFIX=$(%{__python3}-config --extension-suffix) \
+ LOCAL_TMP=tmp-python-%{python3_pkgversion}
%if %{?rhel}%{!?rhel:0} == 7
-mkdir py3oth
-PY3INC=$(pkg-config --cflags python-%{python3_other_version})
-PY3LIB=$(pkg-config --libs python-%{python3_other_version})
-PY3SOABI=$(%{__python3_other} -c "from distutils import sysconfig;
print(sysconfig.get_config_vars().get('SOABI'))")
-g++ -x c++ include/Pythia8Plugins/PythonWrapper.h -c -o py3oth/PythonWrapper.o \
- ${PY3INC} -Iinclude %{optflags} -std=c++11 -fPIC -DGZIPSUPPORT
-g++ py3oth/PythonWrapper.o -Llib -lpythia8 -o py3oth/_pythia8.${PY3SOABI}.so \
- ${PY3LIB} -ldl %{?__global_ldflags} -shared
+%make_build python \
+ PYTHON_INCLUDE=$(%{__python3_other}-config --includes) \
+ PYTHON_EXT_SUFFIX=$(%{__python3_other}-config --extension-suffix) \
+ LOCAL_TMP=tmp-python-%{python3_other_pkgversion}
%endif
%install
@@ -188,20 +171,20 @@ rm %{buildroot}%{_datadir}/Pythia8/examples/runmains
%if %{buildpy2}
mkdir -p %{buildroot}%{python2_sitearch}
-install -p -m 644 pythia8.py %{buildroot}%{python2_sitearch}
-install -p -m 755 py2/_pythia8.so %{buildroot}%{python2_sitearch}
+mv %{buildroot}%{_libdir}/pythia8$(%{__python2}-config --extension-suffix) \
+ %{buildroot}%{python2_sitearch}
touch %{buildroot}%{python2_sitearch}/%{name}-%{version}.egg-info
%endif
mkdir -p %{buildroot}%{python3_sitearch}
-install -p -m 644 pythia8.py %{buildroot}%{python3_sitearch}
-install -p -m 755 py3/_pythia8.*.so %{buildroot}%{python3_sitearch}
+mv %{buildroot}%{_libdir}/pythia8$(%{__python3}-config --extension-suffix) \
+ %{buildroot}%{python3_sitearch}
touch %{buildroot}%{python3_sitearch}/%{name}-%{version}.egg-info
%if %{?rhel}%{!?rhel:0} == 7
mkdir -p %{buildroot}%{python3_other_sitearch}
-install -p -m 644 pythia8.py %{buildroot}%{python3_other_sitearch}
-install -p -m 755 py3oth/_pythia8.*.so %{buildroot}%{python3_other_sitearch}
+mv %{buildroot}%{_libdir}/pythia8$(%{__python3_other}-config --extension-suffix) \
+ %{buildroot}%{python3_other_sitearch}
touch %{buildroot}%{python3_other_sitearch}/%{name}-%{version}.egg-info
%endif
@@ -226,33 +209,28 @@ touch
%{buildroot}%{python3_other_sitearch}/%{name}-%{version}.egg-info
%if %{buildpy2}
%files -n python2-%{name}
%{python2_sitearch}/%{name}-%{version}.egg-info
-%{python2_sitearch}/_pythia8.so
-%{python2_sitearch}/pythia8.py*
+%{python2_sitearch}/pythia8.so
%endif
%files -n python%{python3_pkgversion}-%{name}
%{python3_sitearch}/%{name}-%{version}.egg-info
-%{python3_sitearch}/_pythia8.*.so
-%{python3_sitearch}/pythia8.py
-%{python3_sitearch}/__pycache__/pythia8.*
+%{python3_sitearch}/pythia8.*.so
%if %{?rhel}%{!?rhel:0} == 7
%files -n python%{python3_other_pkgversion}-%{name}
%{python3_other_sitearch}/%{name}-%{version}.egg-info
-%{python3_other_sitearch}/_pythia8.*.so
-%{python3_other_sitearch}/pythia8.py
-%{python3_other_sitearch}/__pycache__/pythia8.*
+%{python3_other_sitearch}/pythia8.*.so
%endif
%files data
%dir %{_datadir}/Pythia8
+%{_datadir}/Pythia8/pdfdata
%{_datadir}/Pythia8/xmldoc
%license COPYING
%files examples
%dir %{_datadir}/Pythia8
%doc %{_datadir}/Pythia8/examples
-%doc %{_datadir}/Pythia8/outref
%license COPYING
%files doc
@@ -261,6 +239,9 @@ touch
%{buildroot}%{python3_other_sitearch}/%{name}-%{version}.egg-info
%license COPYING
%changelog
+* Sun Feb 14 2021 Mattias Ellert <mattias.ellert(a)physics.uu.se> - 8.3.03-1
+- Update to version 8.3.03
+
* Wed Jan 27 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 8.2.44-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
diff --git a/sources b/sources
index d98b583..6f72995 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (pythia8244.tgz) =
2edc9a8e2ee889ae46dd667d51c75e6a1c77ec4313cd9884d20ec50b95cef508bfedcd0ac296e360a9d1aa8ea6d07567e9b650af4e629f0d6267f1d6159e20c7
+SHA512 (pythia8303.tgz) =
a0dfaa36fdf09170e1140aa1385da066fbae39c91095d9785698cc44bab4e2e2c06cf57061775f00edea50927e6de12ff28a33437aa6129d535c79f0c85de7f5
commit f8f114a5e159d40e0dd7e8d9a75f7edea33b283b
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Wed Jan 27 08:58:51 2021 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/pythia8.spec b/pythia8.spec
index 51f2638..c7320d0 100644
--- a/pythia8.spec
+++ b/pythia8.spec
@@ -7,7 +7,7 @@
Name: pythia8
Version: 8.2.44
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Pythia Event Generator for High Energy Physics
License: GPLv2+
@@ -261,6 +261,9 @@ touch
%{buildroot}%{python3_other_sitearch}/%{name}-%{version}.egg-info
%license COPYING
%changelog
+* Wed Jan 27 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 8.2.44-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
* Sun Aug 23 2020 Mattias Ellert <mattias.ellert(a)physics.uu.se> - 8.2.44-2
- Add -std=c++11 for lhapdf 6.3
commit 79af01f8bb4e10b67a2de482c5f7825512f1356e
Author: Tom Stellard <tstellar(a)redhat.com>
Date: Fri Jan 8 19:42:53 2021 +0000
Add BuildRequires: make
https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot
diff --git a/pythia8.spec b/pythia8.spec
index 791aff7..51f2638 100644
--- a/pythia8.spec
+++ b/pythia8.spec
@@ -17,6 +17,7 @@ Source0: http://home.thep.lu.se/~torbjorn/pythia8/pythia8244.tgz
# Remove rpath
Patch0: %{name}-makefile.patch
+BuildRequires: make
BuildRequires: lhapdf-devel
BuildRequires: zlib-devel
BuildRequires: gcc-c++