Repository navigation
Carry the tag's pf number in the source package's spec - #31
Merged
Merged
Conversation
A source package built from v6.8.2-pf4 failed in Copr. Copr rebuilds the source package from the spec it carries (rpmbuild -bs in mock, with no --define), and that spec still said pf 3, so it asked for kwin-v6.8.2-pf3.tar.gz, which the package does not have. The pf3 build worked only because 3 was the spec's default. build-fork-rpm.sh now builds from a copy of the spec with the tag's number written in as the default. Before building anything, it checks with rpmspec -P that the copy alone names the tag's archive. Tested in the fork's CI image. Before the change, the spec of the source package built from v6.8.2-pf4 parses alone to the pf3 archive. After it, the spec says pf 4 and parses to kwin-v6.8.2-pf4.tar.gz, and a rebuild from the source package alone (rpmbuild -bs, no --define) succeeds. Signed-off-by: Wisbendji Fimerlus <archledger236@gmail.com>
Codex Review Summary: ✅ CompletedThis comment shows the latest Codex review activity on this pull request.
ℹ️ About Codex in GitHubYour team has set up Codex to review pull requests in this repo. Reviews are triggered when you
Codex reacts with 👀 while any review is running, comments if it has suggestions, and reacts with 👍 once all reviews finish with no findings. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What
The source package
build-fork-rpm.shbuilds now carries the tag'spfnumber in its spec. Before, every source package carried the spec's defaultpf 3.Why
Copr build 11325448 of
v6.8.2-pf4failed after 25 seconds:Copr rebuilds the source package from the spec inside it (
rpmbuild -bsin mock), without the--define "pf N"the script passes. The spec's default%{!?pf:%global pf 3}then names the pf3 archive, but the package holdskwin-v6.8.2-pf4.tar.gz. The pf3 build worked only because 3 was the default.The change
build-fork-rpm.shbuilds from a copy of the spec with the tag's number written in as the default (%{!?pf:%global pf N}).rpmspec -Pthat the copy alone names the tag's archive.For pf3 the copy is the spec as it is.
Tests (the fork's CI image)
.../v6.8.2-pf3/kwin-v6.8.2-pf3.tar.gz, while the package holdskwin-v6.8.2-pf4.tar.gz.%{!?pf:%global pf 4}and parses alone to.../v6.8.2-pf4/kwin-v6.8.2-pf4.tar.gz. A rebuild from the source package alone (rpmbuild -bs, no--define) writeskwin-6.8.2-3.fc44.pf4.src.rpm.bash -nand ShellCheck (-S warning): clean.The pf4 source package from this branch went to Copr as the replacement for build 11325448. Its source is the same GitHub archive of the signed tag, and its spec differs only in the default line and its comment.