Attachment 5818 Details for Bug 8605 – existing patch, but against the RPM package itself

[patch] existing patch, but against the RPM package itself

rpmlint_fix_setup_warnings.patch (text/plain), 1.73 KB, created by Richard Houser on 2015-01-16 07:22:40 CET

(hide)

Description:

Filename:

MIME Type:

Creator: Richard Houser

Created: 2015-01-16 07:22:40 CET

Size: 1.73 KB

patch

obsolete

>Index: SOURCES/rpmlint-1.5-mga-fix_setup_compile_flags.patch
>===================================================================
>--- SOURCES/rpmlint-1.5-mga-fix_setup_compile_flags.patch	(revision 0)
>+++ SOURCES/rpmlint-1.5-mga-fix_setup_compile_flags.patch	(working copy)
>@@ -0,0 +1,20 @@
>+diff -uNr rpmlint-1.5/SpecCheck.py rpmlint-1.5/SpecCheck.py
>+--- rpmlint-1.5/SpecCheck.py	2015-01-12 02:22:25.804421718 -0500
>++++ rpmlint-1.5/SpecCheck.py	2015-01-12 02:44:42.299678640 -0500
>+@@ -97,6 +97,7 @@
>+ 
>+ compop_regex = re.compile('[<>=]')
>+ 
>++setup_regex = re.compile(r'\s*%setup\b')
>+ setup_q_regex = re.compile(' -[A-Za-z]*q')
>+ setup_t_regex = re.compile(' -[A-Za-z]*T')
>+ setup_ab_regex = re.compile(' -[A-Za-z]*[ab]')
>+@@ -256,7 +257,7 @@
>+             if if_regex.search(line):
>+                 if_depth = if_depth + 1
>+ 
>+-            if line.startswith('%setup'):
>++            if setup_regex.match(line):
>+                 if not setup_q_regex.search(line):
>+                     # Don't warn if there's a -T without -a or -b
>+                     if setup_t_regex.search(line):
>Index: SPECS/rpmlint.spec
>===================================================================
>--- SPECS/rpmlint.spec	(revision 809842)
>+++ SPECS/rpmlint.spec	(working copy)
>@@ -1,6 +1,6 @@
> Name:		rpmlint
> Version:	1.5
>-Release:	%mkrel 1
>+Release:	%mkrel 2
> Summary:	RPM correctness checker
> License:	GPLv2+
> Group:		Development/Other
>@@ -11,6 +11,7 @@
> Patch1:		rpmlint-1.5-mga-systemd-udev-in-etc.patch
> Patch2:		rpmlint-1.5-mga-unapplied-patches-warn-apply_patches.patch
> Patch3:		rpmlint-1.5-mga-etc-tmpfiles.d-snippets.patch
>+Patch4:		rpmlint-1.5-mga-fix_setup_compile_flags.patch
> Recommends:	rpmlint-mageia-policy
> BuildRequires:	python-rpm
> BuildRequires:	bash-completion

Index: SOURCES/rpmlint-1.5-mga-fix_setup_compile_flags.patch
===================================================================
--- SOURCES/rpmlint-1.5-mga-fix_setup_compile_flags.patch	(revision 0)
+++ SOURCES/rpmlint-1.5-mga-fix_setup_compile_flags.patch	(working copy)
@@ -0,0 +1,20 @@
+diff -uNr rpmlint-1.5/SpecCheck.py rpmlint-1.5/SpecCheck.py
+--- rpmlint-1.5/SpecCheck.py	2015-01-12 02:22:25.804421718 -0500
++++ rpmlint-1.5/SpecCheck.py	2015-01-12 02:44:42.299678640 -0500
+@@ -97,6 +97,7 @@
+ 
+ compop_regex = re.compile('[<>=]')
+ 
++setup_regex = re.compile(r'\s*%setup\b')
+ setup_q_regex = re.compile(' -[A-Za-z]*q')
+ setup_t_regex = re.compile(' -[A-Za-z]*T')
+ setup_ab_regex = re.compile(' -[A-Za-z]*[ab]')
+@@ -256,7 +257,7 @@
+             if if_regex.search(line):
+                 if_depth = if_depth + 1
+ 
+-            if line.startswith('%setup'):
++            if setup_regex.match(line):
+                 if not setup_q_regex.search(line):
+                     # Don't warn if there's a -T without -a or -b
+                     if setup_t_regex.search(line):
Index: SPECS/rpmlint.spec
===================================================================
--- SPECS/rpmlint.spec	(revision 809842)
+++ SPECS/rpmlint.spec	(working copy)
@@ -1,6 +1,6 @@
 Name:		rpmlint
 Version:	1.5
-Release:	%mkrel 1
+Release:	%mkrel 2
 Summary:	RPM correctness checker
 License:	GPLv2+
 Group:		Development/Other
@@ -11,6 +11,7 @@
 Patch1:		rpmlint-1.5-mga-systemd-udev-in-etc.patch
 Patch2:		rpmlint-1.5-mga-unapplied-patches-warn-apply_patches.patch
 Patch3:		rpmlint-1.5-mga-etc-tmpfiles.d-snippets.patch
+Patch4:		rpmlint-1.5-mga-fix_setup_compile_flags.patch
 Recommends:	rpmlint-mageia-policy
 BuildRequires:	python-rpm
 BuildRequires:	bash-completion

Actions: View | Diff

Attachments on bug 8605: 5802 | 5803 | 5817 | 5818