Skip to content

Add RPM 4.20 declarative build system preamble elements #335

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
danigm merged 2 commits into from
Oct 29, 2025
Merged

Add RPM 4.20 declarative build system preamble elements #335

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7d5ae51
Add RPM 4.20 declarative build system preamble elements
Oct 29, 2025
bcb01d1
Merge branch 'master' into buildsystem
danigm Oct 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions spec_cleaner/rpmpreamble.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,8 @@ def __init__(self, options):
'nosource': self.reg.re_nosource,
# for source, we have a special match to keep the source number
# for patch, we have a special match to keep the patch number
'buildsystem': self.reg.re_buildsystem,
'buildoption': self.reg.re_buildoption,
'buildrequires': self.reg.re_buildrequires,
'buildconflicts': self.reg.re_buildconflicts,
'buildignores': self.reg.re_buildignores,
Expand Down Expand Up @@ -500,6 +502,14 @@ def add(self, line):
)
return

elif self.reg.re_buildoption_phase.match(line):
match = self.reg.re_buildoption_phase.match(line)
value = match.group(2)
self._add_line_value_to(
'buildoption_phase', value, key='BuildOption{0}'.format(match.group(1))
)
return

elif self.reg.re_bcond_with.match(line):
self._add_line_to('bconds', line)
return
Expand Down
5 changes: 5 additions & 0 deletions spec_cleaner/rpmpreambleelements.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ class RpmPreambleElements(object):
'source': 'Source',
'nosource': 'NoSource',
'patch': 'Patch',
'buildsystem': 'BuildSystem',
'buildoption': 'BuildOption',
'buildrequires': 'BuildRequires',
'buildconflicts': 'BuildConflicts',
'buildignores': '#!BuildIgnore',
Expand Down Expand Up @@ -66,6 +68,9 @@ class RpmPreambleElements(object):
'source',
'nosource',
'patch',
'buildsystem',
'buildoption',
'buildoption_phase',
'patternprovides', # fake provides with special function for patterns
'patternrequires', # fake requires with special function for patterns
'patternrecommends', # fake recommends with special function for patterns
Expand Down
3 changes: 3 additions & 0 deletions spec_cleaner/rpmregexp.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,9 @@ class Regexp(object):
re_source = re.compile(r'^Source(\d*):\s*(.*)', re.IGNORECASE)
re_nosource = re.compile(r'^NoSource:\s*(.*)', re.IGNORECASE)
re_patch = re.compile(r'^((?:#[#\s]*)?)Patch(\d*):\s*(\S*)', re.IGNORECASE)
re_buildsystem = re.compile(r'^\s*BuildSystem:\s*(\S*)', re.IGNORECASE)
re_buildoption = re.compile(r'^BuildOption:\s*(.*)', re.IGNORECASE)
re_buildoption_phase = re.compile(r'^BuildOption(\([^)]+\)):\s*(.*)', re.IGNORECASE)
re_buildrequires = re.compile(r'^(BuildRequires|BuildPreReq):\s*(.*)', re.IGNORECASE)
re_buildconflicts = re.compile(r'^BuildConflicts:\s*(.*)', re.IGNORECASE)
re_buildignores = re.compile(r'^#!BuildIgnore:\s*(.*)', re.IGNORECASE)
Expand Down