forked from pool/rpmdevtools
237978c956
- Switch to python 3:
* Require python3-rpm instead of python2-rpm
* Add python3-shebang.patch to run python scripts with python3
* Add rmdevelrpms_fix_filename_search.patch to add compatibility
with both newer and older rpm binding
* Backport upstream commits 2ddae80, 693c954 and ea772da
OBS-URL: https://build.opensuse.org/request/show/797224
OBS-URL: https://build.opensuse.org/package/show/devel:tools/rpmdevtools?expand=0&rev=26
38 lines
1.2 KiB
Diff
38 lines
1.2 KiB
Diff
From 2ddae8028ceb778fb387acf23b97fd43fdb15f98 Mon Sep 17 00:00:00 2001
|
|
From: Ville Skyttä <ville.skytta@iki.fi>
|
|
Date: Feb 14 2017 09:58:15 +0000
|
|
Subject: rmdevelrpms: Use more raw strings
|
|
|
|
|
|
---
|
|
|
|
diff --git a/rpmdev-rmdevelrpms.py b/rpmdev-rmdevelrpms.py
|
|
index 815e402..79a3497 100755
|
|
--- a/rpmdev-rmdevelrpms.py
|
|
+++ b/rpmdev-rmdevelrpms.py
|
|
@@ -38,15 +38,15 @@ except NameError:
|
|
__version__ = "1.15"
|
|
|
|
|
|
-dev_re = re.compile("-(?:de(?:buginfo|vel)|sdk|static)\\b", re.IGNORECASE)
|
|
-test_re = re.compile("^perl-(?:Devel|ExtUtils|Test)-")
|
|
-lib_re1 = re.compile("^lib.+")
|
|
-lib_re2 = re.compile("-libs?$")
|
|
-a_re = re.compile(b"\\w\\.a$")
|
|
-so_re = re.compile(b"\\w\\.so(?:\\.\\d+)*$")
|
|
-comp_re = re.compile("^compat-gcc")
|
|
+dev_re = re.compile(r"-(?:de(?:buginfo|vel)|sdk|static)\b", re.IGNORECASE)
|
|
+test_re = re.compile(r"^perl-(?:Devel|ExtUtils|Test)-")
|
|
+lib_re1 = re.compile(r"^lib.+")
|
|
+lib_re2 = re.compile(r"-libs?$")
|
|
+a_re = re.compile(rb"\w\.a$")
|
|
+so_re = re.compile(rb"\w\.so(?:\.\d+)*$")
|
|
+comp_re = re.compile(r"^compat-gcc")
|
|
# required by Ant, which is required by Eclipse...
|
|
-jdev_re = re.compile("^java-.+-gcj-compat-devel$")
|
|
+jdev_re = re.compile(r"^java-.+-gcj-compat-devel$")
|
|
|
|
|
|
def_devpkgs = \
|
|
|