diff --git a/.gitignore b/.gitignore index cafdb13..1ec998e 100644 --- a/.gitignore +++ b/.gitignore @@ -9,4 +9,3 @@ Impressive-0.10.2.tar.gz /Impressive-0.13.0-WIP-20210107svn310.tar.gz /Impressive-0.13.0-WIP-20210612svn311.tar.gz /Impressive-0.13.1.tar.gz -/Impressive-0.13.2.tar.gz diff --git a/impressive-0.13-escape-escape-sequence.patch b/impressive-0.13-escape-escape-sequence.patch deleted file mode 100644 index 7c6890f..0000000 --- a/impressive-0.13-escape-escape-sequence.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git 1/impressive.py-orig 2/impressive.py -index edde236..86d83e3 100644 ---- 1/impressive.py-orig -+++ 2/impressive.py -@@ -1008,10 +1008,10 @@ def mutoolParse(f, page_offset=0): - pages = 0 - for line in f: - line = line.decode() -- m = re.match("pages:\s*(\d+)", line, re.I) -+ m = re.match(r'pages:\s*(\d+)', line, re.I) - if m and not(pages): - pages = int(m.group(1)) -- m = re.search("/title\s*\(", line, re.I) -+ m = re.search(r'/title\s*\(', line, re.I) - if m and not(title): - title = line[m.end():].replace(')', '\0').replace('\\(', '(').replace('\\\0', ')').split('\0', 1)[0].strip() - return (title, pages) -@@ -3938,7 +3938,7 @@ def SaveInfoScript(filename): - - # replace the PageProps of the old info script with the current ones - try: -- m = re.search("^.*(PageProps)\s*=\s*(\{).*$", script,re.MULTILINE) -+ m = re.search(r'^.*(PageProps)\s*=\s*(\{).*$', script,re.MULTILINE) - if m: - script = script[:m.start(1)] + PagePropRepr() + \ - script[CountDictChars(script, m.end(2)) + 1 :] diff --git a/impressive.spec b/impressive.spec index 832e954..1ce8e7a 100644 --- a/impressive.spec +++ b/impressive.spec @@ -1,5 +1,5 @@ Name: impressive -Version: 0.13.2 +Version: 0.13.1 Release: %autorelease Summary: A program that displays presentation slides @@ -8,7 +8,6 @@ URL: http://impressive.sourceforge.net/ Source0: http://downloads.sourceforge.net/%{name}/Impressive-%{version}.tar.gz # Wrapper script for making sure hardware acceleration is available Source1: %{name}.sh -Patch: impressive-0.13-escape-escape-sequence.patch BuildArch: noarch BuildRequires: python3-devel @@ -37,7 +36,7 @@ that are really useful for presentations. %prep %autosetup -n Impressive-%{version} -p1 -sed -i -e '1s#/usr/bin/env python#/usr/bin/python3#' impressive.py +sed -ie '1s#/usr/bin/env python#/usr/bin/python3#' impressive.py %build sed -e "s|@PYTHON_SITELIB@|%{python3_sitelib}|" %{SOURCE1} > impressive.sh diff --git a/sources b/sources index 26695e6..4e11f23 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (Impressive-0.13.2.tar.gz) = 0b24ef39cba25d8813fd3f95f220c466defa50c3ba4a63d2f37b284de2826c2110225fe2016f58c401d1ca239d672ba28ba65069523ab57b1b5711a4222cff92 +SHA512 (Impressive-0.13.1.tar.gz) = f6221337f9dd79f552fb083e1ea7484aeadec1f8d8e05b4e1b7f6a94037b5026022819b346968dea67dbdb1b646d0571a7aeef26f15c25bee88c5b9c2791cf2b