Skip to content

Commit 6265b2e

Browse files
author
spec cleaner
committed
replace %setup_compile_flags to %set_build_flags and remove %serverbuild hardened, nowadays all builds are hardened by default
1 parent c6bd7d1 commit 6265b2e

1 file changed

Lines changed: 15 additions & 0 deletions

File tree

spec-cleaner

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ MACROS_TO_REPLACE = {
1010
r'%configure2_5x\b': '%configure',
1111
r'%apply_patches\b': '%autopatch -p1',
1212
r'\$\{?RPM_BUILD_ROOT\}?': '%{buildroot}',
13+
r'%setup_compile_flags\b': '%set_build_flags',
1314
# Add more macros here as needed
1415
# Example:
1516
# r'%old_macro\b': '%new_macro',
@@ -33,6 +34,20 @@ def replace_macros_and_clean(file_path):
3334
changes.append(f"Replaced '{old_macro}' with '{new_macro}' {count} times")
3435
content = new_content
3536

37+
# Remove lines containing %serverbuild or %serverbuild_hardened
38+
lines = content.splitlines()
39+
filtered_lines = []
40+
server_build_removed = 0
41+
server_build_pattern = re.compile(r'%serverbuild\b|%serverbuild_hardened\b')
42+
for line in lines:
43+
if server_build_pattern.search(line):
44+
server_build_removed += 1
45+
else:
46+
filtered_lines.append(line)
47+
if server_build_removed > 0:
48+
changes.append(f"Removed {server_build_removed} lines containing %serverbuild or %serverbuild_hardened")
49+
content = "\n".join(filtered_lines)
50+
3651
# Remove trailing spaces from each line
3752
lines = content.splitlines()
3853
cleaned_lines = [line.rstrip() for line in lines]

0 commit comments

Comments
 (0)