Modernize RPM macro comments and conditional building#111
Merged
michaelherger merged 2 commits intoJun 26, 2026
Conversation
- Drop mention of obsolete RPM macros _branch, _rpm_date and _src_date. It looks like we haven’t made use of these for many years. - Mention the _revision macro. Signed-off-by: Peter Oliver <git@mavit.org.uk>
The %bcond macro requires rpmbuild 4.17.1 (released 2022). https://rpm-software-management.github.io/rpm/manual/conditionalbuilds.html#using-bcond-new-in-rpm-4171 Signed-off-by: Peter Oliver <git@mavit.org.uk>
Member
|
@JohanSaaw - may I ask you to give this a minute? Thanks! |
Comment on lines
+7
to
+8
| # The following is required with trunk or branch: | ||
| # %%define _revision 1781670901 |
Member
There was a problem hiding this comment.
The revision number would change all the time. Can this be provided by the build script?
Contributor
Author
There was a problem hiding this comment.
It is provided by the build script. These comments simply provide examples of plausible values.
Member
|
Thanks! |
Contributor
|
Hi, I was on holidays the last weeks and I didn't check github in that time. I assume that the request for a review is now obsolete as the pull request has been merged. |
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
3 participants
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.
%_branch,%_rpm_dateand%_src_date. It looks like we haven’t made use of these for many years.%_revisionmacro.%build_trunk,%build_branchand%build_releasemacros, in favour of the standard%{with …}macro.%_with_trunk,%_with_branchand%_with_release, using the%bcondmacro.The
%bcondmacro requiresrpmbuild4.17.1 (released 2022).