Re: [Rpm-maint] [rpm-software-management/rpm] Fix build scriptlet append/prepend interaction with Buildsystem (PR #3047)

2024-04-23 Thread Panu Matilainen
Merged #3047 into master.

-- 
Reply to this email directly or view it on GitHub:
https://github.com/rpm-software-management/rpm/pull/3047#event-12570032216
You are receiving this because you are subscribed to this thread.

Message ID: 
___
Rpm-maint mailing list
Rpm-maint@lists.rpm.org
http://lists.rpm.org/mailman/listinfo/rpm-maint


Re: [Rpm-maint] [rpm-software-management/rpm] Fix build scriptlet append/prepend interaction with Buildsystem (PR #3047)

2024-04-18 Thread Panu Matilainen
...aaand then in the exact reverse order to make up  a nice refactoring series.

-- 
Reply to this email directly or view it on GitHub:
https://github.com/rpm-software-management/rpm/pull/3047#issuecomment-2063363180
You are receiving this because you are subscribed to this thread.

Message ID: ___
Rpm-maint mailing list
Rpm-maint@lists.rpm.org
http://lists.rpm.org/mailman/listinfo/rpm-maint


Re: [Rpm-maint] [rpm-software-management/rpm] Fix build scriptlet append/prepend interaction with Buildsystem (PR #3047)

2024-04-18 Thread Panu Matilainen
@pmatilai pushed 3 commits.

9e9a3fa747a285876726c33ca8d4df15a6f6759b  Refactor getSection() to more 
generally useful
106c81b7050c255e4281eb3f4717c601e40fb7e9  Refactor build script parse calls to 
a helper
39ff076a33d645ec4e40b0ca07c7ecad74df0912  Fix build scriptlet append/prepend 
interaction with Buildsystem

-- 
View it on GitHub:
https://github.com/rpm-software-management/rpm/pull/3047/files/b50ac2d506491e3651797b4a4e2f133731c2ddb0..39ff076a33d645ec4e40b0ca07c7ecad74df0912
You are receiving this because you are subscribed to this thread.

Message ID: 
___
Rpm-maint mailing list
Rpm-maint@lists.rpm.org
http://lists.rpm.org/mailman/listinfo/rpm-maint


Re: [Rpm-maint] [rpm-software-management/rpm] Fix build scriptlet append/prepend interaction with Buildsystem (PR #3047)

2024-04-18 Thread Panu Matilainen
@pmatilai pushed 1 commit.

b50ac2d506491e3651797b4a4e2f133731c2ddb0  Refactor getSection() to more 
generally useful

-- 
View it on GitHub:
https://github.com/rpm-software-management/rpm/pull/3047/files/3bf011d4aa230f120f07d205d5e9bff710b5e8c6..b50ac2d506491e3651797b4a4e2f133731c2ddb0
You are receiving this because you are subscribed to this thread.

Message ID: 
___
Rpm-maint mailing list
Rpm-maint@lists.rpm.org
http://lists.rpm.org/mailman/listinfo/rpm-maint


Re: [Rpm-maint] [rpm-software-management/rpm] Fix build scriptlet append/prepend interaction with Buildsystem (PR #3047)

2024-04-18 Thread Panu Matilainen
@pmatilai pushed 1 commit.

3bf011d4aa230f120f07d205d5e9bff710b5e8c6  Refactor parseBuildScript() to take 
spec PART_* numbers instead of names

-- 
View it on GitHub:
https://github.com/rpm-software-management/rpm/pull/3047/files/4a8d86ea57040ff73d5b32a65a28a9e8cec6ff14..3bf011d4aa230f120f07d205d5e9bff710b5e8c6
You are receiving this because you are subscribed to this thread.

Message ID: 
___
Rpm-maint mailing list
Rpm-maint@lists.rpm.org
http://lists.rpm.org/mailman/listinfo/rpm-maint


[Rpm-maint] [rpm-software-management/rpm] Fix build scriptlet append/prepend interaction with Buildsystem (PR #3047)

2024-04-18 Thread Panu Matilainen
The append and prepend modes got added before the declarative Buildsystem, and 
did not get thoroughly tested with it. The existing %build -a test didnt 
actually work but automake handling the build in %install masked the issue 
embarrasingly. As the Buildsystem is parsed after everything else, theres 
no way the previous append/prepend implementation could work correctly with it.

Do what we shouldve done from the start: collect any prepend/append stuff 
into separate data structures and apply them after everything else has been 
parsed. This also lifts the artificial sounding restriction wrt the 
corresponding main section:its really the right thing to do, even if 
its a bit more code.

Make the tests wrt buildsystem much more thorough to ensure it all really 
works, blush.

Fixes: #3024
You can view, comment on, or merge this pull request online at:

  https://github.com/rpm-software-management/rpm/pull/3047

-- Commit Summary --

  * Fix build scriptlet append/prepend interaction with Buildsystem

-- File Changes --

M build/parseSimpleScript.c (23)
M build/parseSpec.c (72)
M build/rpmbuild_internal.h (11)
M build/spec.c (2)
M docs/manual/spec.md (7)
M tests/data/SPECS/amhello.spec (22)
M tests/rpmbuild.at (14)

-- Patch Links --

https://github.com/rpm-software-management/rpm/pull/3047.patch
https://github.com/rpm-software-management/rpm/pull/3047.diff

-- 
Reply to this email directly or view it on GitHub:
https://github.com/rpm-software-management/rpm/pull/3047
You are receiving this because you are subscribed to this thread.

Message ID: rpm-software-management/rpm/pull/3...@github.com
___
Rpm-maint mailing list
Rpm-maint@lists.rpm.org
http://lists.rpm.org/mailman/listinfo/rpm-maint