The package rpms/HepMC3.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/HepMC3.git/commit/?id=13b0e062b2a....
Change:
-%ifnarch s390x
Thanks.
Full change:
============
commit 13b0e062b2ab18f268f385bb570d73fd1a7579e7
Author: Mattias Ellert <mattias.ellert(a)physics.uu.se>
Date: Mon Aug 23 10:46:39 2021 +0200
Rebuild for root 6.24.02
Build rootIO module also for s390x
Reenable valgrind tests
diff --git a/HepMC3.spec b/HepMC3.spec
index 7d5bea4..b5a6555 100644
--- a/HepMC3.spec
+++ b/HepMC3.spec
@@ -3,7 +3,7 @@
Name: HepMC3
Version: 3.2.4
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: C++ Event Record for Monte Carlo Generators
License: GPLv3+
@@ -18,12 +18,10 @@ BuildRequires: cmake >= 3.9
%endif
BuildRequires: make
BuildRequires: gcc-c++
-%ifnarch s390x
BuildRequires: root-core
BuildRequires: root-hist
BuildRequires: root-io
BuildRequires: root-tree
-%endif
BuildRequires: doxygen
BuildRequires: graphviz
%if %{?rhel}%{!?rhel:0} == 7
@@ -73,7 +71,6 @@ Requires: %{name}-devel%{?_isa} = %{version}-%{release}
%description search-devel
This package provides development files for %{name}-search.
-%ifnarch s390x
%package rootIO
Summary: C++ Event Record for Monte Carlo Generators - ROOT IO
Requires: %{name}%{?_isa} = %{version}-%{release}
@@ -88,7 +85,6 @@ Requires: %{name}-devel%{?_isa} = %{version}-%{release}
%description rootIO-devel
This package provides development files for %{name}-rootIO.
-%endif
%package interfaces-devel
Summary: C++ Event Record for Monte Carlo Generators - generator interfaces
@@ -116,7 +112,6 @@ Requires: python2-%{name}%{?_isa} = %{version}-%{release}
%description -n python2-%{name}-search
This package provides the Python 2 bindings for HepMC3 search module.
-%ifnarch s390x
%package -n python2-%{name}-rootIO
Summary: HepMC3 ROOT I/O module Python 2 bindings
%{?python_provide:%python_provide python2-%{name}-rootIO}
@@ -125,7 +120,6 @@ Requires: python2-%{name}%{?_isa} = %{version}-%{release}
%description -n python2-%{name}-rootIO
This package provides the Python 2 bindings for HepMC3 ROOT I/O module.
-%endif
%package -n python%{python3_other_pkgversion}-%{name}
Summary: HepMC3 Python 3 bindings
@@ -144,7 +138,6 @@ Requires: python%{python3_other_pkgversion}-%{name}%{?_isa} =
%{version}-%{relea
%description -n python%{python3_other_pkgversion}-%{name}-search
This package provides the Python 3 bindings for HepMC3 search module.
-%ifnarch s390x
%package -n python%{python3_other_pkgversion}-%{name}-rootIO
Summary: HepMC3 ROOT I/O module Python 3 bindings
%{?python_provide:%python_provide python%{?python3_other_pkgversion}-%{name}-rootIO}
@@ -154,7 +147,6 @@ Requires: python%{python3_other_pkgversion}-%{name}%{?_isa} =
%{version}-%{relea
%description -n python%{python3_other_pkgversion}-%{name}-rootIO
This package provides the Python 3 bindings for HepMC3 ROOT I/O module.
%endif
-%endif
%package -n python%{python3_pkgversion}-%{name}
Summary: HepMC3 Python 3 bindings
@@ -173,7 +165,6 @@ Requires: python%{python3_pkgversion}-%{name}%{?_isa} =
%{version}-%{release}
%description -n python%{python3_pkgversion}-%{name}-search
This package provides the Python 3 bindings for HepMC3 search module.
-%ifnarch s390x
%package -n python%{python3_pkgversion}-%{name}-rootIO
Summary: HepMC3 ROOT I/O module Python 3 bindings
%{?python_provide:%python_provide python%{python3_pkgversion}-%{name}-rootIO}
@@ -182,7 +173,6 @@ Requires: python%{python3_pkgversion}-%{name}%{?_isa} =
%{version}-%{release}
%description -n python%{python3_pkgversion}-%{name}-rootIO
This package provides the Python 3 bindings for HepMC3 ROOT I/O module.
-%endif
%package doc
Summary: C++ Event Record for Monte Carlo Generators - documentation
@@ -196,12 +186,8 @@ This package provides HepMC manuals and examples.
%build
%cmake3 \
-%ifnarch s390x
-DHEPMC3_ENABLE_ROOTIO:BOOL=ON \
-DHEPMC3_ROOTIO_INSTALL_LIBDIR:PATH=%{_libdir}/root \
-%else
- -DHEPMC3_ENABLE_ROOTIO:BOOL=OFF \
-%endif
-DHEPMC3_ENABLE_TEST:BOOL=ON \
-DHEPMC3_INSTALL_INTERFACES:BOOL=ON \
-DHEPMC3_INSTALL_EXAMPLES:BOOL=ON \
@@ -212,6 +198,7 @@ This package provides HepMC manuals and examples.
%endif
-DHEPMC3_BUILD_DOCS:BOOL=ON \
-DHEPMC3_BUILD_STATIC_LIBS:BOOL=OFF \
+ -DHEPMC3_TEST_VALGRIND:BOOL=ON \
-DCMAKE_INSTALL_DOCDIR:PATH=%{_pkgdocdir} \
-DCMAKE_SKIP_INSTALL_RPATH:BOOL=ON
%cmake3_build
@@ -224,9 +211,7 @@ This package provides HepMC manuals and examples.
%ldconfig_scriptlets
%ldconfig_scriptlets search
-%ifnarch s390x
%ldconfig_scriptlets rootIO
-%endif
%files
%{_libdir}/libHepMC3.so.3
@@ -295,7 +280,6 @@ This package provides HepMC manuals and examples.
%{_includedir}/%{name}/Relatives.h
%{_includedir}/%{name}/Selector.h
-%ifnarch s390x
%files rootIO
%{_libdir}/root/libHepMC3rootIO.so.3
# unversioned symlink is used at runtime when library is used as a ROOT plugin
@@ -308,7 +292,6 @@ This package provides HepMC manuals and examples.
%{_includedir}/%{name}/ReaderRootTree.h
%{_includedir}/%{name}/WriterRoot.h
%{_includedir}/%{name}/WriterRootTree.h
-%endif
%files interfaces-devel
%{_datadir}/%{name}/interfaces
@@ -326,13 +309,11 @@ This package provides HepMC manuals and examples.
%{python2_sitearch}/pyHepMC3/search/pyHepMC3search.so
%{python2_sitearch}/pyHepMC3.search-*.egg-info
-%ifnarch s390x
%files -n python2-%{name}-rootIO
%dir %{python2_sitearch}/pyHepMC3/rootIO
%{python2_sitearch}/pyHepMC3/rootIO/__init__.py*
%{python2_sitearch}/pyHepMC3/rootIO/pyHepMC3rootIO.so
%{python2_sitearch}/pyHepMC3.rootIO-*.egg-info
-%endif
%files -n python%{python3_other_pkgversion}-%{name}
%dir %{python3_other_sitearch}/pyHepMC3
@@ -348,7 +329,6 @@ This package provides HepMC manuals and examples.
%{python3_other_sitearch}/pyHepMC3/search/pyHepMC3search.so
%{python3_other_sitearch}/pyHepMC3.search-*.egg-info
-%ifnarch s390x
%files -n python%{python3_other_pkgversion}-%{name}-rootIO
%dir %{python3_other_sitearch}/pyHepMC3/rootIO
%{python3_other_sitearch}/pyHepMC3/rootIO/__init__.py
@@ -356,7 +336,6 @@ This package provides HepMC manuals and examples.
%{python3_other_sitearch}/pyHepMC3/rootIO/pyHepMC3rootIO.so
%{python3_other_sitearch}/pyHepMC3.rootIO-*.egg-info
%endif
-%endif
%files -n python%{python3_pkgversion}-%{name}
%dir %{python3_sitearch}/pyHepMC3
@@ -372,14 +351,12 @@ This package provides HepMC manuals and examples.
%{python3_sitearch}/pyHepMC3/search/pyHepMC3search.so
%{python3_sitearch}/pyHepMC3.search-*.egg-info
-%ifnarch s390x
%files -n python%{python3_pkgversion}-%{name}-rootIO
%dir %{python3_sitearch}/pyHepMC3/rootIO
%{python3_sitearch}/pyHepMC3/rootIO/__init__.py
%{python3_sitearch}/pyHepMC3/rootIO/__pycache__
%{python3_sitearch}/pyHepMC3/rootIO/pyHepMC3rootIO.so
%{python3_sitearch}/pyHepMC3.rootIO-*.egg-info
-%endif
%files doc
%dir %{_pkgdocdir}
@@ -388,6 +365,11 @@ This package provides HepMC manuals and examples.
%license COPYING
%changelog
+* Mon Aug 23 2021 Mattias Ellert <mattias.ellert(a)physics.uu.se> - 3.2.4-3
+- Rebuild for root 6.24.02
+- Build rootIO module also for s390x
+- Reenable valgrind tests
+
* Wed Jul 21 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.2.4-2
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
commit 01b7b01089e72a44437ac62b0d82a62c9cca7437
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Wed Jul 21 15:50:44 2021 +0000
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/HepMC3.spec b/HepMC3.spec
index 0a766b0..7d5bea4 100644
--- a/HepMC3.spec
+++ b/HepMC3.spec
@@ -3,7 +3,7 @@
Name: HepMC3
Version: 3.2.4
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: C++ Event Record for Monte Carlo Generators
License: GPLv3+
@@ -388,6 +388,9 @@ This package provides HepMC manuals and examples.
%license COPYING
%changelog
+* Wed Jul 21 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.2.4-2
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
* Wed Jul 07 2021 Mattias Ellert <mattias.ellert(a)physics.uu.se> - 3.2.4-1
- Update to version 3.2.4
- Drop patches accepted upstream or previously backported
commit 7945a2e1b4b27296a346acc5b8dfc48d88969f0f
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Wed Jul 21 10:56:06 2021 +0000
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>