Bug 16962 - [PATCH] Adjust %mkrel to be able to use %dist when defined
Summary: [PATCH] Adjust %mkrel to be able to use %dist when defined
Status: RESOLVED FIXED
Alias: None
Product: Mageia
Classification: Unclassified
Component: RPM Packages (show other bugs)
Version: Cauldron
Hardware: All Linux
Priority: Normal enhancement
Target Milestone: ---
Assignee: Thierry Vignaud
QA Contact:
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2015-10-14 11:36 CEST by Neal Gompa
Modified: 2015-11-07 13:49 CET (History)
1 user (show)

See Also:
Source RPM: rpm-mageia-setup-2.13-2.mga6.src.rpm
CVE:
Status comment:


Attachments
%mkrel restructure patch (git formatted) (1.39 KB, patch)
2015-10-14 11:37 CEST, Neal Gompa
Details | Diff
Revised %mkrel restructure patch (git formatted) (1.39 KB, patch)
2015-10-26 02:49 CET, Neal Gompa
Details | Diff

Description Neal Gompa 2015-10-14 11:36:04 CEST
This enhancement bug filing is to provide a patch to rpm-setup git repository[0] that adjusts %mkrel to use %dist if it is defined.

[0]: http://gitweb.mageia.org/software/rpm/rpm-setup/

Reproducible: 

Steps to Reproduce:
Comment 1 Neal Gompa 2015-10-14 11:37:07 CEST
Created attachment 7123 [details]
%mkrel restructure patch (git formatted)

Patch attached
Comment 2 Neal Gompa 2015-10-25 23:55:41 CET
Thierry,

Have you had a chance to review this patch for inclusion in rpm-setup?
Comment 3 Neal Gompa 2015-10-26 02:49:59 CET
Created attachment 7167 [details]
Revised %mkrel restructure patch (git formatted)

Slightly revised it to make it clear that the dist identity submacro is intended to be an internal one.

Attachment 7123 is obsolete: 0 => 1

Comment 4 Colin Guthrie 2015-11-07 11:15:03 CET
This looks good to me. Thierry already acked it in principle, so I say you can push it if you like.

You should have permissions to push to git I think, but ping me if not. Just make sure to update the NEWS file with your change too - just a single line. Then, if you want to push it as a package into cauldron, do a second commit to bump the version (in configure.ac - and update NEWS again too!) and then you can push your changes and then, do a git tag and push that too (better to do in two steps as pushing a tag without first pushing master is bad!)

Obviously the above is somewhat predicated on having tested it as a package. In order to create the tarball, run ./autogen.sh && ./configure && make dist and the tarball will be in your folder. Then just add it to the package like any other.

Note that the spec itself also has some hard coded macros for mkrel etc. I don't *think* it's too important to support %{dist} here, but it should probably be mentioned in a comment as to why it deviates from the "official" definition (or if you want to update it to use dist that's fine too, but we probably don't want the leaking dist_itent in this inline definition).

Anyway, in short, looks good, Ship it! :)

CC: (none) => mageia

Comment 5 Neal Gompa 2015-11-07 13:49:23 CET
Changes pushed to git, updated package committed to SVN, built, and uploaded.

Status: NEW => RESOLVED
Resolution: (none) => FIXED


Note You need to log in before you can comment on or make changes to this bug.