- added patches:

* 0001-Python-3-compatibility-tweaks.patch
- Change openstack- related users to non-prefixed variants,
  as they get renamed with the switch to Icehouse

OBS-URL: https://build.opensuse.org/package/show/devel:openSUSE:Factory:rpmlint/rpmlint?expand=0&rev=244

rpmlint.spec

@@ -58,7 +58,6 @@ Patch0:         rpmlint-suse.diff
 Patch1:         suse-checks.diff
 Patch2:         suse-version.diff
 Patch3:         suse-url-check.diff
-Patch4:         invalid-filerequires.diff
 Patch5:         suse-python3-naming-policy.diff
 Patch6:         suse-filesystem.diff
 Patch7:         suse-pkg-config-check.diff
@@ -71,6 +70,7 @@ Patch13:        script-interpreter-only-for-exec-scripts.diff
 Patch14:        sourced-dirs.diff
 Patch15:        suse-filter-more-verbose.diff
 Patch17:        docdata-examples.diff
+Patch18:        0001-Python-3-compatibility-tweaks.patch
 Patch19:        yast-provides.diff
 Patch20:        xdg-paths-update.diff
 Patch22:        better-wrong-script.diff
@@ -125,6 +125,7 @@ Patch91:        suse-manpages-for-rc-scripts.patch
 Patch92:        rpmlint-1.5-Fix-setgroups-error-name.diff
 Patch93:        xdg-check-exception.diff
 Patch94:        suse-ignore-specfile-errors.diff
+Patch95:        invalid-filerequires.diff
 
 %py_requires
 
@@ -138,7 +139,6 @@ source packages can be checked.
 %patch1
 %patch2
 %patch3
-%patch4
 %patch5
 %patch6
 %patch7
@@ -151,6 +151,7 @@ source packages can be checked.
 %patch14
 %patch15
 %patch17
+%patch18 -p1
 %patch19
 %patch20
 %patch22
@@ -202,6 +203,7 @@ source packages can be checked.
 %patch92 -p1
 %patch93 -p1
 %patch94
+%patch95
 cp -p %{SOURCE2} .
 # Only move top-level python files 
 chmod 0755 rpmlint-checks-master/*.py