Spec file fix and cleanups - #36
Merged
Merged
Conversation
Signed-off-by: Philipp Rudo <prudo@redhat.com>
With 23df04b ("dracut: create sub-directories for dracut modules") the dracut modules were moved to subdirectories. This causes problems when someone wants to include a patch to the spec file to change one of the files in those subdirectories. Reason is that '%autosetup' in the spec file calls 'patch' per default. 'patch' however, will strip all directories when it is called without option -p. Which means that it will search the file in the root directory and then fail because it cannot find it. Thus add option -p1 to '%autosetup' which will be passed on to 'patch'. Choose -p1 as that will work with the most common patch creation tools like git and packit. Signed-off-by: Philipp Rudo <prudo@redhat.com>
These patch files are a left over from the original import and patch kexec-tools and makedumpfile, which are now in separate rpms. In addition, these patches are not mentioned in the spec file. So simply remove them. Signed-off-by: Philipp Rudo <prudo@redhat.com>
Simplify managing the spec file by using %autorelease and %autochangelog. This commit was generated by $ rpmautospec convert kdump-utils.spec [skip changelog] Signed-off-by: Philipp Rudo <prudo@redhat.com>
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
2 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.
This series is a follow-up from the changes included in PR #33. In particular I noticed when backporting the patches to RHEL that building the rpm failed as
rpmbuildwas trying to patch the wrong file. That's because the spec file contains%autospecwithout option-p. This will causepatchto strip all directories from the path, which ultimately means that only files in the root directory can be patched byrpmbuild. This is fixed in the 2nd commit.The 3rd commit is a small cleanup for the initial include and should (hopefully) be obvious.
The 1st and 4th commit arise from the question on how we shall manage the spec file in the future. Especially as the spec file contained in this repo and the one from Fedora Rawhide already diverged. If there is no quick answer to the question I suggest to drop these two commits for now and only include the 2nd and 3rd one.
Note: The rpm docs strongly suggests that the 4th commit should only be included right before a version bump.