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=7f20abeedd....
Change:
-%ifarch ppc64
Thanks.
Full change:
============
commit 7f20abeedd87c86ef03a4ee8b3526159dc519e84
Author: Mattias Ellert <mattias.ellert(a)physics.uu.se>
Date: Sat Jul 6 04:15:44 2019 +0200
Update to version 8.2.43
Add Python 3 package for EPEL 6
Remove ppc64 specific conditionals (ppc64 no longer built in Fedora or EPEL)
diff --git a/pythia8-makefile.patch b/pythia8-makefile.patch
index 9bb2171..db495a3 100644
--- a/pythia8-makefile.patch
+++ b/pythia8-makefile.patch
@@ -1,7 +1,7 @@
-diff -ur pythia8235.orig/Makefile pythia8235/Makefile
---- pythia8235.orig/Makefile 2018-03-27 19:15:17.000000000 +0200
-+++ pythia8235/Makefile 2018-07-03 19:10:36.788514314 +0200
-@@ -58,19 +58,19 @@
+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
# Python.
@@ -25,9 +25,9 @@ diff -ur pythia8235.orig/Makefile pythia8235/Makefile
endif
################################################################################
-@@ -112,23 +112,23 @@
- $(CXX) -x c++ $< -o $@ -c -MD -w $(CXX_COMMON) -I$(LHAPDF$*_INCLUDE)\
- -I$(BOOST_INCLUDE)
+@@ -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)
@@ -56,7 +56,7 @@ diff -ur pythia8235.orig/Makefile pythia8235/Makefile
# Python (turn off all warnings for readability).
$(LOCAL_LIB)/pythia8.py: $(LOCAL_INCLUDE)/Pythia8Plugins/PythonWrapper.h
-@@ -139,8 +139,7 @@
+@@ -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)\
diff --git a/pythia8.spec b/pythia8.spec
index af32642..ed6756b 100644
--- a/pythia8.spec
+++ b/pythia8.spec
@@ -1,5 +1,6 @@
%if %{?rhel}%{!?rhel:0} == 6
%filter_provides_in %{python2_sitearch}/.*\.so$
+%filter_provides_in %{python3_sitearch}/.*\.so$
%filter_setup
%endif
@@ -7,27 +8,17 @@
# Don't build Python 2 package for Fedora >= 30
%global buildpy2 0
%else
-%if %{?rhel}%{!?rhel:0} == 6
-%ifarch ppc64
-# The Python 2 bindings can not be built on ppc64 for EPEL 6
-# Error: operand out of range
-%global buildpy2 0
-%else
-%global buildpy2 1
-%endif
-%else
%global buildpy2 1
%endif
-%endif
Name: pythia8
-Version: 8.2.35
-Release: 8%{?dist}
+Version: 8.2.43
+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/pythia8235.tgz
+Source0:
http://home.thep.lu.se/~torbjorn/pythia8/pythia8243.tgz
# Link plugins to the shared library
# Remove rpath
Patch0: %{name}-makefile.patch
@@ -41,11 +32,8 @@ BuildRequires: gcc-gfortran
%if %{buildpy2}
BuildRequires: python2-devel
%endif
-%if %{?fedora}%{!?fedora:0} || %{?rhel}%{!?rhel:0} >= 8
-BuildRequires: python3-devel
-%endif
-%if %{?rhel}%{!?rhel:0} == 7
BuildRequires: python%{python3_pkgversion}-devel
+%if %{?rhel}%{!?rhel:0} == 7
BuildRequires: python%{python3_other_pkgversion}-devel
%endif
BuildRequires: rsync
@@ -89,7 +77,6 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
This package provides the Python 2 bindings for Pythia 8.
%endif
-%if %{?fedora}%{!?fedora:0} || %{?rhel}%{!?rhel:0} >= 7
%package -n python%{python3_pkgversion}-%{name}
Summary: Pythia 8 Python 3 bindings
%{?python_provide:%python_provide python%{python3_pkgversion}-%{name}}
@@ -97,7 +84,6 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
%description -n python%{python3_pkgversion}-%{name}
This package provides the Python 3 bindings for Pythia 8.
-%endif
%if %{?rhel}%{!?rhel:0} == 7
%package -n python%{python3_other_pkgversion}-%{name}
@@ -131,7 +117,7 @@ BuildArch: noarch
This package provides documentation for Pythia 8.
%prep
-%setup -q -n pythia8235
+%setup -q -n pythia8243
%patch0 -p1
# Remove DOS end-of-line
@@ -139,8 +125,8 @@ dos2unix -k share/Pythia8/htmldoc/pythia.css \
share/Pythia8/phpdoc/pythia.css \
share/Pythia8/xmldoc/mrstlostarstar.00.dat
-# Fix wrong file permissions
-chmod 644 share/Pythia8/xmldoc/GKG18_*.dat
+# Remove junk
+find . -name '._*' -exec rm {} ';'
%build
./configure --prefix=%{_prefix} --prefix-lib=%{_libdir} \
@@ -182,7 +168,6 @@ g++ py2/PythonWrapper.o -Llib -lpythia8 -o py2/_pythia8.so \
${PY2LIB} -ldl %{?__global_ldflags} -Wl,-z,defs -shared
%endif
-%if %{?fedora}%{!?fedora:0} || %{?rhel}%{!?rhel:0} >= 7
mkdir py3
if pkg-config --exists python3-embed ; then
PY3INC=$(pkg-config --cflags python3-embed)
@@ -196,7 +181,6 @@ g++ -x c++ include/Pythia8Plugins/PythonWrapper.h -c -o
py3/PythonWrapper.o \
${PY3INC} -Iinclude %{optflags} -fPIC -DGZIPSUPPORT $MEMSAVE
g++ py3/PythonWrapper.o -Llib -lpythia8 -o py3/_pythia8.${PY3SOABI}.so \
${PY3LIB} -ldl %{?__global_ldflags} -Wl,-z,defs -shared
-%endif
%if %{?rhel}%{!?rhel:0} == 7
mkdir py3oth
@@ -241,12 +225,10 @@ install -p -m 755 py2/_pythia8.so %{buildroot}%{python2_sitearch}
touch %{buildroot}%{python2_sitearch}/%{name}-%{version}.egg-info
%endif
-%if %{?fedora}%{!?fedora:0} || %{?rhel}%{!?rhel:0} >= 7
mkdir -p %{buildroot}%{python3_sitearch}
install -p -m 644 pythia8.py %{buildroot}%{python3_sitearch}
install -p -m 755 py3/_pythia8.*.so %{buildroot}%{python3_sitearch}
touch %{buildroot}%{python3_sitearch}/%{name}-%{version}.egg-info
-%endif
%if %{?rhel}%{!?rhel:0} == 7
mkdir -p %{buildroot}%{python3_other_sitearch}
@@ -280,13 +262,11 @@ touch
%{buildroot}%{python3_other_sitearch}/%{name}-%{version}.egg-info
%{python2_sitearch}/pythia8.py*
%endif
-%if %{?fedora}%{!?fedora:0} || %{?rhel}%{!?rhel:0} >= 7
%files -n python%{python3_pkgversion}-%{name}
%{python3_sitearch}/%{name}-%{version}.egg-info
%{python3_sitearch}/_pythia8.*.so
%{python3_sitearch}/pythia8.py
%{python3_sitearch}/__pycache__/pythia8.*
-%endif
%if %{?rhel}%{!?rhel:0} == 7
%files -n python%{python3_other_pkgversion}-%{name}
@@ -313,6 +293,11 @@ touch
%{buildroot}%{python3_other_sitearch}/%{name}-%{version}.egg-info
%license COPYING
%changelog
+* Fri Jul 05 2019 Mattias Ellert <mattias.ellert(a)physics.uu.se> - 8.2.43-1
+- Update to version 8.2.43
+- Add Python 3 package for EPEL 6
+- Remove ppc64 specific conditionals (ppc64 no longer built in Fedora or EPEL)
+
* Tue Jun 11 2019 Mattias Ellert <mattias.ellert(a)physics.uu.se> - 8.2.35-8
- Use python-embed pkg-config module if it exists (python 3.8 compatibility)
diff --git a/sources b/sources
index ca0d064..a9c6bf1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (pythia8235.tgz) =
61bfc653f07955aa562e41cb78fff49947646c07efb5496ae0bc8cc9b90bb6b5ef9a705cb4a44067d22bd044523ea1549415f84aa9f39b1d9630f5732306f255
+SHA512 (pythia8243.tgz) =
abb458218ebbe4e80a56d6b954312bbeeb153ff521d8745dcd4d3bc80a93e9c47840ad0a1df3a4b22ae7b72ad4a715481abcd12fab7abf8ba098770b0e472df8