diff --git a/.gitignore b/.gitignore index 15d85ae..59a25cb 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/opa-fm-10.11.0.2.1.tar.xz +SOURCES/v10.11.2.0.3.tar.gz diff --git a/.opa-fm.metadata b/.opa-fm.metadata index dcdf209..13c52d5 100644 --- a/.opa-fm.metadata +++ b/.opa-fm.metadata @@ -1 +1 @@ -5da4d907c7954a14731125cff633ad8cdd2f0b09 SOURCES/opa-fm-10.11.0.2.1.tar.xz +c8661307a5483120ce36aa1ce800cee496241dcd SOURCES/v10.11.2.0.3.tar.gz diff --git a/SPECS/opa-fm.spec b/SPECS/opa-fm.spec index ca52dfe..203be73 100644 --- a/SPECS/opa-fm.spec +++ b/SPECS/opa-fm.spec @@ -1,18 +1,20 @@ +# One of the steps this package's insane build system does is patching version +# strings in built binaries (MakeTools/patch_version/patch_version.c). +# The expected template of a version string (ICS_BUILD_VERSION from +# CodeVersion/code_version.c) is not found in binaries that contain a +# GetCodeVersion() call. I suspect LTO optimizes it away. +# Disabling LTO made the build work. +%global _lto_cflags %{nil} + Name: opa-fm Epoch: 1 -Version: 10.11.0.2.1 +Version: 10.11.2.0.3 Release: 1%{?dist} Summary: Intel Omni-Path Fabric Management Software -Group: System Environment/Daemons License: GPLv2 or BSD -Url: https://github.com/cornelisnetworks/opa-fm.git -# tarball created by: -# git clone https://github.com/cornelisnetworks/opa-fm.git -# cd opa-fm -# git archive --format=tar --prefix=opa-fm-%{version}/ \ -# 5d1f7ee32920b1b429e2f7699762514af47d9717 | xz > opa-fm-%{version}.tar.xz -Source0: %{name}-%{version}.tar.xz +Url: https://github.com/cornelisnetworks/opa-fm +Source0: https://github.com/cornelisnetworks/opa-fm/archive/refs/tags/v%{version}.tar.gz # bz1262327 needs Patch0002 Patch0002: 0001-Fix-well-known-tempfile-issue-in-script.patch @@ -25,9 +27,7 @@ BuildRequires: libibumad-devel BuildRequires: zlib-devel BuildRequires: gcc BuildRequires: gcc-c++ -Requires(post): systemd -Requires(preun): systemd -Requires(postun): systemd +BuildRequires: systemd-rpm-macros Requires: libhfi1 ExclusiveArch: x86_64 @@ -52,7 +52,7 @@ export CXXFLAGS='%{optflags} -std=gnu11' export release_COPT_Flags='%{optflags} -std=gnu11' export release_CCOPT_Flags='%{optflags} -std=gnu11' cd Esm -OPA_FEATURE_SET= ./fmbuild $BUILD_ARGS +OPA_FEATURE_SET=opa10 ./fmbuild $BUILD_ARGS %install BUILDDIR=%{_builddir} DESTDIR=%{buildroot} LIBDIR=%{_libdir} RPM_INS=n ./Esm/fm_install.sh @@ -85,6 +85,10 @@ chmod a-x %{buildroot}/%{_prefix}/share/opa-fm/opafm_src.xml %{_mandir}/man8/* %changelog +* Wed Feb 08 2023 Michal Schmidt - 10.11.2.0.3-1 +- Update to upstream version 10.11.2.0.3 +- Resolves: rhbz#2110931 + * Tue May 25 2021 Honggang Li - 10.11.0.2.1-1 - Rebase to upstream release 10.11.0.2.1 - Resolves: bz1921701, bz1959990