[CI:BUILD] rpm: spec file updates from Fedora dist-git #21839
Conversation
The spec file had
%if %{defined rhel} && 0%{?rhel} < 10
%define gobuild(o:) ...
%endif
...
%if !%{defined gobuild}
BuildRequires: go-rpm-macros
%endif
The intent apparently was to use BR:go-rpm-macros where available, and define
%gobuild as a fallback where they are not available. This was unreliable,
because the package may have been installed already, and then %gobuild would be
defined when the srpm was being built, and then the srpm would NOT have the BR.
Instead, use the same condition to wrap the definition of %gobuild and the BR
lines to that the BR is always emitted when appropriate.
From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
This is a copy-paste of commit be971d6fb in podman fedora dist-git.
[NO NEW TESTS NEEDED]
Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: lsm5 The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
openshift-ci
bot
added
the
approved
|
Ephemeral COPR build failed. @containers/packit-build please check. |
1 similar comment
|
Ephemeral COPR build failed. @containers/packit-build please check. |
Use $SOURCE_DATE_EPOCH instead of the current date Using the current timestamp makes every build slightly different, breaking build reproducibility. From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> This is a copy-paste of commit a87dd6f50 in podman fedora dist-git. [NO NEW TESTS NEEDED] Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>
Looks like epel 8 builds do not work with this? |
@Luap99 yes, I'm checking with Zbigniew on that. Worst case I could revert to the older format on epel8 |
At least in all recent Fedora releases, SOURCE_DATE_EPOCH would be set. But the build should work even if it not set, e.g. in copr builds on c8s. Add 'date +%s' as a fallback. From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> This is a copy-paste of commit eaa62a52 in podman fedora dist-git. [NO NEW TESTS NEEDED] Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>
|
Cockpit tests failed for commit 50a0c51. @martinpitt, @jelly, @mvollmer please check. |
|
LGTM |
|
/lgtm |
stale-locking-app
bot
added
the
locked - please file new issue/PR
Does this PR introduce a user-facing change?
Ref: https://src.fedoraproject.org/rpms/podman/pull-request/131#commit_list