From 32de793d20606cb38d65d4341565554862ee3a88 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 12 Jan 2012 23:48:18 -0600 Subject: [PATCH 01/63] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- impressive.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/impressive.spec b/impressive.spec index a4e02d3..6b050d9 100644 --- a/impressive.spec +++ b/impressive.spec @@ -1,6 +1,6 @@ Name: impressive Version: 0.10.3 -Release: 7%{?dist} +Release: 8%{?dist} Summary: A program that displays presentation slides Group: Applications/Productivity @@ -69,6 +69,9 @@ rm -rf %{buildroot} %{_mandir}/man1/impressive.1* %changelog +* Fri Jan 13 2012 Fedora Release Engineering - 0.10.3-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Mon Nov 28 2011 Michael J Gruber - 0.10.3-7 - backport PDF parser fix From 61bf7a3d56b7b42cba13114a42964ae8dddcbb69 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 19 Jul 2012 09:47:43 -0500 Subject: [PATCH 02/63] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- impressive.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/impressive.spec b/impressive.spec index 6b050d9..a6d9755 100644 --- a/impressive.spec +++ b/impressive.spec @@ -1,6 +1,6 @@ Name: impressive Version: 0.10.3 -Release: 8%{?dist} +Release: 9%{?dist} Summary: A program that displays presentation slides Group: Applications/Productivity @@ -69,6 +69,9 @@ rm -rf %{buildroot} %{_mandir}/man1/impressive.1* %changelog +* Thu Jul 19 2012 Fedora Release Engineering - 0.10.3-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Fri Jan 13 2012 Fedora Release Engineering - 0.10.3-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild From 6966286dfee9ef539184f53412716f0ff82564e8 Mon Sep 17 00:00:00 2001 From: Michael J Gruber Date: Tue, 15 Jan 2013 17:08:30 +0100 Subject: [PATCH 03/63] pillow compatibility bug 895270, patch by Toshio Ernie Kuratomi --- impressive-0.10.3-pillow-compat.patch | 13 +++++++++++++ impressive.spec | 7 ++++++- 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 impressive-0.10.3-pillow-compat.patch diff --git a/impressive-0.10.3-pillow-compat.patch b/impressive-0.10.3-pillow-compat.patch new file mode 100644 index 0000000..438ae6d --- /dev/null +++ b/impressive-0.10.3-pillow-compat.patch @@ -0,0 +1,13 @@ +--- Impressive-0.10.3.orig/impressive.py ++++ Impressive-0.10.3/impressive.py +@@ -182,8 +182,8 @@ try: + from OpenGL.GL import * + import pygame + from pygame.locals import * +- import Image, ImageDraw, ImageFont, ImageFilter +- import TiffImagePlugin, BmpImagePlugin, JpegImagePlugin, PngImagePlugin, PpmImagePlugin ++ from PIL import Image, ImageDraw, ImageFont, ImageFilter ++ from PIL import TiffImagePlugin, BmpImagePlugin, JpegImagePlugin, PngImagePlugin, PpmImagePlugin + except (ValueError, ImportError), err: + print >>sys.stderr, "Oops! Cannot load necessary modules:", err + print >>sys.stderr, """To use Impressive, you need to install the following Python modules: diff --git a/impressive.spec b/impressive.spec index a6d9755..77fae7c 100644 --- a/impressive.spec +++ b/impressive.spec @@ -1,6 +1,6 @@ Name: impressive Version: 0.10.3 -Release: 9%{?dist} +Release: 10%{?dist} Summary: A program that displays presentation slides Group: Applications/Productivity @@ -11,6 +11,7 @@ Source0: http://downloads.sourceforge.net/%{name}/Impressive-%{version}.t Source1: %{name}.sh # backport PDF parser fix Patch0: impressive-0.10.3-parser-fix.patch +Patch1: impressive-0.10.3-pillow-compat.patch BuildArch: noarch BuildRequires: python-devel @@ -44,6 +45,7 @@ that are really useful for presentations. %prep %setup -q -n Impressive-%{version} %patch0 -p1 -b .parser-fix +%patch1 -p1 -b .pillow-compat %build sed -e "s|@PYTHON_SITELIB@|%{python_sitelib}|" %{SOURCE1} > impressive.sh @@ -69,6 +71,9 @@ rm -rf %{buildroot} %{_mandir}/man1/impressive.1* %changelog +* Tue Jan 15 2013 Michael J Gruber - 0.10.3-10 +- pillow compatibility (bug 895270, patch by Toshio Ernie Kuratomi) + * Thu Jul 19 2012 Fedora Release Engineering - 0.10.3-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild From f4361b6f0aaef55e1152cfeb04be4d89824f40ed Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 13 Feb 2013 20:04:04 -0600 Subject: [PATCH 04/63] - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild --- impressive.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/impressive.spec b/impressive.spec index 77fae7c..8fd3fc6 100644 --- a/impressive.spec +++ b/impressive.spec @@ -1,6 +1,6 @@ Name: impressive Version: 0.10.3 -Release: 10%{?dist} +Release: 11%{?dist} Summary: A program that displays presentation slides Group: Applications/Productivity @@ -71,6 +71,9 @@ rm -rf %{buildroot} %{_mandir}/man1/impressive.1* %changelog +* Thu Feb 14 2013 Fedora Release Engineering - 0.10.3-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + * Tue Jan 15 2013 Michael J Gruber - 0.10.3-10 - pillow compatibility (bug 895270, patch by Toshio Ernie Kuratomi) From a4306c6268e2db43148d1ecb1f9cef2cf7f17ae6 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 3 Aug 2013 14:33:55 -0500 Subject: [PATCH 05/63] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- impressive.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/impressive.spec b/impressive.spec index 8fd3fc6..6e474a2 100644 --- a/impressive.spec +++ b/impressive.spec @@ -1,6 +1,6 @@ Name: impressive Version: 0.10.3 -Release: 11%{?dist} +Release: 12%{?dist} Summary: A program that displays presentation slides Group: Applications/Productivity @@ -71,6 +71,9 @@ rm -rf %{buildroot} %{_mandir}/man1/impressive.1* %changelog +* Sat Aug 03 2013 Fedora Release Engineering - 0.10.3-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Thu Feb 14 2013 Fedora Release Engineering - 0.10.3-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild From c20c80c1516359574cc3e8dc45fd2fada1fbfd31 Mon Sep 17 00:00:00 2001 From: Michael J Gruber Date: Thu, 2 Jan 2014 12:38:53 +0100 Subject: [PATCH 06/63] sync with upstream update sources drop pillow compatibility patch (upstreamed) drop backported PDF parser fix (upstreamed) --- .gitignore | 1 + impressive-0.10.3-parser-fix.patch | 63 --------------------------- impressive-0.10.3-pillow-compat.patch | 13 ------ impressive.spec | 14 +++--- sources | 2 +- 5 files changed, 9 insertions(+), 84 deletions(-) delete mode 100644 impressive-0.10.3-parser-fix.patch delete mode 100644 impressive-0.10.3-pillow-compat.patch diff --git a/.gitignore b/.gitignore index db80ccc..4a233c4 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ Impressive-0.10.2.tar.gz /Impressive-0.10.3.tar.gz +/Impressive-0.10.4.tar.gz diff --git a/impressive-0.10.3-parser-fix.patch b/impressive-0.10.3-parser-fix.patch deleted file mode 100644 index 5a5f176..0000000 --- a/impressive-0.10.3-parser-fix.patch +++ /dev/null @@ -1,63 +0,0 @@ ---- Impressive-0.10.3/impressive.py 2011-11-28 14:08:14.000000000 +0100 -+++ Impressive-0.10.4-WIP/impressive.py 2011-11-28 14:03:46.000000000 +0100 -@@ -511,7 +511,7 @@ - try: - return func(*args, **kwargs) - except: -- print >>sys.stderr, "----- Exception in user function ----" -+ print >>sys.stderr, "----- Unhandled Exception ----" - traceback.print_exc(file=sys.stderr) - print >>sys.stderr, "----- End of traceback -----" - -@@ -1296,7 +1296,7 @@ - return self.parse_tokens(filter(None, data.split())) - - def getobj(self, obj, force_type=None): -- if obj.__class__ == PDFref: -+ if isinstance(obj, PDFref): - obj = obj.ref - if type(obj) != types.IntType: - raise PDFError, "object is not a valid reference" -@@ -1432,11 +1432,14 @@ - if 'Dest' in node: - dest = self.dest2page(node['Dest']) - elif 'A' in node: -- action = node['A']['S'] -+ a = node['A'] -+ if isinstance(a, PDFref): -+ a = self.getobj(a) -+ action = a['S'] - if action == 'URI': -- dest = node['A'].get('URI', None) -+ dest = a.get('URI', None) - elif action == 'GoTo': -- dest = self.dest2page(node['A'].get('D', None)) -+ dest = self.dest2page(a.get('D', None)) - if dest: - return tuple(node['Rect'] + [dest]) - except PDFError: -@@ -2013,13 +2018,13 @@ - for pdf in FileProps: - if not pdf.lower().endswith(".pdf"): continue - if RTrestart: break -- ParsePDF(pdf) -+ SafeCall(ParsePDF, [pdf]) - if RTrestart: continue - for page in xrange(1, PageCount + 1): - if RTrestart: break - if (page != p1) and (page != p2) \ - and (page >= PageRangeStart) and (page <= PageRangeEnd): -- PageImage(page) -+ SafeCall(PageImage, [page]) - RTrunning = False - if CacheMode >= FileCache: - print >>sys.stderr, "Background rendering finished, used %.1f MiB of disk space." %\ -@@ -3821,7 +3826,7 @@ - if not CacheMode: - for pdf in FileProps: - if pdf.lower().endswith(".pdf"): -- ParsePDF(pdf) -+ SafeCall(ParsePDF, [pdf]) - - # start output and enter main loop - StartTime = pygame.time.get_ticks() diff --git a/impressive-0.10.3-pillow-compat.patch b/impressive-0.10.3-pillow-compat.patch deleted file mode 100644 index 438ae6d..0000000 --- a/impressive-0.10.3-pillow-compat.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- Impressive-0.10.3.orig/impressive.py -+++ Impressive-0.10.3/impressive.py -@@ -182,8 +182,8 @@ try: - from OpenGL.GL import * - import pygame - from pygame.locals import * -- import Image, ImageDraw, ImageFont, ImageFilter -- import TiffImagePlugin, BmpImagePlugin, JpegImagePlugin, PngImagePlugin, PpmImagePlugin -+ from PIL import Image, ImageDraw, ImageFont, ImageFilter -+ from PIL import TiffImagePlugin, BmpImagePlugin, JpegImagePlugin, PngImagePlugin, PpmImagePlugin - except (ValueError, ImportError), err: - print >>sys.stderr, "Oops! Cannot load necessary modules:", err - print >>sys.stderr, """To use Impressive, you need to install the following Python modules: diff --git a/impressive.spec b/impressive.spec index 6e474a2..c276ae3 100644 --- a/impressive.spec +++ b/impressive.spec @@ -1,6 +1,6 @@ Name: impressive -Version: 0.10.3 -Release: 12%{?dist} +Version: 0.10.4 +Release: 1%{?dist} Summary: A program that displays presentation slides Group: Applications/Productivity @@ -9,9 +9,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 -# backport PDF parser fix -Patch0: impressive-0.10.3-parser-fix.patch -Patch1: impressive-0.10.3-pillow-compat.patch BuildArch: noarch BuildRequires: python-devel @@ -44,8 +41,6 @@ that are really useful for presentations. %prep %setup -q -n Impressive-%{version} -%patch0 -p1 -b .parser-fix -%patch1 -p1 -b .pillow-compat %build sed -e "s|@PYTHON_SITELIB@|%{python_sitelib}|" %{SOURCE1} > impressive.sh @@ -71,6 +66,11 @@ rm -rf %{buildroot} %{_mandir}/man1/impressive.1* %changelog +* Thu Jan 02 2014 Michael J Gruber - 0.11.4 +- sync with upstream +- drop pillow compatibility patch (upstreamed) +- drop backported PDF parser fix (upstreamed) + * Sat Aug 03 2013 Fedora Release Engineering - 0.10.3-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild diff --git a/sources b/sources index 696a113..f314470 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1fefb25db71ee322a59353de85ae00b4 Impressive-0.10.3.tar.gz +17a54e914069b2fea9fe35dd28ada38d Impressive-0.10.4.tar.gz From a93dfcba79f5ed61ec7b8d82d737add276649a4e Mon Sep 17 00:00:00 2001 From: Michael J Gruber Date: Thu, 2 Jan 2014 13:02:51 +0100 Subject: [PATCH 07/63] upate requires as recommended by upstream --- impressive.spec | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/impressive.spec b/impressive.spec index c276ae3..c9317dd 100644 --- a/impressive.spec +++ b/impressive.spec @@ -1,6 +1,6 @@ Name: impressive Version: 0.10.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A program that displays presentation slides Group: Applications/Productivity @@ -18,12 +18,13 @@ Requires: python-imaging Requires: pygame Requires: PyOpenGL Requires: opengl-games-utils -# - external tools for displaying and parsing pdf (required resp. strongly recommended): -Requires: xpdf +# - external tools for displaying and parsing pdf (required): +Requires: poppler-utils %if 0%{?fedora} -Requires: pdftk +Requires: pdftk >= 1.41 +Requires: pdftk < 2.0 %endif -# - external tool for acting on links (recommended): +# - external tool for acting on links (strongly recommended): Requires: xdg-utils # - font for on screen display (recommended): Requires: dejavu-sans-fonts @@ -66,7 +67,10 @@ rm -rf %{buildroot} %{_mandir}/man1/impressive.1* %changelog -* Thu Jan 02 2014 Michael J Gruber - 0.11.4 +* Thu Jan 02 2014 Michael J Gruber - 0.11.4-2 +- upate requires as recommended by upstream + +* Thu Jan 02 2014 Michael J Gruber - 0.11.4-1 - sync with upstream - drop pillow compatibility patch (upstreamed) - drop backported PDF parser fix (upstreamed) From e8e673a818d3267804cd4e3ea03896bdce508c69 Mon Sep 17 00:00:00 2001 From: Michael J Gruber Date: Tue, 11 Mar 2014 13:33:40 +0100 Subject: [PATCH 08/63] temporarily remove R pdftk pdftk got retired without any headsup nor substitute. This commit removes the R for rawhide since technically, impressive does work without pdftk, albeit with limited functionality. The F19 package build pdftk would unlock the full functionality (optional recommended R). --- impressive.spec | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/impressive.spec b/impressive.spec index c9317dd..ede7daa 100644 --- a/impressive.spec +++ b/impressive.spec @@ -1,6 +1,6 @@ Name: impressive Version: 0.10.4 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A program that displays presentation slides Group: Applications/Productivity @@ -20,10 +20,6 @@ Requires: PyOpenGL Requires: opengl-games-utils # - external tools for displaying and parsing pdf (required): Requires: poppler-utils -%if 0%{?fedora} -Requires: pdftk >= 1.41 -Requires: pdftk < 2.0 -%endif # - external tool for acting on links (strongly recommended): Requires: xdg-utils # - font for on screen display (recommended): @@ -67,6 +63,9 @@ rm -rf %{buildroot} %{_mandir}/man1/impressive.1* %changelog +* Tue Mar 11 2014 Michael J Gruber - 0.11.4-3 +- temporarily remove R pdftk + * Thu Jan 02 2014 Michael J Gruber - 0.11.4-2 - upate requires as recommended by upstream From 291af7af70c990a76bb9af600350071c675a9a23 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 7 Jun 2014 17:16:37 -0500 Subject: [PATCH 09/63] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- impressive.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/impressive.spec b/impressive.spec index ede7daa..f8469a4 100644 --- a/impressive.spec +++ b/impressive.spec @@ -1,6 +1,6 @@ Name: impressive Version: 0.10.4 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A program that displays presentation slides Group: Applications/Productivity @@ -63,6 +63,9 @@ rm -rf %{buildroot} %{_mandir}/man1/impressive.1* %changelog +* Sat Jun 07 2014 Fedora Release Engineering - 0.10.4-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Tue Mar 11 2014 Michael J Gruber - 0.11.4-3 - temporarily remove R pdftk From 0526484b42459003251e508b1167e899c35452d8 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 17 Jun 2015 11:22:01 +0000 Subject: [PATCH 10/63] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- impressive.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/impressive.spec b/impressive.spec index f8469a4..3e3064e 100644 --- a/impressive.spec +++ b/impressive.spec @@ -1,6 +1,6 @@ Name: impressive Version: 0.10.4 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A program that displays presentation slides Group: Applications/Productivity @@ -63,6 +63,9 @@ rm -rf %{buildroot} %{_mandir}/man1/impressive.1* %changelog +* Wed Jun 17 2015 Fedora Release Engineering - 0.10.4-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Sat Jun 07 2014 Fedora Release Engineering - 0.10.4-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From 1b54a80013fab5c03e4a7a0642bfc5c6597e7cc2 Mon Sep 17 00:00:00 2001 From: Michael J Gruber Date: Sat, 21 Nov 2015 16:34:39 +0100 Subject: [PATCH 11/63] sync with upstream 0.11.1 This contains necessary bugfixes for current PIL (#1284164). --- .gitignore | 1 + impressive.spec | 14 +++++++++----- sources | 2 +- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 4a233c4..6027721 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ Impressive-0.10.2.tar.gz /Impressive-0.10.3.tar.gz /Impressive-0.10.4.tar.gz +/Impressive-0.11.1.tar.gz diff --git a/impressive.spec b/impressive.spec index 3e3064e..e08a360 100644 --- a/impressive.spec +++ b/impressive.spec @@ -1,6 +1,6 @@ Name: impressive -Version: 0.10.4 -Release: 5%{?dist} +Version: 0.11.1 +Release: 1%{?dist} Summary: A program that displays presentation slides Group: Applications/Productivity @@ -63,19 +63,23 @@ rm -rf %{buildroot} %{_mandir}/man1/impressive.1* %changelog +* Sat Nov 21 2015 Michael J Gruber - 0.11.1-1 +- sync with upstream +- fix changelog typos + * Wed Jun 17 2015 Fedora Release Engineering - 0.10.4-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild * Sat Jun 07 2014 Fedora Release Engineering - 0.10.4-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild -* Tue Mar 11 2014 Michael J Gruber - 0.11.4-3 +* Tue Mar 11 2014 Michael J Gruber - 0.10.4-3 - temporarily remove R pdftk -* Thu Jan 02 2014 Michael J Gruber - 0.11.4-2 +* Thu Jan 02 2014 Michael J Gruber - 0.10.4-2 - upate requires as recommended by upstream -* Thu Jan 02 2014 Michael J Gruber - 0.11.4-1 +* Thu Jan 02 2014 Michael J Gruber - 0.10.4-1 - sync with upstream - drop pillow compatibility patch (upstreamed) - drop backported PDF parser fix (upstreamed) diff --git a/sources b/sources index f314470..c677465 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -17a54e914069b2fea9fe35dd28ada38d Impressive-0.10.4.tar.gz +0fdac7431208ff5866a6443bbdddeaee Impressive-0.11.1.tar.gz From cdfeed75274505550cb7ecd0251c7b21ee386506 Mon Sep 17 00:00:00 2001 From: Michael J Gruber Date: Sun, 22 Nov 2015 00:32:46 +0100 Subject: [PATCH 12/63] use mutool and mudraw Adjust to current mudraw option syntax so that impressive can use this fast renderer. Also, use mutool for mediabox and page number parsing. This enables impressive to be used for pdf 1.5 and higher again. (no bookmarks yet) --- impressive-0.11.1-mudraw-1.7.patch | 29 ++++++++++++ impressive-0.11.1-mutool-info.patch | 72 +++++++++++++++++++++++++++++ impressive.spec | 14 +++++- 3 files changed, 114 insertions(+), 1 deletion(-) create mode 100644 impressive-0.11.1-mudraw-1.7.patch create mode 100644 impressive-0.11.1-mutool-info.patch diff --git a/impressive-0.11.1-mudraw-1.7.patch b/impressive-0.11.1-mudraw-1.7.patch new file mode 100644 index 0000000..f26f094 --- /dev/null +++ b/impressive-0.11.1-mudraw-1.7.patch @@ -0,0 +1,29 @@ +--- impressive.py.orig 2015-11-21 23:56:54.197386430 +0100 ++++ impressive.py 2015-11-22 00:00:11.310669086 +0100 +@@ -19,7 +19,7 @@ + + __title__ = "Impressive" + __version__ = "0.11.1" +-__rev__ = 186 ++__rev__ = "v0.11.1-1-gdd43e7d" + __author__ = "Martin J. Fiedler" + __email__ = "martin.fiedler@gmx.net" + __website__ = "http://impressive.sourceforge.net/" +@@ -2973,7 +2973,7 @@ class MuPDFRenderer(PDFRendererBase): + name = "MuPDF" + binaries = ["mudraw", "pdfdraw"] + test_run_args = [] +- required_options = ["o", "r", "b"] ++ required_options = ["o", "r", "A"] + + # helper object for communication with the reader thread + class ThreadComm(object): +@@ -3016,7 +3016,7 @@ class MuPDFRenderer(PDFRendererBase): + except (OSError, IOError, AttributeError): + pass + if not antialias: +- aa_opts = ["-b", "0"] ++ aa_opts = ["-A", "0"] + else: + aa_opts = [] + try: diff --git a/impressive-0.11.1-mutool-info.patch b/impressive-0.11.1-mutool-info.patch new file mode 100644 index 0000000..db8f981 --- /dev/null +++ b/impressive-0.11.1-mutool-info.patch @@ -0,0 +1,72 @@ +--- impressive.py.orig 2015-11-21 23:56:54.197386430 +0100 ++++ impressive.py 2015-11-22 00:23:17.998145913 +0100 +@@ -19,7 +19,7 @@ + + __title__ = "Impressive" + __version__ = "0.11.1" +-__rev__ = "v0.11.1-1-gdd43e7d" ++__rev__ = "v0.11.1-2-gbbb6abd" + __author__ = "Martin J. Fiedler" + __email__ = "martin.fiedler@gmx.net" + __website__ = "http://impressive.sourceforge.net/" +@@ -148,6 +148,7 @@ if os.name == "nt": + return path + return binary # fall-back if not found + pdftkPath = FindBinary("pdftk.exe") ++ mutoolPath = FindBinary("mutool.exe") + GhostScriptPlatformOptions = ["-I" + os.path.join(root, "gs")] + try: + import win32api +@@ -173,6 +174,7 @@ else: + MPlayerPlatformOptions = [ "-vo", "gl" ] + MPlayerColorKey = False + pdftkPath = "pdftk" ++ mutoolPath = "mutool" + FontPath = ["/usr/share/fonts", "/usr/local/share/fonts", "/usr/X11R6/lib/X11/fonts/TTF"] + FontList = ["DejaVuSans.ttf", "Vera.ttf", "Verdana.ttf"] + Nice = ["nice", "-n", "7"] +@@ -781,18 +783,6 @@ def b2s(b): + if b: return "Y" + return "N" + +-# extract a number at the beginning of a string +-def num(s): +- s = s.strip() +- r = "" +- while s[0] in "0123456789": +- r += s[0] +- s = s[1:] +- try: +- return int(r) +- except ValueError: +- return -1 +- + # linearly interpolate between two floating-point RGB colors represented as tuples + def lerpColor(a, b, t): + return tuple([min(1.0, max(0.0, x + t * (y - x))) for x, y in zip(a, b)]) +@@ -807,11 +797,22 @@ def my_stat(filename): + + # determine (pagecount,width,height) of a PDF file + def analyze_pdf(filename): +- f = file(filename,"rb") ++ t = TempFileName + ".txt" ++ f = file(t, "w") ++ try: ++ assert 0 == subprocess.Popen([mutoolPath, "info", filename], stdout=f).wait() ++ except OSError: ++ print >>sys.stderr, "Note: mutool not found, cannot determine output size." ++ return ++ except AssertionError: ++ print >>sys.stderr, "Note: mutool failed, cannot determine output size." ++ return ++ f.close() ++ f = file(t, "r") + pdf = f.read() + f.close() +- box = map(float, pdf.split("/MediaBox",1)[1].split("]",1)[0].split("[",1)[1].strip().split()) +- return (max(map(num, pdf.split("/Count")[1:])), box[2]-box[0], box[3]-box[1]) ++ box = map(float, pdf.split("Mediaboxes",1)[1].split("]",1)[0].split("[",1)[1].strip().split()) ++ return (int(pdf.split("Pages:")[1].split()[0]), box[2]-box[0], box[3]-box[1]) + + # unescape { literals in PDF files + re_unescape = re.compile(r'&#[0-9]+;') diff --git a/impressive.spec b/impressive.spec index e08a360..432d131 100644 --- a/impressive.spec +++ b/impressive.spec @@ -1,6 +1,6 @@ Name: impressive Version: 0.11.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A program that displays presentation slides Group: Applications/Productivity @@ -9,6 +9,8 @@ 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 +Patch1: impressive-0.11.1-mudraw-1.7.patch +Patch2: impressive-0.11.1-mutool-info.patch BuildArch: noarch BuildRequires: python-devel @@ -20,6 +22,7 @@ Requires: PyOpenGL Requires: opengl-games-utils # - external tools for displaying and parsing pdf (required): Requires: poppler-utils +Requires: mupdf # - external tool for acting on links (strongly recommended): Requires: xdg-utils # - font for on screen display (recommended): @@ -39,6 +42,11 @@ that are really useful for presentations. %prep %setup -q -n Impressive-%{version} +# adjust to current mudraw option syntax +%patch1 +# use mutool for info parsing +%patch2 + %build sed -e "s|@PYTHON_SITELIB@|%{python_sitelib}|" %{SOURCE1} > impressive.sh # This package doesn't build anything, just copy files under build root. @@ -63,6 +71,10 @@ rm -rf %{buildroot} %{_mandir}/man1/impressive.1* %changelog +* Sat Nov 21 2015 Michael J Gruber - 0.11.1-2 +- adjust to current mudraw option syntax +- use mutool for info parsing + * Sat Nov 21 2015 Michael J Gruber - 0.11.1-1 - sync with upstream - fix changelog typos From a75a5e5512853b73911c74a88022b63d7f19e239 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 4 Feb 2016 00:30:16 +0000 Subject: [PATCH 13/63] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- impressive.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/impressive.spec b/impressive.spec index 432d131..f49a706 100644 --- a/impressive.spec +++ b/impressive.spec @@ -1,6 +1,6 @@ Name: impressive Version: 0.11.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A program that displays presentation slides Group: Applications/Productivity @@ -71,6 +71,9 @@ rm -rf %{buildroot} %{_mandir}/man1/impressive.1* %changelog +* Thu Feb 04 2016 Fedora Release Engineering - 0.11.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Sat Nov 21 2015 Michael J Gruber - 0.11.1-2 - adjust to current mudraw option syntax - use mutool for info parsing From 0993076e793294ba9f4fb8dbeca24c40ed12896e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 19 Jul 2016 07:28:30 +0000 Subject: [PATCH 14/63] - https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages --- impressive.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/impressive.spec b/impressive.spec index f49a706..ff317a9 100644 --- a/impressive.spec +++ b/impressive.spec @@ -1,6 +1,6 @@ Name: impressive Version: 0.11.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A program that displays presentation slides Group: Applications/Productivity @@ -71,6 +71,9 @@ rm -rf %{buildroot} %{_mandir}/man1/impressive.1* %changelog +* Tue Jul 19 2016 Fedora Release Engineering - 0.11.1-4 +- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages + * Thu Feb 04 2016 Fedora Release Engineering - 0.11.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From 8b5150b917e1279b5c50b20373f8d215d6ba0f62 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 10 Feb 2017 16:23:52 +0000 Subject: [PATCH 15/63] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- impressive.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/impressive.spec b/impressive.spec index ff317a9..433adff 100644 --- a/impressive.spec +++ b/impressive.spec @@ -1,6 +1,6 @@ Name: impressive Version: 0.11.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A program that displays presentation slides Group: Applications/Productivity @@ -71,6 +71,9 @@ rm -rf %{buildroot} %{_mandir}/man1/impressive.1* %changelog +* Fri Feb 10 2017 Fedora Release Engineering - 0.11.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Tue Jul 19 2016 Fedora Release Engineering - 0.11.1-4 - https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages From 7655c791a66a901e454f0110d013082901c0b422 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 26 Jul 2017 13:31:08 +0000 Subject: [PATCH 16/63] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- impressive.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/impressive.spec b/impressive.spec index 433adff..f24bc75 100644 --- a/impressive.spec +++ b/impressive.spec @@ -1,6 +1,6 @@ Name: impressive Version: 0.11.1 -Release: 5%{?dist} +Release: 6%{?dist} Summary: A program that displays presentation slides Group: Applications/Productivity @@ -71,6 +71,9 @@ rm -rf %{buildroot} %{_mandir}/man1/impressive.1* %changelog +* Wed Jul 26 2017 Fedora Release Engineering - 0.11.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Fri Feb 10 2017 Fedora Release Engineering - 0.11.1-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From 106d3f3b98536af0aabad6210e02e4b7cd9a74a0 Mon Sep 17 00:00:00 2001 From: Michael J Gruber Date: Tue, 19 Dec 2017 16:35:01 +0100 Subject: [PATCH 17/63] sync with upstream 0.11.2 In particular, this restores all main functionality based solely on mupdf (rather than pdftk). --- .gitignore | 1 + impressive-0.11.1-mudraw-1.7.patch | 29 ------------ impressive-0.11.1-mutool-info.patch | 72 ----------------------------- impressive.spec | 15 ++---- sources | 2 +- 5 files changed, 7 insertions(+), 112 deletions(-) delete mode 100644 impressive-0.11.1-mudraw-1.7.patch delete mode 100644 impressive-0.11.1-mutool-info.patch diff --git a/.gitignore b/.gitignore index 6027721..6d06a23 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ Impressive-0.10.2.tar.gz /Impressive-0.10.3.tar.gz /Impressive-0.10.4.tar.gz /Impressive-0.11.1.tar.gz +/Impressive-0.11.2.tar.gz diff --git a/impressive-0.11.1-mudraw-1.7.patch b/impressive-0.11.1-mudraw-1.7.patch deleted file mode 100644 index f26f094..0000000 --- a/impressive-0.11.1-mudraw-1.7.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- impressive.py.orig 2015-11-21 23:56:54.197386430 +0100 -+++ impressive.py 2015-11-22 00:00:11.310669086 +0100 -@@ -19,7 +19,7 @@ - - __title__ = "Impressive" - __version__ = "0.11.1" --__rev__ = 186 -+__rev__ = "v0.11.1-1-gdd43e7d" - __author__ = "Martin J. Fiedler" - __email__ = "martin.fiedler@gmx.net" - __website__ = "http://impressive.sourceforge.net/" -@@ -2973,7 +2973,7 @@ class MuPDFRenderer(PDFRendererBase): - name = "MuPDF" - binaries = ["mudraw", "pdfdraw"] - test_run_args = [] -- required_options = ["o", "r", "b"] -+ required_options = ["o", "r", "A"] - - # helper object for communication with the reader thread - class ThreadComm(object): -@@ -3016,7 +3016,7 @@ class MuPDFRenderer(PDFRendererBase): - except (OSError, IOError, AttributeError): - pass - if not antialias: -- aa_opts = ["-b", "0"] -+ aa_opts = ["-A", "0"] - else: - aa_opts = [] - try: diff --git a/impressive-0.11.1-mutool-info.patch b/impressive-0.11.1-mutool-info.patch deleted file mode 100644 index db8f981..0000000 --- a/impressive-0.11.1-mutool-info.patch +++ /dev/null @@ -1,72 +0,0 @@ ---- impressive.py.orig 2015-11-21 23:56:54.197386430 +0100 -+++ impressive.py 2015-11-22 00:23:17.998145913 +0100 -@@ -19,7 +19,7 @@ - - __title__ = "Impressive" - __version__ = "0.11.1" --__rev__ = "v0.11.1-1-gdd43e7d" -+__rev__ = "v0.11.1-2-gbbb6abd" - __author__ = "Martin J. Fiedler" - __email__ = "martin.fiedler@gmx.net" - __website__ = "http://impressive.sourceforge.net/" -@@ -148,6 +148,7 @@ if os.name == "nt": - return path - return binary # fall-back if not found - pdftkPath = FindBinary("pdftk.exe") -+ mutoolPath = FindBinary("mutool.exe") - GhostScriptPlatformOptions = ["-I" + os.path.join(root, "gs")] - try: - import win32api -@@ -173,6 +174,7 @@ else: - MPlayerPlatformOptions = [ "-vo", "gl" ] - MPlayerColorKey = False - pdftkPath = "pdftk" -+ mutoolPath = "mutool" - FontPath = ["/usr/share/fonts", "/usr/local/share/fonts", "/usr/X11R6/lib/X11/fonts/TTF"] - FontList = ["DejaVuSans.ttf", "Vera.ttf", "Verdana.ttf"] - Nice = ["nice", "-n", "7"] -@@ -781,18 +783,6 @@ def b2s(b): - if b: return "Y" - return "N" - --# extract a number at the beginning of a string --def num(s): -- s = s.strip() -- r = "" -- while s[0] in "0123456789": -- r += s[0] -- s = s[1:] -- try: -- return int(r) -- except ValueError: -- return -1 -- - # linearly interpolate between two floating-point RGB colors represented as tuples - def lerpColor(a, b, t): - return tuple([min(1.0, max(0.0, x + t * (y - x))) for x, y in zip(a, b)]) -@@ -807,11 +797,22 @@ def my_stat(filename): - - # determine (pagecount,width,height) of a PDF file - def analyze_pdf(filename): -- f = file(filename,"rb") -+ t = TempFileName + ".txt" -+ f = file(t, "w") -+ try: -+ assert 0 == subprocess.Popen([mutoolPath, "info", filename], stdout=f).wait() -+ except OSError: -+ print >>sys.stderr, "Note: mutool not found, cannot determine output size." -+ return -+ except AssertionError: -+ print >>sys.stderr, "Note: mutool failed, cannot determine output size." -+ return -+ f.close() -+ f = file(t, "r") - pdf = f.read() - f.close() -- box = map(float, pdf.split("/MediaBox",1)[1].split("]",1)[0].split("[",1)[1].strip().split()) -- return (max(map(num, pdf.split("/Count")[1:])), box[2]-box[0], box[3]-box[1]) -+ box = map(float, pdf.split("Mediaboxes",1)[1].split("]",1)[0].split("[",1)[1].strip().split()) -+ return (int(pdf.split("Pages:")[1].split()[0]), box[2]-box[0], box[3]-box[1]) - - # unescape { literals in PDF files - re_unescape = re.compile(r'&#[0-9]+;') diff --git a/impressive.spec b/impressive.spec index f24bc75..a9d34fc 100644 --- a/impressive.spec +++ b/impressive.spec @@ -1,6 +1,6 @@ Name: impressive -Version: 0.11.1 -Release: 6%{?dist} +Version: 0.11.2 +Release: 1%{?dist} Summary: A program that displays presentation slides Group: Applications/Productivity @@ -9,8 +9,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 -Patch1: impressive-0.11.1-mudraw-1.7.patch -Patch2: impressive-0.11.1-mutool-info.patch BuildArch: noarch BuildRequires: python-devel @@ -21,7 +19,6 @@ Requires: pygame Requires: PyOpenGL Requires: opengl-games-utils # - external tools for displaying and parsing pdf (required): -Requires: poppler-utils Requires: mupdf # - external tool for acting on links (strongly recommended): Requires: xdg-utils @@ -42,11 +39,6 @@ that are really useful for presentations. %prep %setup -q -n Impressive-%{version} -# adjust to current mudraw option syntax -%patch1 -# use mutool for info parsing -%patch2 - %build sed -e "s|@PYTHON_SITELIB@|%{python_sitelib}|" %{SOURCE1} > impressive.sh # This package doesn't build anything, just copy files under build root. @@ -71,6 +63,9 @@ rm -rf %{buildroot} %{_mandir}/man1/impressive.1* %changelog +* Tue Dec 19 2017 Michael J Gruber - 0.11.2-1 +- sync with upstream + * Wed Jul 26 2017 Fedora Release Engineering - 0.11.1-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild diff --git a/sources b/sources index c677465..06b109e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0fdac7431208ff5866a6443bbdddeaee Impressive-0.11.1.tar.gz +SHA512 (Impressive-0.11.2.tar.gz) = c3e31f129503179f26255d721c151e0c981d14b218a084b2a13a18f6a96ad935f6655b20e0eeda9bc6a58477b5657314ddec189fab3e50fed1f3cfd43c8152e9 From f52d47ca4497548b23ff29fcbf302c05d1a089a0 Mon Sep 17 00:00:00 2001 From: Michael J Gruber Date: Wed, 27 Dec 2017 13:27:09 +0100 Subject: [PATCH 18/63] follow upstream re-tagging --- impressive.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/impressive.spec b/impressive.spec index a9d34fc..8a0a947 100644 --- a/impressive.spec +++ b/impressive.spec @@ -1,6 +1,6 @@ Name: impressive Version: 0.11.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A program that displays presentation slides Group: Applications/Productivity @@ -63,6 +63,9 @@ rm -rf %{buildroot} %{_mandir}/man1/impressive.1* %changelog +* Tue Dec 26 2017 Michael J Gruber - 0.11.2-2 +- follow upstream re-tagging + * Tue Dec 19 2017 Michael J Gruber - 0.11.2-1 - sync with upstream diff --git a/sources b/sources index 06b109e..072c142 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (Impressive-0.11.2.tar.gz) = c3e31f129503179f26255d721c151e0c981d14b218a084b2a13a18f6a96ad935f6655b20e0eeda9bc6a58477b5657314ddec189fab3e50fed1f3cfd43c8152e9 +SHA512 (Impressive-0.11.2.tar.gz) = cabb52612f65ddadfb080e3db6417680a1aa9724fe45d8b78a1206b6508a8b60c5e5a7c218ff0f90e62adcd498aabe625837164fc547604dfd7aba425db87dd6 From a4ce02081924714b2a0dc6db2957a773950c56e6 Mon Sep 17 00:00:00 2001 From: Michael J Gruber Date: Sat, 6 Jan 2018 18:27:26 +0100 Subject: [PATCH 19/63] depend on Py2 explicitely --- impressive.spec | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/impressive.spec b/impressive.spec index 8a0a947..ed60383 100644 --- a/impressive.spec +++ b/impressive.spec @@ -1,6 +1,6 @@ Name: impressive Version: 0.11.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A program that displays presentation slides Group: Applications/Productivity @@ -11,12 +11,13 @@ Source0: http://downloads.sourceforge.net/%{name}/Impressive-%{version}.t Source1: %{name}.sh BuildArch: noarch -BuildRequires: python-devel +BuildRequires: python2-devel # The following requires are not picked up by rpm: # - imported modules (required): -Requires: python-imaging +Requires: python2-imaging +# pygame is the python2 package but does not provide python2-pygame yet Requires: pygame -Requires: PyOpenGL +Requires: python2-pyopengl Requires: opengl-games-utils # - external tools for displaying and parsing pdf (required): Requires: mupdf @@ -63,6 +64,9 @@ rm -rf %{buildroot} %{_mandir}/man1/impressive.1* %changelog +* Thu Jan 04 2018 Michael J Gruber - 0.11.2-3 +- depend on Py2 packages explicitely + * Tue Dec 26 2017 Michael J Gruber - 0.11.2-2 - follow upstream re-tagging From c07f10fd12ab8bdef4ca7953c8531c98185ff80d Mon Sep 17 00:00:00 2001 From: Michael J Gruber Date: Sat, 6 Jan 2018 19:03:53 +0100 Subject: [PATCH 20/63] use correct shebang --- impressive.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/impressive.spec b/impressive.spec index ed60383..5b2fb5a 100644 --- a/impressive.spec +++ b/impressive.spec @@ -1,6 +1,6 @@ Name: impressive Version: 0.11.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A program that displays presentation slides Group: Applications/Productivity @@ -39,6 +39,7 @@ that are really useful for presentations. %prep %setup -q -n Impressive-%{version} +sed -ie '1s#/usr/bin/env python2#/usr/bin/python2#' impressive.py %build sed -e "s|@PYTHON_SITELIB@|%{python_sitelib}|" %{SOURCE1} > impressive.sh @@ -64,6 +65,9 @@ rm -rf %{buildroot} %{_mandir}/man1/impressive.1* %changelog +* Sat Jan 06 2018 Michael J Gruber - 0.11.2-4 +- use correct shebang + * Thu Jan 04 2018 Michael J Gruber - 0.11.2-3 - depend on Py2 packages explicitely From e85cd86482c11a21d1879d10c3c4bb2643ea104e Mon Sep 17 00:00:00 2001 From: Michael J Gruber Date: Tue, 6 Feb 2018 14:51:02 +0100 Subject: [PATCH 21/63] upstream bugfix release --- .gitignore | 1 + impressive.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 6d06a23..d7a103e 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ Impressive-0.10.2.tar.gz /Impressive-0.10.4.tar.gz /Impressive-0.11.1.tar.gz /Impressive-0.11.2.tar.gz +/Impressive-0.11.3.tar.gz diff --git a/impressive.spec b/impressive.spec index 5b2fb5a..92f45b1 100644 --- a/impressive.spec +++ b/impressive.spec @@ -1,6 +1,6 @@ Name: impressive -Version: 0.11.2 -Release: 4%{?dist} +Version: 0.11.3 +Release: 1%{?dist} Summary: A program that displays presentation slides Group: Applications/Productivity @@ -65,6 +65,9 @@ rm -rf %{buildroot} %{_mandir}/man1/impressive.1* %changelog +* Mon Feb 05 2018 Michael J Gruber - 0.11.3-1 +- upstream bugfix release + * Sat Jan 06 2018 Michael J Gruber - 0.11.2-4 - use correct shebang diff --git a/sources b/sources index 072c142..7711f11 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (Impressive-0.11.2.tar.gz) = cabb52612f65ddadfb080e3db6417680a1aa9724fe45d8b78a1206b6508a8b60c5e5a7c218ff0f90e62adcd498aabe625837164fc547604dfd7aba425db87dd6 +SHA512 (Impressive-0.11.3.tar.gz) = 7fcad9988b41bdb05cb2b6459f312c5c75a3d3ed5d1201dda713e79a80a0a9f95498550907771ac0d56906b46c172eb81f454b3e249d427198900756693c128d From aa0922cd7644523cf84a93a2c90a7e8616adcd88 Mon Sep 17 00:00:00 2001 From: Michael J Gruber Date: Tue, 6 Feb 2018 15:14:28 +0100 Subject: [PATCH 22/63] upstream bugfix and feature release --- .gitignore | 1 + impressive.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index d7a103e..94db17f 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ Impressive-0.10.2.tar.gz /Impressive-0.11.1.tar.gz /Impressive-0.11.2.tar.gz /Impressive-0.11.3.tar.gz +/Impressive-0.12.0.tar.gz diff --git a/impressive.spec b/impressive.spec index 92f45b1..5b0504c 100644 --- a/impressive.spec +++ b/impressive.spec @@ -1,5 +1,5 @@ Name: impressive -Version: 0.11.3 +Version: 0.12.0 Release: 1%{?dist} Summary: A program that displays presentation slides @@ -65,6 +65,9 @@ rm -rf %{buildroot} %{_mandir}/man1/impressive.1* %changelog +* Tue Feb 06 2018 Michael J Gruber - 0.12.0-1 +- upstream bugfix and feature release + * Mon Feb 05 2018 Michael J Gruber - 0.11.3-1 - upstream bugfix release diff --git a/sources b/sources index 7711f11..3ce36b9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (Impressive-0.11.3.tar.gz) = 7fcad9988b41bdb05cb2b6459f312c5c75a3d3ed5d1201dda713e79a80a0a9f95498550907771ac0d56906b46c172eb81f454b3e249d427198900756693c128d +SHA512 (Impressive-0.12.0.tar.gz) = 3425d9d53c8c3ff6d5de0a3466bbf5c94f257390b4929ba12547ba930099de67db4f4d77d4ef4e3e10f8f723478569a74042553f64cf95e236931c7aabb70f0a From 9fdc7190e3c8cc5578efc3591f75f4da51b72dc9 Mon Sep 17 00:00:00 2001 From: Michael J Gruber Date: Tue, 6 Feb 2018 16:02:37 +0100 Subject: [PATCH 23/63] remove obsolete dependency --- impressive.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/impressive.spec b/impressive.spec index 5b0504c..639f8a4 100644 --- a/impressive.spec +++ b/impressive.spec @@ -1,6 +1,6 @@ Name: impressive Version: 0.12.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A program that displays presentation slides Group: Applications/Productivity @@ -17,7 +17,6 @@ BuildRequires: python2-devel Requires: python2-imaging # pygame is the python2 package but does not provide python2-pygame yet Requires: pygame -Requires: python2-pyopengl Requires: opengl-games-utils # - external tools for displaying and parsing pdf (required): Requires: mupdf @@ -65,6 +64,9 @@ rm -rf %{buildroot} %{_mandir}/man1/impressive.1* %changelog +* Tue Feb 06 2018 Michael J Gruber - 0.12.0-2 +- remove obsolete dependency + * Tue Feb 06 2018 Michael J Gruber - 0.12.0-1 - upstream bugfix and feature release From fdb4daa8e54e0b29eaabf3122ae83022d5230a5b Mon Sep 17 00:00:00 2001 From: Iryna Shcherbina Date: Wed, 7 Feb 2018 03:58:48 +0100 Subject: [PATCH 24/63] Update Python 2 dependency declarations to new packaging standards --- impressive.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/impressive.spec b/impressive.spec index 639f8a4..c898665 100644 --- a/impressive.spec +++ b/impressive.spec @@ -1,6 +1,6 @@ Name: impressive Version: 0.12.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A program that displays presentation slides Group: Applications/Productivity @@ -16,7 +16,7 @@ BuildRequires: python2-devel # - imported modules (required): Requires: python2-imaging # pygame is the python2 package but does not provide python2-pygame yet -Requires: pygame +Requires: python2-pygame Requires: opengl-games-utils # - external tools for displaying and parsing pdf (required): Requires: mupdf @@ -64,6 +64,10 @@ rm -rf %{buildroot} %{_mandir}/man1/impressive.1* %changelog +* Wed Feb 07 2018 Iryna Shcherbina - 0.12.0-3 +- Update Python 2 dependency declarations to new packaging standards + (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) + * Tue Feb 06 2018 Michael J Gruber - 0.12.0-2 - remove obsolete dependency From 8f71ab9d78bc3daf5893417b31dbecb2804e66e9 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Wed, 14 Feb 2018 07:15:41 +0100 Subject: [PATCH 25/63] Remove %clean section None of currently supported distributions need that. Last one was EL5 which is EOL for a while. Signed-off-by: Igor Gnatenko --- impressive.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/impressive.spec b/impressive.spec index c898665..a0546a9 100644 --- a/impressive.spec +++ b/impressive.spec @@ -52,9 +52,6 @@ install -D -p -m 644 impressive.1 %{buildroot}%{_mandir}/man1/impressive.1 install -D -p -m 755 impressive.sh %{buildroot}%{_bindir}/impressive -%clean -rm -rf %{buildroot} - %files %defattr(-,root,root,-) From 353b0f72bf3e79ba74c1fc698aa0cd97674c473e Mon Sep 17 00:00:00 2001 From: Jason Tibbitts Date: Tue, 10 Jul 2018 01:23:23 -0500 Subject: [PATCH 26/63] Remove needless use of %defattr --- impressive.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/impressive.spec b/impressive.spec index a0546a9..8cd7ef8 100644 --- a/impressive.spec +++ b/impressive.spec @@ -54,7 +54,6 @@ install -D -p -m 755 impressive.sh %{buildroot}%{_bindir}/impressive %files -%defattr(-,root,root,-) %doc changelog.txt demo.pdf impressive.html license.txt %{_bindir}/impressive %{python_sitelib}/impressive.py* From 089139892944a96976dd6dc1a7deb7e1b6fd3f80 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 13 Jul 2018 05:41:27 +0000 Subject: [PATCH 27/63] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- impressive.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/impressive.spec b/impressive.spec index 8cd7ef8..71018ef 100644 --- a/impressive.spec +++ b/impressive.spec @@ -1,6 +1,6 @@ Name: impressive Version: 0.12.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A program that displays presentation slides Group: Applications/Productivity @@ -60,6 +60,9 @@ install -D -p -m 755 impressive.sh %{buildroot}%{_bindir}/impressive %{_mandir}/man1/impressive.1* %changelog +* Fri Jul 13 2018 Fedora Release Engineering - 0.12.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Wed Feb 07 2018 Iryna Shcherbina - 0.12.0-3 - Update Python 2 dependency declarations to new packaging standards (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) From 3a9cd39bd0f87e9a51673490df30985159c48021 Mon Sep 17 00:00:00 2001 From: Michael J Gruber Date: Fri, 13 Jul 2018 14:56:13 +0200 Subject: [PATCH 28/63] adjust to py2 packaging guidelines --- impressive.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/impressive.spec b/impressive.spec index 71018ef..8cc681d 100644 --- a/impressive.spec +++ b/impressive.spec @@ -1,6 +1,6 @@ Name: impressive Version: 0.12.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A program that displays presentation slides Group: Applications/Productivity @@ -41,13 +41,13 @@ that are really useful for presentations. sed -ie '1s#/usr/bin/env python2#/usr/bin/python2#' impressive.py %build -sed -e "s|@PYTHON_SITELIB@|%{python_sitelib}|" %{SOURCE1} > impressive.sh +sed -e "s|@PYTHON_SITELIB@|%{python2_sitelib}|" %{SOURCE1} > impressive.sh # This package doesn't build anything, just copy files under build root. %install rm -rf %{buildroot} -install -D -p -m 755 impressive.py %{buildroot}%{python_sitelib}/impressive.py +install -D -p -m 755 impressive.py %{buildroot}%{python2_sitelib}/impressive.py install -D -p -m 644 impressive.1 %{buildroot}%{_mandir}/man1/impressive.1 install -D -p -m 755 impressive.sh %{buildroot}%{_bindir}/impressive @@ -56,10 +56,13 @@ install -D -p -m 755 impressive.sh %{buildroot}%{_bindir}/impressive %files %doc changelog.txt demo.pdf impressive.html license.txt %{_bindir}/impressive -%{python_sitelib}/impressive.py* +%{python2_sitelib}/impressive.py* %{_mandir}/man1/impressive.1* %changelog +* Fri Jul 13 2018 Michael J Gruber - 0.12.0-5 +- adjust to py2 packaging guidelines + * Fri Jul 13 2018 Fedora Release Engineering - 0.12.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From e3c8da7ac2b02c6932b226cbd317370d119efb88 Mon Sep 17 00:00:00 2001 From: Michael J Gruber Date: Mon, 22 Oct 2018 11:27:06 +0200 Subject: [PATCH 29/63] rebuild for python2-pygame dependency update --- impressive.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/impressive.spec b/impressive.spec index 8cc681d..8c107c7 100644 --- a/impressive.spec +++ b/impressive.spec @@ -1,6 +1,6 @@ Name: impressive Version: 0.12.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: A program that displays presentation slides Group: Applications/Productivity @@ -60,6 +60,9 @@ install -D -p -m 755 impressive.sh %{buildroot}%{_bindir}/impressive %{_mandir}/man1/impressive.1* %changelog +* Mon Oct 22 2018 Michael J Gruber - 0.12.0-6 +- rebuild for python2-pygame dependency update + * Fri Jul 13 2018 Michael J Gruber - 0.12.0-5 - adjust to py2 packaging guidelines From 2726ba474f859d189d5cb5af5cd6c9655e549a68 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 28 Jan 2019 20:17:48 +0100 Subject: [PATCH 30/63] Remove obsolete Group tag References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag --- impressive.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/impressive.spec b/impressive.spec index 8c107c7..df2ded5 100644 --- a/impressive.spec +++ b/impressive.spec @@ -3,7 +3,6 @@ Version: 0.12.0 Release: 6%{?dist} Summary: A program that displays presentation slides -Group: Applications/Productivity License: GPLv2 URL: http://impressive.sourceforge.net/ Source0: http://downloads.sourceforge.net/%{name}/Impressive-%{version}.tar.gz From 1090911dffd5ee2cc031d83396e7dbc344939466 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 1 Feb 2019 03:19:23 +0000 Subject: [PATCH 31/63] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- impressive.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/impressive.spec b/impressive.spec index df2ded5..3e846f9 100644 --- a/impressive.spec +++ b/impressive.spec @@ -1,6 +1,6 @@ Name: impressive Version: 0.12.0 -Release: 6%{?dist} +Release: 7%{?dist} Summary: A program that displays presentation slides License: GPLv2 @@ -59,6 +59,9 @@ install -D -p -m 755 impressive.sh %{buildroot}%{_bindir}/impressive %{_mandir}/man1/impressive.1* %changelog +* Fri Feb 01 2019 Fedora Release Engineering - 0.12.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Mon Oct 22 2018 Michael J Gruber - 0.12.0-6 - rebuild for python2-pygame dependency update From 0f2b3ef1ab5d7e33eda3706cb3174c4b7aaff632 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jul 2019 09:28:54 +0000 Subject: [PATCH 32/63] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- impressive.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/impressive.spec b/impressive.spec index 3e846f9..a9614c2 100644 --- a/impressive.spec +++ b/impressive.spec @@ -1,6 +1,6 @@ Name: impressive Version: 0.12.0 -Release: 7%{?dist} +Release: 8%{?dist} Summary: A program that displays presentation slides License: GPLv2 @@ -59,6 +59,9 @@ install -D -p -m 755 impressive.sh %{buildroot}%{_bindir}/impressive %{_mandir}/man1/impressive.1* %changelog +* Thu Jul 25 2019 Fedora Release Engineering - 0.12.0-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Fri Feb 01 2019 Fedora Release Engineering - 0.12.0-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 43a9b5f3ee0022f21d0e50efe191bd4a78bbcea8 Mon Sep 17 00:00:00 2001 From: Michael J Gruber Date: Fri, 26 Jul 2019 16:08:03 +0200 Subject: [PATCH 33/63] remove obsolete comment The comment was made obsolete by fdb4daa ("Update Python 2 dependency declarations to new packaging standards", 2018-02-07) which changed the spec's code only. Remove it and stop confusing readers. --- impressive.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/impressive.spec b/impressive.spec index a9614c2..0bfc9ef 100644 --- a/impressive.spec +++ b/impressive.spec @@ -1,6 +1,6 @@ Name: impressive Version: 0.12.0 -Release: 8%{?dist} +Release: 9%{?dist} Summary: A program that displays presentation slides License: GPLv2 @@ -14,7 +14,6 @@ BuildRequires: python2-devel # The following requires are not picked up by rpm: # - imported modules (required): Requires: python2-imaging -# pygame is the python2 package but does not provide python2-pygame yet Requires: python2-pygame Requires: opengl-games-utils # - external tools for displaying and parsing pdf (required): @@ -59,6 +58,9 @@ install -D -p -m 755 impressive.sh %{buildroot}%{_bindir}/impressive %{_mandir}/man1/impressive.1* %changelog +* Fri Jul 26 2019 Michael J Gruber - 0.12.0-9 +- remove obsolete comment + * Thu Jul 25 2019 Fedora Release Engineering - 0.12.0-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From c9022f506f58f2e340bb41515fcd564a37e808ca Mon Sep 17 00:00:00 2001 From: Michael J Gruber Date: Sun, 18 Aug 2019 16:43:45 +0200 Subject: [PATCH 34/63] port to py3 - port current svn version to python3 (coordinated with upstream, release pending) - fixes bug 1731634 --- Impressive-0.12.0-235-245.patch | 447 +++++++ Impressive-0.12.0-245-py3.patch | 1941 +++++++++++++++++++++++++++++++ impressive.spec | 29 +- 3 files changed, 2407 insertions(+), 10 deletions(-) create mode 100644 Impressive-0.12.0-235-245.patch create mode 100644 Impressive-0.12.0-245-py3.patch diff --git a/Impressive-0.12.0-235-245.patch b/Impressive-0.12.0-235-245.patch new file mode 100644 index 0000000..811f94e --- /dev/null +++ b/Impressive-0.12.0-235-245.patch @@ -0,0 +1,447 @@ +Binärdateien Impressive-0.12.0/demo.pdf und Impressive-0.12.1-WIP/demo.pdf sind verschieden. +diff -u Impressive-0.12.0/impressive.1 Impressive-0.12.1-WIP/impressive.1 +--- Impressive-0.12.0/impressive.1 2018-02-04 21:31:39.000000000 +0100 ++++ Impressive-0.12.1-WIP/impressive.1 2019-08-18 16:25:04.000000000 +0200 +@@ -1,5 +1,5 @@ + .\" generated by KeyJ's html2man.py version 0.1.1 +-.TH IMPRESSIVE 1 2018-02-04 "Martin J. Fiedler" "Impressive Documentation"> ++.TH IMPRESSIVE 1 2018-02-07 "Martin J. Fiedler" "Impressive Documentation"> + .SH "NAME" + Impressive \- presentation tool with eye candy + .SH "SYNOPSIS" +@@ -666,6 +666,16 @@ + .RE + .PP + .br ++\fBA\fR key ++.RS ++Toggle automatic slideshow mode. ++.br ++If an automatic presentation has been started with the \fB\-a\fR/\:\fB\-\-auto\fR option, it is temporarily disabled until this key is pressed again. It is not automatically re\-enabled after changing the page. If the \fB\-a\fR/\:\fB\-\-auto\fR has not been used, an automatic presentation with a timeout of 30 seconds is started when this key is pressed for the first time. ++.br ++Note that if a page has a \fBtimeout\fR PageProp, the specified timeout is \fIalways\fR in effect when the page is entered, even if the automatic slideshow is otherwise disabled. ++.RE ++.PP ++.br + \fBS\fR key + .RS + Save the info script associated with the current presentation. The main purpose for this is to permanently save highlight boxes or keyboard shortcuts, so they will be restored the next time this presentation is started. +@@ -857,6 +867,26 @@ + The following list describes all actions supported by Impressive, together with the conditions under which they will match. Note that most actions will not match in overview mode and during video playback, unless mentioned otherwise in the description. + .PP + .br ++\fBauto\-start\fR ++.RS ++(Re\-)enable automatic presentation mode. If the current page has no \fBtimeout\fR PageProp and no \fB\-a\fR/\:\fB\-\-auto\fR option has been specified, an automatic presentation is started with a 30\-second page interval. ++.RE ++.PP ++.br ++\fBauto\-stop\fR ++.RS ++Disable automatic presentation mode. If the current page has a \fBtimeout\fR PageProp or an \fB\-a\fR/\:\fB\-\-auto\fR option has been specified, the timeout for the current page is stopped. ++.br ++The automatic presentation stays disabled after changing pages, unless a \fBtimeout\fR PageProp is specified for the target page, which will take precedence over the otherwise disabled automatic presentation mode. ++.RE ++.PP ++.br ++\fBauto\-toggle\fR ++.RS ++Disables or (re\-)enables automatic presentations, depending on the current state. ++.RE ++.PP ++.br + \fBbox\-add\fR + .RS + Draw a highlight box if the mouse has been moved since the button has been pressed down. This action must only be bound to a mouse button event, otherwise it will not function properly. +diff -u Impressive-0.12.0/impressive.html Impressive-0.12.1-WIP/impressive.html +--- Impressive-0.12.0/impressive.html 2018-02-04 21:31:39.000000000 +0100 ++++ Impressive-0.12.1-WIP/impressive.html 2019-08-18 16:25:04.000000000 +0200 +@@ -13,12 +13,12 @@ + +

+ http://impressive.sourceforge.net/
+-Version: 0.12.0
++Version: 0.12.1-WIP
+ Author: Martin J. Fiedler
+-Last updated: 2018-02-04

++Last updated: 2018-02-07

+ + ") diff --git a/impressive.spec b/impressive.spec index 0bfc9ef..4bdb726 100644 --- a/impressive.spec +++ b/impressive.spec @@ -1,6 +1,6 @@ Name: impressive Version: 0.12.0 -Release: 9%{?dist} +Release: 10%{?dist} Summary: A program that displays presentation slides License: GPLv2 @@ -8,13 +8,17 @@ 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 - +# diff between 0.12.0 and current svn version r245 +Patch0: Impressive-0.12.0-235-245.patch +# py3-compatible conversion of r245 (https://github.com/mjg/Impressive/tree/py3k) +Patch1: Impressive-0.12.0-245-py3.patch + BuildArch: noarch -BuildRequires: python2-devel +BuildRequires: python3-devel # The following requires are not picked up by rpm: # - imported modules (required): -Requires: python2-imaging -Requires: python2-pygame +Requires: python3-imaging +Requires: python3-pygame Requires: opengl-games-utils # - external tools for displaying and parsing pdf (required): Requires: mupdf @@ -35,17 +39,17 @@ that are really useful for presentations. %prep -%setup -q -n Impressive-%{version} -sed -ie '1s#/usr/bin/env python2#/usr/bin/python2#' impressive.py +%autosetup -n Impressive-%{version} -p1 +sed -ie '1s#/usr/bin/env python2#/usr/bin/python3#' impressive.py %build -sed -e "s|@PYTHON_SITELIB@|%{python2_sitelib}|" %{SOURCE1} > impressive.sh +sed -e "s|@PYTHON_SITELIB@|%{python3_sitelib}|" %{SOURCE1} > impressive.sh # This package doesn't build anything, just copy files under build root. %install rm -rf %{buildroot} -install -D -p -m 755 impressive.py %{buildroot}%{python2_sitelib}/impressive.py +install -D -p -m 755 impressive.py %{buildroot}%{python3_sitelib}/impressive.py install -D -p -m 644 impressive.1 %{buildroot}%{_mandir}/man1/impressive.1 install -D -p -m 755 impressive.sh %{buildroot}%{_bindir}/impressive @@ -54,10 +58,15 @@ install -D -p -m 755 impressive.sh %{buildroot}%{_bindir}/impressive %files %doc changelog.txt demo.pdf impressive.html license.txt %{_bindir}/impressive -%{python2_sitelib}/impressive.py* +%{python3_sitelib}/impressive.py +%{python3_sitelib}/__pycache__/* %{_mandir}/man1/impressive.1* %changelog +* Sun Aug 18 2019 Michael J Gruber - 0.12.0-10 +- port current svn version to python3 (coordinated with upstream, release pending) +- fixes bug 1731634 + * Fri Jul 26 2019 Michael J Gruber - 0.12.0-9 - remove obsolete comment From 622a686c572f03a98715f212d1d4bf5131800b3d Mon Sep 17 00:00:00 2001 From: Michael J Gruber Date: Mon, 19 Aug 2019 15:29:35 +0200 Subject: [PATCH 35/63] improve/fix the py3 patch --- Impressive-0.12.0-245-py3.patch | 212 +++++++++++++++++++++----------- impressive.spec | 7 +- 2 files changed, 149 insertions(+), 70 deletions(-) diff --git a/Impressive-0.12.0-245-py3.patch b/Impressive-0.12.0-245-py3.patch index e379ac6..3b0529b 100644 --- a/Impressive-0.12.0-245-py3.patch +++ b/Impressive-0.12.0-245-py3.patch @@ -1,6 +1,6 @@ -diff -u Impressive-0.12.1-WIP/impressive.py Impressive-0.12.1-WIP-py3/impressive.py ---- Impressive-0.12.1-WIP/impressive.py 2019-08-18 16:27:33.439233087 +0200 -+++ Impressive-0.12.1-WIP-py3/impressive.py 2019-08-18 16:29:05.565903470 +0200 +diff -u Impressive-0.12.1-WIP-py2/impressive.py Impressive-0.12.1-WIP-py3-v2/impressive.py +--- Impressive-0.12.1-WIP-py2/impressive.py 2019-08-18 16:27:33.439233087 +0200 ++++ Impressive-0.12.1-WIP-py3-v2/impressive.py 2019-08-19 15:23:28.801130609 +0200 @@ -17,6 +17,8 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA @@ -31,7 +31,7 @@ diff -u Impressive-0.12.1-WIP/impressive.py Impressive-0.12.1-WIP-py3/impressive # import basic modules -import random, getopt, os, types, re, codecs, tempfile, glob, cStringIO, re -+import random, getopt, os, types, re, codecs, tempfile, glob, io, re ++import random, getopt, os, re, codecs, tempfile, glob, io, re import traceback, subprocess, time, itertools, ctypes.util, zlib, urllib from math import * from ctypes import * @@ -214,6 +214,15 @@ diff -u Impressive-0.12.1-WIP/impressive.py Impressive-0.12.1-WIP-py3/impressive # unescape { literals in PDF files re_unescape = re.compile(r'&#[0-9]+;') +@@ -865,7 +876,7 @@ + + # parse pdftk output + def pdftkParse(filename, page_offset=0): +- f = file(filename, "r") ++ f = open(filename, "r") + InfoKey = None + BookmarkTitle = None + Title = None @@ -896,7 +907,7 @@ f.close() if AutoOverview: @@ -804,7 +813,15 @@ diff -u Impressive-0.12.1-WIP/impressive.py Impressive-0.12.1-WIP-py3/impressive finally: try: os.remove(uncompressed) -@@ -2967,13 +2990,13 @@ +@@ -2960,20 +2983,20 @@ + + # try to open the pre-existing cache file + try: +- CacheFile = file(CacheFileName, "rb+") ++ CacheFile = open(CacheFileName, "rb+") + except IOError: + CacheFile = None + # check the cache magic UpdateCacheMagic() if CacheFile and (CacheFile.read(32) != CacheMagic): @@ -820,9 +837,12 @@ diff -u Impressive-0.12.1-WIP/impressive.py Impressive-0.12.1-WIP-py3/impressive for page in range(1, PageCount+1): offset = int(CacheFile.read(8), 16) if offset: -@@ -2984,8 +3007,8 @@ +@@ -2982,10 +3005,10 @@ + else: + # if the magic was invalid or the file didn't exist, (re-)create it try: - CacheFile = file(CacheFileName, "wb+") +- CacheFile = file(CacheFileName, "wb+") ++ CacheFile = open(CacheFileName, "wb+") except IOError: - print >>sys.stderr, "Error: cannot write the persistent cache file (`%s')" % CacheFileName - print >>sys.stderr, "Falling back to temporary file cache." @@ -1111,7 +1131,21 @@ diff -u Impressive-0.12.1-WIP/impressive.py Impressive-0.12.1-WIP-py3/impressive LambdaWarning = True # "clean" a PageProps entry so that only 'public' properties are left -@@ -3740,9 +3763,9 @@ +@@ -3734,22 +3757,29 @@ + + # Generate a string representation of a property value. Mainly this converts + # classes or instances to the name of the class. ++class dummyClass: ++ pass ++ ++typesClassType = type(dummyClass) ++typesInstanceType = type(dummyClass()) ++typesFunctionType = type(GetPublicProps) ++ + def PropValueRepr(value): + global ScriptTainted +- if type(value) == types.FunctionType: ++ if type(value) == typesFunctionType: if value.__name__ != "": return value.__name__ if not ScriptTainted: @@ -1123,8 +1157,27 @@ diff -u Impressive-0.12.1-WIP/impressive.py Impressive-0.12.1-WIP-py3/impressive + print(" minimize data loss.", file=sys.stderr) ScriptTainted = True return "here_was_a_lambda_expression_that_could_not_be_saved" - elif type(value) == types.ClassType: -@@ -3772,7 +3795,7 @@ +- elif type(value) == types.ClassType: ++ elif isinstance(value, typesClassType): + return value.__name__ +- elif type(value) == types.InstanceType: ++ elif isinstance(value, typesInstanceType): + return value.__class__.__name__ +- elif type(value) == types.DictType: ++ elif type(value) == dict: + return "{ " + ", ".join([PropValueRepr(k) + ": " + PropValueRepr(value[k]) for k in value]) + " }" + else: + return repr(value) +@@ -3763,7 +3793,7 @@ + + # generate a nicely formatted string representation of all page properties + def PagePropRepr(): +- pages = PageProps.keys() ++ pages = list(PageProps.keys()) + pages.sort() + return "PageProps = {%s\n}" % (",".join(filter(None, map(SinglePagePropRepr, pages)))) + +@@ -3772,7 +3802,7 @@ def CountDictChars(s, start=0): context = None level = 0 @@ -1133,7 +1186,7 @@ diff -u Impressive-0.12.1-WIP/impressive.py Impressive-0.12.1-WIP-py3/impressive c = s[i] if context is None: if c == '{': level += 1 -@@ -3791,7 +3814,7 @@ +@@ -3791,13 +3821,13 @@ if c == "\\": context = "\\'" if c == "'": context = None if level < 0: return i @@ -1142,7 +1195,19 @@ diff -u Impressive-0.12.1-WIP/impressive.py Impressive-0.12.1-WIP-py3/impressive # modify and save a file's info script def SaveInfoScript(filename): -@@ -3825,7 +3848,7 @@ + # read the old info script + try: +- f = file(filename, "r") ++ f = open(filename, "r") + script = f.read() + f.close() + except IOError: +@@ -3821,11 +3851,11 @@ + + # write the script back + try: +- f = file(filename, "w") ++ f = open(filename, "w") f.write(script) f.close() except: @@ -1151,7 +1216,7 @@ diff -u Impressive-0.12.1-WIP/impressive.py Impressive-0.12.1-WIP-py3/impressive ##### OPENGL RENDERING ######################################################### -@@ -4055,7 +4078,7 @@ +@@ -4055,7 +4085,7 @@ ) if OSDFont: gl.Enable(gl.BLEND) @@ -1160,7 +1225,7 @@ diff -u Impressive-0.12.1-WIP/impressive.py Impressive-0.12.1-WIP-py3/impressive __version__.split()[0], align=Center, alpha=0.25, beveled=False) gl.Disable(gl.BLEND) -@@ -4151,11 +4174,11 @@ +@@ -4151,11 +4181,11 @@ global CursorTexture, CursorHotspot, CursorSX, CursorSY, CursorTX, CursorTY if not cimg: CursorHotspot = (1,0) @@ -1174,7 +1239,7 @@ diff -u Impressive-0.12.1-WIP/impressive.py Impressive-0.12.1-WIP-py3/impressive return False img = Image.new('RGBA', (tw, th)) img.paste(cimg, (0, 0)) -@@ -4247,7 +4270,7 @@ +@@ -4247,7 +4277,7 @@ def ResetTimer(): global StartTime, PageEnterTime if TimeTracking and not(FirstPage): @@ -1183,7 +1248,7 @@ diff -u Impressive-0.12.1-WIP/impressive.py Impressive-0.12.1-WIP-py3/impressive StartTime = Platform.GetTicks() PageEnterTime = 0 -@@ -4269,8 +4292,8 @@ +@@ -4269,8 +4299,8 @@ if Fullscreen: opts.append("-fs") else: @@ -1194,7 +1259,7 @@ diff -u Impressive-0.12.1-WIP/impressive.py Impressive-0.12.1-WIP-py3/impressive VideoPlaying = False MPlayerProcess = None return -@@ -4372,9 +4395,9 @@ +@@ -4372,9 +4402,9 @@ p = "over" else: p = "%4d" % Pcurrent @@ -1206,7 +1271,7 @@ diff -u Impressive-0.12.1-WIP/impressive.py Impressive-0.12.1-WIP-py3/impressive # create an instance of a transition class def InstantiateTransition(trans_class): -@@ -4383,7 +4406,7 @@ +@@ -4383,7 +4413,7 @@ except GLInvalidShaderError: return None except GLShaderCompileError: @@ -1215,7 +1280,7 @@ diff -u Impressive-0.12.1-WIP/impressive.py Impressive-0.12.1-WIP-py3/impressive return None # perform a transition to a specified page -@@ -4525,10 +4548,10 @@ +@@ -4525,10 +4555,10 @@ pass # clear all OpenGL errors gl.TexImage2D(gl.TEXTURE_2D, 0, gl.RGB, int(ResZoomFactor * TexWidth), int(ResZoomFactor * TexHeight), 0, gl.RGB, gl.UNSIGNED_BYTE, PageImage(Pcurrent, True)) if gl.GetError(): @@ -1230,7 +1295,7 @@ diff -u Impressive-0.12.1-WIP/impressive.py Impressive-0.12.1-WIP-py3/impressive HighResZoomFailed = True return DrawCurrentPage() -@@ -4595,11 +4618,11 @@ +@@ -4595,11 +4625,11 @@ def PrepareTransitions(): Unspecified = 0xAFFED00F # STEP 1: randomly assign transitions where the user didn't specify them @@ -1245,7 +1310,7 @@ diff -u Impressive-0.12.1-WIP/impressive.py Impressive-0.12.1-WIP-py3/impressive if GetPageProp(page, 'transition', Unspecified) == Unspecified: SetPageProp(page, '_transition', newtrans.pop()) # STEP 2: instantiate transitions -@@ -4633,10 +4656,10 @@ +@@ -4633,10 +4663,10 @@ def EnableTimeTracking(force=False): global TimeTracking if force or (TimeDisplay and not(TimeTracking) and not(ShowClock) and FirstPage): @@ -1259,7 +1324,7 @@ diff -u Impressive-0.12.1-WIP/impressive.py Impressive-0.12.1-WIP-py3/impressive # set cursor visibility def SetCursor(visible): -@@ -4658,7 +4681,7 @@ +@@ -4658,7 +4688,7 @@ if (len(key) == 1) or ((key >= "f1") and (key <= "f9")): # Note: F10..F12 are implicitly included due to lexicographic sorting page = None @@ -1268,7 +1333,7 @@ diff -u Impressive-0.12.1-WIP/impressive.py Impressive-0.12.1-WIP-py3/impressive if props.get('shortcut') == key: page = check_page break -@@ -4673,7 +4696,7 @@ +@@ -4673,7 +4703,7 @@ ##### EVENT-TO-ACTION BINDING CODE ############################################# @@ -1277,7 +1342,7 @@ diff -u Impressive-0.12.1-WIP/impressive.py Impressive-0.12.1-WIP-py3/impressive ampersand asterisk at backquote backslash backspace break capslock caret clear comma down escape euro end exclaim greater hash help home insert kp_divide kp_enter kp_equals kp_minus kp_multiply kp_plus lalt last lctrl left leftbracket -@@ -4681,12 +4704,12 @@ +@@ -4681,12 +4711,12 @@ period plus power print question quote quotedbl ralt rctrl return right rightbracket rightparen rmeta rshift rsuper scrollock semicolon slash space sysreq tab underscore up @@ -1293,7 +1358,7 @@ diff -u Impressive-0.12.1-WIP/impressive.py Impressive-0.12.1-WIP-py3/impressive # event handling model: # - Platform.GetEvent() generates platform-neutral event (= string) that -@@ -4787,7 +4810,7 @@ +@@ -4787,7 +4817,7 @@ error_prefix += ": " else: error_prefix = "" @@ -1302,7 +1367,7 @@ diff -u Impressive-0.12.1-WIP/impressive.py Impressive-0.12.1-WIP-py3/impressive return False def ValidateAction(ev, error_prefix=None): -@@ -4797,7 +4820,7 @@ +@@ -4797,7 +4827,7 @@ error_prefix += ": " else: error_prefix = "" @@ -1311,7 +1376,7 @@ diff -u Impressive-0.12.1-WIP/impressive.py Impressive-0.12.1-WIP-py3/impressive return False def BindEvent(events, actions=None, clear=False, remove=False, error_prefix=None): -@@ -4820,7 +4843,7 @@ +@@ -4820,7 +4850,7 @@ (that's what the basedirs option is for) """ global EventMap @@ -1320,7 +1385,7 @@ diff -u Impressive-0.12.1-WIP/impressive.py Impressive-0.12.1-WIP-py3/impressive if not actions: if (';' in events) or ('\n' in events): for cmd in events.replace('\n', ';').split(';'): -@@ -4841,7 +4864,7 @@ +@@ -4841,7 +4871,7 @@ events = events.split(',') if actions is None: actions = [] @@ -1329,7 +1394,7 @@ diff -u Impressive-0.12.1-WIP/impressive.py Impressive-0.12.1-WIP-py3/impressive actions = actions.split(',') actions = [b.replace('_', '-').strip(' \t$+-').lower() for b in actions] actions = [a for a in actions if ValidateAction(a, error_prefix)] -@@ -4893,25 +4916,25 @@ +@@ -4893,25 +4923,25 @@ if line: BindEvent(line, error_prefix="%s:%d" % (filename, n)) f.close() @@ -1371,7 +1436,7 @@ diff -u Impressive-0.12.1-WIP/impressive.py Impressive-0.12.1-WIP-py3/impressive while evlist: line = " " while evlist and ((len(line) + len(evlist[0])) < 78): -@@ -4919,27 +4942,27 @@ +@@ -4919,27 +4949,27 @@ line = line.rstrip() if not evlist: line = line.rstrip(',') @@ -1411,7 +1476,7 @@ diff -u Impressive-0.12.1-WIP/impressive.py Impressive-0.12.1-WIP-py3/impressive def LoadDefaultBindings(): BindEvent("""clearall -@@ -5136,7 +5159,7 @@ +@@ -5136,7 +5166,7 @@ return OverviewSelection = dest x, y = OverviewPos(OverviewSelection) @@ -1420,7 +1485,7 @@ diff -u Impressive-0.12.1-WIP/impressive.py Impressive-0.12.1-WIP-py3/impressive # overview mode PageProp toggle def OverviewTogglePageProp(prop, default): -@@ -5266,8 +5289,8 @@ +@@ -5266,8 +5296,8 @@ if page: OverviewSelection = OverviewPageMapInv[page] x, y = OverviewPos(OverviewSelection) @@ -1431,7 +1496,7 @@ diff -u Impressive-0.12.1-WIP/impressive.py Impressive-0.12.1-WIP-py3/impressive DrawOverview() except ExitOverview: PageLeft(overview=True) -@@ -5355,7 +5378,7 @@ +@@ -5355,7 +5385,7 @@ return # invalidate everything we used to know about the input files InvalidateCache() @@ -1440,7 +1505,7 @@ diff -u Impressive-0.12.1-WIP/impressive.py Impressive-0.12.1-WIP-py3/impressive for prop in ('_overview_rendered', '_box', '_href'): if prop in props: del props[prop] LoadInfoScript() -@@ -5434,6 +5457,7 @@ +@@ -5434,6 +5464,7 @@ if PanValid and ZoomMode: if not(Panning) and (abs(x - PanBaseX) > 1) and (abs(y - PanBaseY) > 1): Panning = True @@ -1448,7 +1513,7 @@ diff -u Impressive-0.12.1-WIP/impressive.py Impressive-0.12.1-WIP-py3/impressive ZoomX0 = PanAnchorX + (PanBaseX - x) * ZoomArea / ScreenWidth ZoomY0 = PanAnchorY + (PanBaseY - y) * ZoomArea / ScreenHeight ZoomX0 = min(max(ZoomX0, 0.0), 1.0 - ZoomArea) -@@ -5553,7 +5577,7 @@ +@@ -5553,7 +5584,7 @@ x, y = Platform.GetMousePos() for valid, target, x0, y0, x1, y1 in GetPageProp(Pcurrent, '_href', []): if valid and (x >= x0) and (x < x1) and (y >= y0) and (y < y1): @@ -1457,7 +1522,7 @@ diff -u Impressive-0.12.1-WIP/impressive.py Impressive-0.12.1-WIP-py3/impressive TransitionTo(target, allow_transition=allow_transition) elif target: RunURL(target) -@@ -5645,6 +5669,7 @@ +@@ -5645,6 +5676,7 @@ def _zoom_out(self): "zoom out a small bit" ActionValidIf((MouseWheelZoom or ZoomMode) and not(BoxZoom)) @@ -1465,7 +1530,7 @@ diff -u Impressive-0.12.1-WIP/impressive.py Impressive-0.12.1-WIP-py3/impressive ChangeZoom(ViewZoomFactor / ZoomStep, Platform.GetMousePos()) def _zoom_update(self): -@@ -5738,6 +5763,7 @@ +@@ -5738,6 +5770,7 @@ def _gamma_decrease(self): "decrease gamma" @@ -1473,7 +1538,16 @@ diff -u Impressive-0.12.1-WIP/impressive.py Impressive-0.12.1-WIP-py3/impressive SetGamma(new_gamma=Gamma / GammaStep) def _gamma_increase(self): "increase gamma" -@@ -5827,7 +5853,7 @@ +@@ -5814,7 +5847,7 @@ + name = name[1:] + dirname = os.path.dirname(name) + try: +- f = file(name, "r") ++ f = open(name, "r") + next_title = None + for line in f: + line = [part.strip() for part in line.split('#', 1)] +@@ -5827,7 +5860,7 @@ AddFile(os.path.normpath(os.path.join(dirname, subfile)), title, implicit=True) f.close() except IOError: @@ -1482,7 +1556,7 @@ diff -u Impressive-0.12.1-WIP/impressive.py Impressive-0.12.1-WIP-py3/impressive return # generate absolute path -@@ -5848,13 +5874,13 @@ +@@ -5848,13 +5881,13 @@ FileList.append(name) if title: SetFileProp(name, 'title', title) else: @@ -1498,7 +1572,7 @@ diff -u Impressive-0.12.1-WIP/impressive.py Impressive-0.12.1-WIP-py3/impressive for img in images: AddFile(img, implicit=True) -@@ -5863,7 +5889,7 @@ +@@ -5863,7 +5896,7 @@ if files: for f in files: AddFile(f, implicit=True) else: @@ -1507,7 +1581,7 @@ diff -u Impressive-0.12.1-WIP/impressive.py Impressive-0.12.1-WIP-py3/impressive ##### INITIALIZATION ########################################################### -@@ -5892,7 +5918,7 @@ +@@ -5892,7 +5925,7 @@ TempFileName = tempfile.mktemp(prefix="impressive-", suffix="_tmp") except EnvironmentError: if not Bare: @@ -1516,7 +1590,7 @@ diff -u Impressive-0.12.1-WIP/impressive.py Impressive-0.12.1-WIP-py3/impressive Bare = True # some input guesswork -@@ -5912,7 +5938,7 @@ +@@ -5912,7 +5945,7 @@ size = Platform.GetScreenSize() if size: ScreenWidth, ScreenHeight = size @@ -1525,7 +1599,7 @@ diff -u Impressive-0.12.1-WIP/impressive.py Impressive-0.12.1-WIP-py3/impressive if DAR is None: PAR = 1.0 DAR = float(ScreenWidth) / float(ScreenHeight) -@@ -5936,7 +5962,7 @@ +@@ -5936,7 +5969,7 @@ if ispdf: # PDF input -> initialize renderers and if none available, reject if not InitPDFRenderer(): @@ -1534,7 +1608,7 @@ diff -u Impressive-0.12.1-WIP/impressive.py Impressive-0.12.1-WIP-py3/impressive continue # try to pre-parse the PDF file -@@ -5990,7 +6016,7 @@ +@@ -5990,7 +6023,7 @@ # validity check if not pages: @@ -1543,7 +1617,7 @@ diff -u Impressive-0.12.1-WIP/impressive.py Impressive-0.12.1-WIP-py3/impressive continue # add pages and files into PageProps and FileProps -@@ -6010,7 +6036,7 @@ +@@ -6010,7 +6043,7 @@ # no pages? strange ... if not PageCount: @@ -1552,7 +1626,7 @@ diff -u Impressive-0.12.1-WIP/impressive.py Impressive-0.12.1-WIP-py3/impressive sys.exit(1) # if rendering is wanted, do it NOW -@@ -6032,26 +6058,26 @@ +@@ -6032,26 +6065,26 @@ InitialPage = GetNextPage(0, 1) Pcurrent = InitialPage if (Pcurrent <= 0) or (Pcurrent > PageCount): @@ -1585,7 +1659,7 @@ diff -u Impressive-0.12.1-WIP/impressive.py Impressive-0.12.1-WIP-py3/impressive # check if graphics are unaccelerated renderer = GLRenderer.lower().replace(' ', '').replace('(r)', '') -@@ -6059,8 +6085,8 @@ +@@ -6059,8 +6092,8 @@ or (renderer in ("mesaglxindirect", "gdigeneric")) \ or renderer.startswith("software") \ or ("llvmpipe" in renderer): @@ -1596,7 +1670,7 @@ diff -u Impressive-0.12.1-WIP/impressive.py Impressive-0.12.1-WIP-py3/impressive # check for old hardware that can't deal with the blur shader for substr in ("i915", "intel915", "intel945", "intelq3", "intelg3", "inteligd", "gma900", "gma950", "gma3000", "gma3100", "gma3150"): -@@ -6071,12 +6097,12 @@ +@@ -6071,12 +6104,12 @@ extensions = set((gl.GetString(gl.EXTENSIONS) or "").split()) if (GLVersion < "2") and (not("GL_ARB_shader_objects" in extensions) or not("GL_ARB_texture_non_power_of_two" in extensions)): raise ImportError("OpenGL version %r is below 2.0 and the necessary extensions are unavailable" % GLVersion) @@ -1615,7 +1689,7 @@ diff -u Impressive-0.12.1-WIP/impressive.py Impressive-0.12.1-WIP-py3/impressive sys.exit(1) # some further OpenGL configuration -@@ -6091,9 +6117,9 @@ +@@ -6091,9 +6124,9 @@ UseBlurShader = False if Verbose: if UseBlurShader: @@ -1627,7 +1701,7 @@ diff -u Impressive-0.12.1-WIP/impressive.py Impressive-0.12.1-WIP-py3/impressive gl.BlendFunc(gl.SRC_ALPHA, gl.ONE_MINUS_SRC_ALPHA) BoxIndexBuffer = HighlightIndexBuffer(4) -@@ -6113,7 +6139,7 @@ +@@ -6113,7 +6146,7 @@ if (maxsize > ScreenWidth) and (maxsize <= 65536): MaxZoomFactor = min(MaxZoomFactor, maxsize / ScreenWidth, maxsize / ScreenHeight) if Verbose: @@ -1636,7 +1710,7 @@ diff -u Impressive-0.12.1-WIP/impressive.py Impressive-0.12.1-WIP-py3/impressive # set up some variables PixelX = 1.0 / ScreenWidth -@@ -6121,7 +6147,7 @@ +@@ -6121,7 +6154,7 @@ ScreenAspect = float(ScreenWidth) / float(ScreenHeight) # prepare logo image @@ -1645,7 +1719,7 @@ diff -u Impressive-0.12.1-WIP/impressive.py Impressive-0.12.1-WIP-py3/impressive LogoTexture = gl.make_texture(gl.TEXTURE_2D, filter=gl.NEAREST, img=LogoImage) DrawLogo() Platform.SwapBuffers() -@@ -6132,15 +6158,15 @@ +@@ -6132,15 +6165,15 @@ DrawLogo() titles = [] for key in ('title', '_title'): @@ -1665,7 +1739,7 @@ diff -u Impressive-0.12.1-WIP/impressive.py Impressive-0.12.1-WIP-py3/impressive # handle event test mode if EventTestMode: -@@ -6154,7 +6180,7 @@ +@@ -6154,7 +6187,7 @@ img = Image.open(CursorImage).convert('RGBA') img.load() except: @@ -1674,7 +1748,7 @@ diff -u Impressive-0.12.1-WIP/impressive.py Impressive-0.12.1-WIP-py3/impressive img = None CursorImage = PrepareCustomCursor(img) else: -@@ -6171,14 +6197,14 @@ +@@ -6171,14 +6204,14 @@ # overview preparations if EnableOverview: # initialize overview metadata @@ -1692,7 +1766,7 @@ diff -u Impressive-0.12.1-WIP/impressive.py Impressive-0.12.1-WIP-py3/impressive if OverviewPageMap[i] >= page: OverviewPageMapInv[page] = i break -@@ -6233,15 +6259,15 @@ +@@ -6233,15 +6266,15 @@ time_left -= GetPageProp(p, 'transtime', TransitionDuration) p = pnext if pages and (time_left >= pages): @@ -1712,7 +1786,7 @@ diff -u Impressive-0.12.1-WIP/impressive.py Impressive-0.12.1-WIP-py3/impressive BackgroundRendering = False # if caching is enabled, pre-render all pages -@@ -6257,7 +6283,7 @@ +@@ -6257,7 +6290,7 @@ def prerender_action_handler(action): if action in ("$quit", "*quit"): Quit() @@ -1721,7 +1795,7 @@ diff -u Impressive-0.12.1-WIP/impressive.py Impressive-0.12.1-WIP-py3/impressive while True: ev = Platform.GetEvent(poll=True) if not ev: break -@@ -6321,14 +6347,14 @@ +@@ -6321,14 +6354,14 @@ def DoEventTestMode(): last_event = "(None)" need_redraw = True @@ -1741,7 +1815,7 @@ diff -u Impressive-0.12.1-WIP/impressive.py Impressive-0.12.1-WIP-py3/impressive t0 = Platform.GetTicks() while True: if need_redraw: -@@ -6351,7 +6377,7 @@ +@@ -6351,7 +6384,7 @@ Quit() elif ev and ev.startswith('*'): now = Platform.GetTicks() @@ -1750,7 +1824,7 @@ diff -u Impressive-0.12.1-WIP/impressive.py Impressive-0.12.1-WIP-py3/impressive t0 = now last_event = ev[1:] need_redraw = True -@@ -6368,41 +6394,41 @@ +@@ -6368,41 +6401,41 @@ except KeyboardInterrupt: pass except: @@ -1815,7 +1889,7 @@ diff -u Impressive-0.12.1-WIP/impressive.py Impressive-0.12.1-WIP-py3/impressive traceback.print_exc(file=sys.stderr) finally: StopMPlayer() -@@ -6445,7 +6471,7 @@ +@@ -6445,7 +6478,7 @@ else: return res_else def HelpExit(code=0): @@ -1824,7 +1898,7 @@ diff -u Impressive-0.12.1-WIP/impressive.py Impressive-0.12.1-WIP-py3/impressive Usage: """+os.path.basename(sys.argv[0])+""" [OPTION...] -@@ -6549,11 +6575,11 @@ +@@ -6549,11 +6582,11 @@ --nologo disable startup logo and version number display -v, --verbose (slightly) more verbose operation @@ -1838,7 +1912,7 @@ diff -u Impressive-0.12.1-WIP/impressive.py Impressive-0.12.1-WIP-py3/impressive standard = dict([(tc.__name__, None) for tc in AvailableTransitions]) trans = [(tc.__name__, tc.__doc__) for tc in AllTransitions] trans.append(('None', "no transition")) -@@ -6564,14 +6590,14 @@ +@@ -6564,14 +6597,14 @@ star = '*' else: star = ' ' @@ -1856,7 +1930,7 @@ diff -u Impressive-0.12.1-WIP/impressive.py Impressive-0.12.1-WIP-py3/impressive def ParseTime(s): return TryTime(s, r'([0-9]+)s?$', lambda m: m[0]) \ or TryTime(s, r'([0-9]+)m$', lambda m: m[0] * 60) \ -@@ -6580,11 +6606,11 @@ +@@ -6580,11 +6613,11 @@ or TryTime(s, r'([0-9]+)[h:]([0-9]+)[m:]([0-9]+)s?$', lambda m: m[0] * 3600 + m[1] * 60 + m[2]) def opterr(msg, extra_lines=[]): @@ -1872,7 +1946,7 @@ diff -u Impressive-0.12.1-WIP/impressive.py Impressive-0.12.1-WIP-py3/impressive sys.exit(2) def SetTransitions(list): -@@ -6711,7 +6737,7 @@ +@@ -6711,7 +6744,7 @@ "nocursor", "zoomdarkness=", "zoom-darkness=", "box-edge=", "maxzoom=", "max-zoom=", "time-display", "zbox-edge=", "vht0=", "vht1="]) @@ -1881,7 +1955,7 @@ diff -u Impressive-0.12.1-WIP/impressive.py Impressive-0.12.1-WIP-py3/impressive opterr(message) for opt, arg in opts: -@@ -6741,10 +6767,10 @@ +@@ -6741,10 +6774,10 @@ if opt in ("-c", "--cache"): CacheMode = ParseCacheMode(arg) if opt == "--nocache": @@ -1894,7 +1968,7 @@ diff -u Impressive-0.12.1-WIP/impressive.py Impressive-0.12.1-WIP-py3/impressive CacheMode = MemCache if opt == "--cachefile": CacheFileName = arg -@@ -6767,16 +6793,16 @@ +@@ -6767,16 +6800,16 @@ ShowLogo = not(ShowLogo) if opt in ("--noclicks", "--no-clicks"): if not DefaultControls: @@ -1914,7 +1988,7 @@ diff -u Impressive-0.12.1-WIP/impressive.py Impressive-0.12.1-WIP-py3/impressive BindEvent("q,escape -= quit") if opt in ("-e", "--bind"): BindEvent(arg, error_prefix="--bind") -@@ -6951,7 +6977,7 @@ +@@ -6951,7 +6984,7 @@ arg = arg.split(':') assert len(arg) > 1 CursorImage = ':'.join(arg[:-1]) @@ -1923,7 +1997,7 @@ diff -u Impressive-0.12.1-WIP/impressive.py Impressive-0.12.1-WIP-py3/impressive else: CursorImage = arg assert (BlackLevel >= 0) and (BlackLevel < 255) -@@ -7005,7 +7031,7 @@ +@@ -7005,7 +7038,7 @@ def run(): try: run_main() @@ -1932,7 +2006,7 @@ diff -u Impressive-0.12.1-WIP/impressive.py Impressive-0.12.1-WIP-py3/impressive return e.code # use this function if you use Impressive as a library and want to call any -@@ -7021,5 +7047,5 @@ +@@ -7021,5 +7054,5 @@ run_main() finally: if not(CleanExit) and (os.name == 'nt') and getattr(sys, "frozen", False): diff --git a/impressive.spec b/impressive.spec index 4bdb726..fb75bad 100644 --- a/impressive.spec +++ b/impressive.spec @@ -1,6 +1,6 @@ Name: impressive Version: 0.12.0 -Release: 10%{?dist} +Release: 11%{?dist} Summary: A program that displays presentation slides License: GPLv2 @@ -11,6 +11,7 @@ Source1: %{name}.sh # diff between 0.12.0 and current svn version r245 Patch0: Impressive-0.12.0-235-245.patch # py3-compatible conversion of r245 (https://github.com/mjg/Impressive/tree/py3k) +# version v0.11.1-74-gc504a64 Patch1: Impressive-0.12.0-245-py3.patch BuildArch: noarch @@ -63,8 +64,12 @@ install -D -p -m 755 impressive.sh %{buildroot}%{_bindir}/impressive %{_mandir}/man1/impressive.1* %changelog +* Mon Aug 19 2019 Michael J Gruber - 0.12.0-11 +- patch version v0.11.1-74-gc504a64 + * Sun Aug 18 2019 Michael J Gruber - 0.12.0-10 - port current svn version to python3 (coordinated with upstream, release pending) +- patch version v0.11.1-74-g0223cd9 - fixes bug 1731634 * Fri Jul 26 2019 Michael J Gruber - 0.12.0-9 From 96bfcf723f66cd30c4763288daab4cb956e97f92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 20 Aug 2019 01:42:56 +0200 Subject: [PATCH 36/63] Rebuilt for Python 3.8 --- impressive.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/impressive.spec b/impressive.spec index fb75bad..7364ebc 100644 --- a/impressive.spec +++ b/impressive.spec @@ -1,6 +1,6 @@ Name: impressive Version: 0.12.0 -Release: 11%{?dist} +Release: 12%{?dist} Summary: A program that displays presentation slides License: GPLv2 @@ -64,6 +64,9 @@ install -D -p -m 755 impressive.sh %{buildroot}%{_bindir}/impressive %{_mandir}/man1/impressive.1* %changelog +* Mon Aug 19 2019 Miro Hrončok - 0.12.0-12 +- Rebuilt for Python 3.8 + * Mon Aug 19 2019 Michael J Gruber - 0.12.0-11 - patch version v0.11.1-74-gc504a64 From 12b3e6398e9f6bd1a4e69c980c203df4f1626cd1 Mon Sep 17 00:00:00 2001 From: Michael J Gruber Date: Mon, 2 Sep 2019 14:28:46 +0200 Subject: [PATCH 37/63] build from upstream python3 branch previous py3k patches have been upstreamed --- .gitignore | 1 + Impressive-0.12.0-235-245.patch | 447 ------- Impressive-0.12.0-245-py3.patch | 2015 ------------------------------- impressive.spec | 25 +- sources | 2 +- 5 files changed, 17 insertions(+), 2473 deletions(-) delete mode 100644 Impressive-0.12.0-235-245.patch delete mode 100644 Impressive-0.12.0-245-py3.patch diff --git a/.gitignore b/.gitignore index 94db17f..af9ac4d 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ Impressive-0.10.2.tar.gz /Impressive-0.11.2.tar.gz /Impressive-0.11.3.tar.gz /Impressive-0.12.0.tar.gz +/Impressive-0.13.0-WIP-20190902svn275.tar.gz diff --git a/Impressive-0.12.0-235-245.patch b/Impressive-0.12.0-235-245.patch deleted file mode 100644 index 811f94e..0000000 --- a/Impressive-0.12.0-235-245.patch +++ /dev/null @@ -1,447 +0,0 @@ -Binärdateien Impressive-0.12.0/demo.pdf und Impressive-0.12.1-WIP/demo.pdf sind verschieden. -diff -u Impressive-0.12.0/impressive.1 Impressive-0.12.1-WIP/impressive.1 ---- Impressive-0.12.0/impressive.1 2018-02-04 21:31:39.000000000 +0100 -+++ Impressive-0.12.1-WIP/impressive.1 2019-08-18 16:25:04.000000000 +0200 -@@ -1,5 +1,5 @@ - .\" generated by KeyJ's html2man.py version 0.1.1 --.TH IMPRESSIVE 1 2018-02-04 "Martin J. Fiedler" "Impressive Documentation"> -+.TH IMPRESSIVE 1 2018-02-07 "Martin J. Fiedler" "Impressive Documentation"> - .SH "NAME" - Impressive \- presentation tool with eye candy - .SH "SYNOPSIS" -@@ -666,6 +666,16 @@ - .RE - .PP - .br -+\fBA\fR key -+.RS -+Toggle automatic slideshow mode. -+.br -+If an automatic presentation has been started with the \fB\-a\fR/\:\fB\-\-auto\fR option, it is temporarily disabled until this key is pressed again. It is not automatically re\-enabled after changing the page. If the \fB\-a\fR/\:\fB\-\-auto\fR has not been used, an automatic presentation with a timeout of 30 seconds is started when this key is pressed for the first time. -+.br -+Note that if a page has a \fBtimeout\fR PageProp, the specified timeout is \fIalways\fR in effect when the page is entered, even if the automatic slideshow is otherwise disabled. -+.RE -+.PP -+.br - \fBS\fR key - .RS - Save the info script associated with the current presentation. The main purpose for this is to permanently save highlight boxes or keyboard shortcuts, so they will be restored the next time this presentation is started. -@@ -857,6 +867,26 @@ - The following list describes all actions supported by Impressive, together with the conditions under which they will match. Note that most actions will not match in overview mode and during video playback, unless mentioned otherwise in the description. - .PP - .br -+\fBauto\-start\fR -+.RS -+(Re\-)enable automatic presentation mode. If the current page has no \fBtimeout\fR PageProp and no \fB\-a\fR/\:\fB\-\-auto\fR option has been specified, an automatic presentation is started with a 30\-second page interval. -+.RE -+.PP -+.br -+\fBauto\-stop\fR -+.RS -+Disable automatic presentation mode. If the current page has a \fBtimeout\fR PageProp or an \fB\-a\fR/\:\fB\-\-auto\fR option has been specified, the timeout for the current page is stopped. -+.br -+The automatic presentation stays disabled after changing pages, unless a \fBtimeout\fR PageProp is specified for the target page, which will take precedence over the otherwise disabled automatic presentation mode. -+.RE -+.PP -+.br -+\fBauto\-toggle\fR -+.RS -+Disables or (re\-)enables automatic presentations, depending on the current state. -+.RE -+.PP -+.br - \fBbox\-add\fR - .RS - Draw a highlight box if the mouse has been moved since the button has been pressed down. This action must only be bound to a mouse button event, otherwise it will not function properly. -diff -u Impressive-0.12.0/impressive.html Impressive-0.12.1-WIP/impressive.html ---- Impressive-0.12.0/impressive.html 2018-02-04 21:31:39.000000000 +0100 -+++ Impressive-0.12.1-WIP/impressive.html 2019-08-18 16:25:04.000000000 +0200 -@@ -13,12 +13,12 @@ - -

- http://impressive.sourceforge.net/
--Version: 0.12.0
-+Version: 0.12.1-WIP
- Author: Martin J. Fiedler
--Last updated: 2018-02-04

-+Last updated: 2018-02-07

- - ") diff --git a/impressive.spec b/impressive.spec index 7364ebc..d5a2d32 100644 --- a/impressive.spec +++ b/impressive.spec @@ -1,18 +1,19 @@ +%global timestamp 20190902 +%global svnversion 275 Name: impressive -Version: 0.12.0 -Release: 12%{?dist} +Version: 0.13.0 +Release: 0.1.%{timestamp}svn%{svnversion}%{?dist} Summary: A program that displays presentation slides License: GPLv2 URL: http://impressive.sourceforge.net/ -Source0: http://downloads.sourceforge.net/%{name}/Impressive-%{version}.tar.gz +#Source0: http://downloads.sourceforge.net/%{name}/Impressive-%{version}.tar.gz +# svn export -r %{svnversion} http://svn.emphy.de/impressive/branches/python3/impressive Impressive-%{version} +# make -C Impressive-%{version} release +# mv Impressive-%{version}_releases/Impressive-%{version}-WIP.tar.gz Impressive-%{version}-WIP-%{timestamp}svn%{svnversion} +Source0: %{name}/Impressive-%{version}-WIP-%{timestamp}svn%{svnversion}.tar.gz # Wrapper script for making sure hardware acceleration is available Source1: %{name}.sh -# diff between 0.12.0 and current svn version r245 -Patch0: Impressive-0.12.0-235-245.patch -# py3-compatible conversion of r245 (https://github.com/mjg/Impressive/tree/py3k) -# version v0.11.1-74-gc504a64 -Patch1: Impressive-0.12.0-245-py3.patch BuildArch: noarch BuildRequires: python3-devel @@ -40,8 +41,8 @@ that are really useful for presentations. %prep -%autosetup -n Impressive-%{version} -p1 -sed -ie '1s#/usr/bin/env python2#/usr/bin/python3#' impressive.py +%autosetup -n Impressive-%{version}-WIP -p1 +sed -ie '1s#/usr/bin/env python#/usr/bin/python3#' impressive.py %build sed -e "s|@PYTHON_SITELIB@|%{python3_sitelib}|" %{SOURCE1} > impressive.sh @@ -64,6 +65,10 @@ install -D -p -m 755 impressive.sh %{buildroot}%{_bindir}/impressive %{_mandir}/man1/impressive.1* %changelog +* Mon Sep 02 2019 Michael J Gruber - 0.13.0-0.1.20190902svn275 +- build from upstream python3 branch +- previous py3k patches have been upstreamed + * Mon Aug 19 2019 Miro Hrončok - 0.12.0-12 - Rebuilt for Python 3.8 diff --git a/sources b/sources index 3ce36b9..a96a12a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (Impressive-0.12.0.tar.gz) = 3425d9d53c8c3ff6d5de0a3466bbf5c94f257390b4929ba12547ba930099de67db4f4d77d4ef4e3e10f8f723478569a74042553f64cf95e236931c7aabb70f0a +SHA512 (Impressive-0.13.0-WIP-20190902svn275.tar.gz) = 66ad9fc5657a25c9f0e3071940b060d914add03077c268a15a1d7ffbfe886320fbc28017d7e0ad35cfdd34bc6c5ba4564fe22e500560facde80d855671f89313 From 378c0a38d2a099511868b861af1cf32654b3ac06 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jan 2020 05:24:52 +0000 Subject: [PATCH 38/63] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- impressive.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/impressive.spec b/impressive.spec index d5a2d32..c6b5dce 100644 --- a/impressive.spec +++ b/impressive.spec @@ -2,7 +2,7 @@ %global svnversion 275 Name: impressive Version: 0.13.0 -Release: 0.1.%{timestamp}svn%{svnversion}%{?dist} +Release: 0.2.%{timestamp}svn%{svnversion}%{?dist} Summary: A program that displays presentation slides License: GPLv2 @@ -65,6 +65,9 @@ install -D -p -m 755 impressive.sh %{buildroot}%{_bindir}/impressive %{_mandir}/man1/impressive.1* %changelog +* Wed Jan 29 2020 Fedora Release Engineering - 0.13.0-0.2.20190902svn275 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Mon Sep 02 2019 Michael J Gruber - 0.13.0-0.1.20190902svn275 - build from upstream python3 branch - previous py3k patches have been upstreamed From b277b8c6d51fca1f3d158dfe284e302d49ecab8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 26 May 2020 02:48:35 +0200 Subject: [PATCH 39/63] Rebuilt for Python 3.9 --- impressive.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/impressive.spec b/impressive.spec index c6b5dce..5782487 100644 --- a/impressive.spec +++ b/impressive.spec @@ -2,7 +2,7 @@ %global svnversion 275 Name: impressive Version: 0.13.0 -Release: 0.2.%{timestamp}svn%{svnversion}%{?dist} +Release: 0.3.%{timestamp}svn%{svnversion}%{?dist} Summary: A program that displays presentation slides License: GPLv2 @@ -65,6 +65,9 @@ install -D -p -m 755 impressive.sh %{buildroot}%{_bindir}/impressive %{_mandir}/man1/impressive.1* %changelog +* Tue May 26 2020 Miro Hrončok - 0.13.0-0.3.20190902svn275 +- Rebuilt for Python 3.9 + * Wed Jan 29 2020 Fedora Release Engineering - 0.13.0-0.2.20190902svn275 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 7a1ed55e864a91da96a7d0b3b48a173362406369 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jul 2020 01:46:19 +0000 Subject: [PATCH 40/63] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- impressive.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/impressive.spec b/impressive.spec index 5782487..469df0a 100644 --- a/impressive.spec +++ b/impressive.spec @@ -2,7 +2,7 @@ %global svnversion 275 Name: impressive Version: 0.13.0 -Release: 0.3.%{timestamp}svn%{svnversion}%{?dist} +Release: 0.4.%{timestamp}svn%{svnversion}%{?dist} Summary: A program that displays presentation slides License: GPLv2 @@ -65,6 +65,9 @@ install -D -p -m 755 impressive.sh %{buildroot}%{_bindir}/impressive %{_mandir}/man1/impressive.1* %changelog +* Tue Jul 28 2020 Fedora Release Engineering - 0.13.0-0.4.20190902svn275 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Tue May 26 2020 Miro Hrončok - 0.13.0-0.3.20190902svn275 - Rebuilt for Python 3.9 From aa67df74f70120500f89fb390321962eff55440c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 14:19:14 +0000 Subject: [PATCH 41/63] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- impressive.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/impressive.spec b/impressive.spec index 469df0a..7075741 100644 --- a/impressive.spec +++ b/impressive.spec @@ -2,7 +2,7 @@ %global svnversion 275 Name: impressive Version: 0.13.0 -Release: 0.4.%{timestamp}svn%{svnversion}%{?dist} +Release: 0.5.%{timestamp}svn%{svnversion}%{?dist} Summary: A program that displays presentation slides License: GPLv2 @@ -65,6 +65,9 @@ install -D -p -m 755 impressive.sh %{buildroot}%{_bindir}/impressive %{_mandir}/man1/impressive.1* %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 0.13.0-0.5.20190902svn275 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Tue Jul 28 2020 Fedora Release Engineering - 0.13.0-0.4.20190902svn275 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 49f47bfba41683e7531a138839c1a2a1252958bd Mon Sep 17 00:00:00 2001 From: Michael J Gruber Date: Wed, 27 Jan 2021 11:40:34 +0100 Subject: [PATCH 42/63] rebase to 0.13.0-beta2 plus hotfixes --- .gitignore | 1 + impressive.spec | 13 ++++++++----- sources | 2 +- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index af9ac4d..43313fc 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ Impressive-0.10.2.tar.gz /Impressive-0.11.3.tar.gz /Impressive-0.12.0.tar.gz /Impressive-0.13.0-WIP-20190902svn275.tar.gz +/Impressive-0.13.0-WIP-20210107svn310.tar.gz diff --git a/impressive.spec b/impressive.spec index 7075741..da2bf49 100644 --- a/impressive.spec +++ b/impressive.spec @@ -1,8 +1,8 @@ -%global timestamp 20190902 -%global svnversion 275 +%global timestamp 20210107 +%global svnversion 310 Name: impressive Version: 0.13.0 -Release: 0.5.%{timestamp}svn%{svnversion}%{?dist} +Release: 0.6.%{timestamp}svn%{svnversion}%{?dist} Summary: A program that displays presentation slides License: GPLv2 @@ -10,8 +10,8 @@ URL: http://impressive.sourceforge.net/ #Source0: http://downloads.sourceforge.net/%{name}/Impressive-%{version}.tar.gz # svn export -r %{svnversion} http://svn.emphy.de/impressive/branches/python3/impressive Impressive-%{version} # make -C Impressive-%{version} release -# mv Impressive-%{version}_releases/Impressive-%{version}-WIP.tar.gz Impressive-%{version}-WIP-%{timestamp}svn%{svnversion} -Source0: %{name}/Impressive-%{version}-WIP-%{timestamp}svn%{svnversion}.tar.gz +# mv Impressive-%{version}/_releases/Impressive-%{version}-WIP.tar.gz Impressive-%{version}-WIP-%{timestamp}svn%{svnversion}.tar.gz +Source0: Impressive-%{version}-WIP-%{timestamp}svn%{svnversion}.tar.gz # Wrapper script for making sure hardware acceleration is available Source1: %{name}.sh @@ -65,6 +65,9 @@ install -D -p -m 755 impressive.sh %{buildroot}%{_bindir}/impressive %{_mandir}/man1/impressive.1* %changelog +* Wed Jan 27 2021 - 0.13.0-6.20210107svn310 +- rebase to 0.13.0-beta2 plus hotfixes + * Tue Jan 26 2021 Fedora Release Engineering - 0.13.0-0.5.20190902svn275 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild diff --git a/sources b/sources index a96a12a..1d473d3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (Impressive-0.13.0-WIP-20190902svn275.tar.gz) = 66ad9fc5657a25c9f0e3071940b060d914add03077c268a15a1d7ffbfe886320fbc28017d7e0ad35cfdd34bc6c5ba4564fe22e500560facde80d855671f89313 +SHA512 (Impressive-0.13.0-WIP-20210107svn310.tar.gz) = fbf1aec652f584fde1db39a985457799babfec63284749fb2043dad0d9d2290082cf7ee5bf6477d97b403c3acdec88c77e1868cf2b7be7e4f67413970e88f8d0 From ced0c67123a20da8e7748d36aa213f77807b5583 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 4 Jun 2021 20:07:32 +0200 Subject: [PATCH 43/63] Rebuilt for Python 3.10 --- impressive.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/impressive.spec b/impressive.spec index da2bf49..42a76fb 100644 --- a/impressive.spec +++ b/impressive.spec @@ -2,7 +2,7 @@ %global svnversion 310 Name: impressive Version: 0.13.0 -Release: 0.6.%{timestamp}svn%{svnversion}%{?dist} +Release: 0.7.%{timestamp}svn%{svnversion}%{?dist} Summary: A program that displays presentation slides License: GPLv2 @@ -65,6 +65,9 @@ install -D -p -m 755 impressive.sh %{buildroot}%{_bindir}/impressive %{_mandir}/man1/impressive.1* %changelog +* Fri Jun 04 2021 Python Maint - 0.13.0-0.7.20210107svn310 +- Rebuilt for Python 3.10 + * Wed Jan 27 2021 - 0.13.0-6.20210107svn310 - rebase to 0.13.0-beta2 plus hotfixes From 9a076c003908cd8329007e1b2abe761d271061aa Mon Sep 17 00:00:00 2001 From: Michael J Gruber Date: Sat, 12 Jun 2021 12:37:49 +0200 Subject: [PATCH 44/63] adjust to pygame 2/SDL2 (bz 1970553) --- .gitignore | 1 + impressive.spec | 18 +++++++++++------- sources | 2 +- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 43313fc..551e528 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ Impressive-0.10.2.tar.gz /Impressive-0.12.0.tar.gz /Impressive-0.13.0-WIP-20190902svn275.tar.gz /Impressive-0.13.0-WIP-20210107svn310.tar.gz +/Impressive-0.13.0-WIP-20210612svn311.tar.gz diff --git a/impressive.spec b/impressive.spec index 42a76fb..742ac18 100644 --- a/impressive.spec +++ b/impressive.spec @@ -1,16 +1,16 @@ -%global timestamp 20210107 -%global svnversion 310 +%global timestamp 20210612 +%global svnversion 311 Name: impressive Version: 0.13.0 -Release: 0.7.%{timestamp}svn%{svnversion}%{?dist} +Release: 0.8.%{timestamp}svn%{svnversion}%{?dist} Summary: A program that displays presentation slides License: GPLv2 URL: http://impressive.sourceforge.net/ -#Source0: http://downloads.sourceforge.net/%{name}/Impressive-%{version}.tar.gz -# svn export -r %{svnversion} http://svn.emphy.de/impressive/branches/python3/impressive Impressive-%{version} -# make -C Impressive-%{version} release -# mv Impressive-%{version}/_releases/Impressive-%{version}-WIP.tar.gz Impressive-%{version}-WIP-%{timestamp}svn%{svnversion}.tar.gz +#Source0: http://downloads.sourceforge.net/%%{name}/Impressive-%%{version}.tar.gz +# svn export -r ${svnversion} http://svn.emphy.de/impressive/trunk/impressive Impressive-${version} +# make -C Impressive-${version} release +# mv Impressive-${version}/_releases/Impressive-${version}-WIP.tar.gz Impressive-${version}-WIP-${timestamp}svn${svnversion}.tar.gz Source0: Impressive-%{version}-WIP-%{timestamp}svn%{svnversion}.tar.gz # Wrapper script for making sure hardware acceleration is available Source1: %{name}.sh @@ -65,6 +65,10 @@ install -D -p -m 755 impressive.sh %{buildroot}%{_bindir}/impressive %{_mandir}/man1/impressive.1* %changelog +* Sat Jun 12 2021 Michael J Gruber - 0.13.0-0.8.20210612svn311 +- adjust to pygame 2/SDL2 (bz 1970553) +- specfile clean-ups + * Fri Jun 04 2021 Python Maint - 0.13.0-0.7.20210107svn310 - Rebuilt for Python 3.10 diff --git a/sources b/sources index 1d473d3..676ba5f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (Impressive-0.13.0-WIP-20210107svn310.tar.gz) = fbf1aec652f584fde1db39a985457799babfec63284749fb2043dad0d9d2290082cf7ee5bf6477d97b403c3acdec88c77e1868cf2b7be7e4f67413970e88f8d0 +SHA512 (Impressive-0.13.0-WIP-20210612svn311.tar.gz) = 8043582eabf583c7f18b91e09800f6d4bb28402d3ef2fca9acfe99e4267e86c44af73663cef0bcba4d2433acc89e65764f2add225c502e496e81a44fad8b2d8f From b1723676ac4dd1f5b83604237a1ff3803ad0a8a7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 22 Jul 2021 08:32:34 +0000 Subject: [PATCH 45/63] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- impressive.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/impressive.spec b/impressive.spec index 742ac18..be5ef4d 100644 --- a/impressive.spec +++ b/impressive.spec @@ -2,7 +2,7 @@ %global svnversion 311 Name: impressive Version: 0.13.0 -Release: 0.8.%{timestamp}svn%{svnversion}%{?dist} +Release: 0.9.%{timestamp}svn%{svnversion}%{?dist} Summary: A program that displays presentation slides License: GPLv2 @@ -65,6 +65,9 @@ install -D -p -m 755 impressive.sh %{buildroot}%{_bindir}/impressive %{_mandir}/man1/impressive.1* %changelog +* Thu Jul 22 2021 Fedora Release Engineering - 0.13.0-0.9.20210612svn311 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Sat Jun 12 2021 Michael J Gruber - 0.13.0-0.8.20210612svn311 - adjust to pygame 2/SDL2 (bz 1970553) - specfile clean-ups From 68e3632b57a82154b814f6b6e811552f7e4fb823 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 13:16:10 +0000 Subject: [PATCH 46/63] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- impressive.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/impressive.spec b/impressive.spec index be5ef4d..7c76f96 100644 --- a/impressive.spec +++ b/impressive.spec @@ -2,7 +2,7 @@ %global svnversion 311 Name: impressive Version: 0.13.0 -Release: 0.9.%{timestamp}svn%{svnversion}%{?dist} +Release: 0.10.%{timestamp}svn%{svnversion}%{?dist} Summary: A program that displays presentation slides License: GPLv2 @@ -65,6 +65,9 @@ install -D -p -m 755 impressive.sh %{buildroot}%{_bindir}/impressive %{_mandir}/man1/impressive.1* %changelog +* Thu Jan 20 2022 Fedora Release Engineering - 0.13.0-0.10.20210612svn311 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Thu Jul 22 2021 Fedora Release Engineering - 0.13.0-0.9.20210612svn311 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 13fab0a815178bc543ca36bdb260c06095e153f4 Mon Sep 17 00:00:00 2001 From: Michael J Gruber Date: Sat, 19 Mar 2022 21:50:16 +0100 Subject: [PATCH 47/63] rebase to rebase to 0.13.1 (bz #2065961) --- .gitignore | 1 + changelog | 192 +++++++++++++++++++++++++++++++++++++++++++++ impressive.spec | 203 ++---------------------------------------------- sources | 2 +- 4 files changed, 199 insertions(+), 199 deletions(-) create mode 100644 changelog diff --git a/.gitignore b/.gitignore index 551e528..1ec998e 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ Impressive-0.10.2.tar.gz /Impressive-0.13.0-WIP-20190902svn275.tar.gz /Impressive-0.13.0-WIP-20210107svn310.tar.gz /Impressive-0.13.0-WIP-20210612svn311.tar.gz +/Impressive-0.13.1.tar.gz diff --git a/changelog b/changelog new file mode 100644 index 0000000..c928525 --- /dev/null +++ b/changelog @@ -0,0 +1,192 @@ +* Sat Mar 19 2022 Michael J Gruber - 0.13.1-1 +- rebase to 0.13.1 (bz #2065961) +- switch to rpmautospec + +* Thu Jan 20 2022 Fedora Release Engineering - 0.13.0-0.10.20210612svn311 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Thu Jul 22 2021 Fedora Release Engineering - 0.13.0-0.9.20210612svn311 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Sat Jun 12 2021 Michael J Gruber - 0.13.0-0.8.20210612svn311 +- adjust to pygame 2/SDL2 (bz 1970553) +- specfile clean-ups + +* Fri Jun 04 2021 Python Maint - 0.13.0-0.7.20210107svn310 +- Rebuilt for Python 3.10 + +* Wed Jan 27 2021 - 0.13.0-6.20210107svn310 +- rebase to 0.13.0-beta2 plus hotfixes + +* Tue Jan 26 2021 Fedora Release Engineering - 0.13.0-0.5.20190902svn275 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Tue Jul 28 2020 Fedora Release Engineering - 0.13.0-0.4.20190902svn275 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Tue May 26 2020 Miro Hrončok - 0.13.0-0.3.20190902svn275 +- Rebuilt for Python 3.9 + +* Wed Jan 29 2020 Fedora Release Engineering - 0.13.0-0.2.20190902svn275 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Mon Sep 02 2019 Michael J Gruber - 0.13.0-0.1.20190902svn275 +- build from upstream python3 branch +- previous py3k patches have been upstreamed + +* Mon Aug 19 2019 Miro Hrončok - 0.12.0-12 +- Rebuilt for Python 3.8 + +* Mon Aug 19 2019 Michael J Gruber - 0.12.0-11 +- patch version v0.11.1-74-gc504a64 + +* Sun Aug 18 2019 Michael J Gruber - 0.12.0-10 +- port current svn version to python3 (coordinated with upstream, release pending) +- patch version v0.11.1-74-g0223cd9 +- fixes bug 1731634 + +* Fri Jul 26 2019 Michael J Gruber - 0.12.0-9 +- remove obsolete comment + +* Thu Jul 25 2019 Fedora Release Engineering - 0.12.0-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Fri Feb 01 2019 Fedora Release Engineering - 0.12.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Mon Oct 22 2018 Michael J Gruber - 0.12.0-6 +- rebuild for python2-pygame dependency update + +* Fri Jul 13 2018 Michael J Gruber - 0.12.0-5 +- adjust to py2 packaging guidelines + +* Fri Jul 13 2018 Fedora Release Engineering - 0.12.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Wed Feb 07 2018 Iryna Shcherbina - 0.12.0-3 +- Update Python 2 dependency declarations to new packaging standards + (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) + +* Tue Feb 06 2018 Michael J Gruber - 0.12.0-2 +- remove obsolete dependency + +* Tue Feb 06 2018 Michael J Gruber - 0.12.0-1 +- upstream bugfix and feature release + +* Mon Feb 05 2018 Michael J Gruber - 0.11.3-1 +- upstream bugfix release + +* Sat Jan 06 2018 Michael J Gruber - 0.11.2-4 +- use correct shebang + +* Thu Jan 04 2018 Michael J Gruber - 0.11.2-3 +- depend on Py2 packages explicitely + +* Tue Dec 26 2017 Michael J Gruber - 0.11.2-2 +- follow upstream re-tagging + +* Tue Dec 19 2017 Michael J Gruber - 0.11.2-1 +- sync with upstream + +* Wed Jul 26 2017 Fedora Release Engineering - 0.11.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Fri Feb 10 2017 Fedora Release Engineering - 0.11.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Tue Jul 19 2016 Fedora Release Engineering - 0.11.1-4 +- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages + +* Thu Feb 04 2016 Fedora Release Engineering - 0.11.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Sat Nov 21 2015 Michael J Gruber - 0.11.1-2 +- adjust to current mudraw option syntax +- use mutool for info parsing + +* Sat Nov 21 2015 Michael J Gruber - 0.11.1-1 +- sync with upstream +- fix changelog typos + +* Wed Jun 17 2015 Fedora Release Engineering - 0.10.4-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Sat Jun 07 2014 Fedora Release Engineering - 0.10.4-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Tue Mar 11 2014 Michael J Gruber - 0.10.4-3 +- temporarily remove R pdftk + +* Thu Jan 02 2014 Michael J Gruber - 0.10.4-2 +- upate requires as recommended by upstream + +* Thu Jan 02 2014 Michael J Gruber - 0.10.4-1 +- sync with upstream +- drop pillow compatibility patch (upstreamed) +- drop backported PDF parser fix (upstreamed) + +* Sat Aug 03 2013 Fedora Release Engineering - 0.10.3-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Thu Feb 14 2013 Fedora Release Engineering - 0.10.3-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Tue Jan 15 2013 Michael J Gruber - 0.10.3-10 +- pillow compatibility (bug 895270, patch by Toshio Ernie Kuratomi) + +* Thu Jul 19 2012 Fedora Release Engineering - 0.10.3-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Fri Jan 13 2012 Fedora Release Engineering - 0.10.3-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Mon Nov 28 2011 Michael J Gruber - 0.10.3-7 +- backport PDF parser fix + +* Mon May 02 2011 Michael J Gruber - 0.10.3-6 +- EPEL has no pdftk (recommended but optional requirement) + +* Fri Mar 11 2011 Michael J Gruber - 0.10.3-5 +- Clarify explicit requires. +- Add pdftk as requirement. + +* Wed Feb 09 2011 Fedora Release Engineering - 0.10.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Sun Dec 05 2010 Michael J Gruber - 0.10.3-3 +- spec file cleanup. + +* Sun Dec 05 2010 Michael J Gruber - 0.10.3-2 +- Make summary less flashy. +- Install main program in sitelib. +- BR python-devel. + +* Fri Dec 03 2010 Michael J Gruber - 0.10.3-1 +- Sync with upstream. + +* Fri Jul 24 2009 Fedora Release Engineering - 0.10.2-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Tue Feb 24 2009 Fedora Release Engineering - 0.10.2-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Thu Feb 19 2009 Allisson Azevedo 0.10.2-6 +- Added provides keyjnote. + +* Mon Feb 16 2009 Allisson Azevedo 0.10.2-5 +- Obsolete keyjnote. + +* Mon Feb 16 2009 Allisson Azevedo 0.10.2-4 +- Fix requires for dejavu fonts. + +* Thu Feb 12 2009 Allisson Azevedo 0.10.2-3 +- Added OpenGL wrapper. +- Fix requires for dejavu fonts. + +* Thu Feb 12 2009 Allisson Azevedo 0.10.2-2 +- Changed license. +- Added dejavu-fonts to requires. +- Added build section. + +* Mon Feb 9 2009 Allisson Azevedo 0.10.2-1 +- Initial RPM release diff --git a/impressive.spec b/impressive.spec index 7c76f96..04edd35 100644 --- a/impressive.spec +++ b/impressive.spec @@ -1,17 +1,11 @@ -%global timestamp 20210612 -%global svnversion 311 Name: impressive -Version: 0.13.0 -Release: 0.10.%{timestamp}svn%{svnversion}%{?dist} +Version: 0.13.1 +Release: %autorelease Summary: A program that displays presentation slides License: GPLv2 URL: http://impressive.sourceforge.net/ -#Source0: http://downloads.sourceforge.net/%%{name}/Impressive-%%{version}.tar.gz -# svn export -r ${svnversion} http://svn.emphy.de/impressive/trunk/impressive Impressive-${version} -# make -C Impressive-${version} release -# mv Impressive-${version}/_releases/Impressive-${version}-WIP.tar.gz Impressive-${version}-WIP-${timestamp}svn${svnversion}.tar.gz -Source0: Impressive-%{version}-WIP-%{timestamp}svn%{svnversion}.tar.gz +Source0: http://downloads.sourceforge.net/%{name}/Impressive-%{version}.tar.gz # Wrapper script for making sure hardware acceleration is available Source1: %{name}.sh @@ -41,7 +35,7 @@ that are really useful for presentations. %prep -%autosetup -n Impressive-%{version}-WIP -p1 +%autosetup -n Impressive-%{version} -p1 sed -ie '1s#/usr/bin/env python#/usr/bin/python3#' impressive.py %build @@ -65,191 +59,4 @@ install -D -p -m 755 impressive.sh %{buildroot}%{_bindir}/impressive %{_mandir}/man1/impressive.1* %changelog -* Thu Jan 20 2022 Fedora Release Engineering - 0.13.0-0.10.20210612svn311 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Thu Jul 22 2021 Fedora Release Engineering - 0.13.0-0.9.20210612svn311 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Sat Jun 12 2021 Michael J Gruber - 0.13.0-0.8.20210612svn311 -- adjust to pygame 2/SDL2 (bz 1970553) -- specfile clean-ups - -* Fri Jun 04 2021 Python Maint - 0.13.0-0.7.20210107svn310 -- Rebuilt for Python 3.10 - -* Wed Jan 27 2021 - 0.13.0-6.20210107svn310 -- rebase to 0.13.0-beta2 plus hotfixes - -* Tue Jan 26 2021 Fedora Release Engineering - 0.13.0-0.5.20190902svn275 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Tue Jul 28 2020 Fedora Release Engineering - 0.13.0-0.4.20190902svn275 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Tue May 26 2020 Miro Hrončok - 0.13.0-0.3.20190902svn275 -- Rebuilt for Python 3.9 - -* Wed Jan 29 2020 Fedora Release Engineering - 0.13.0-0.2.20190902svn275 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Mon Sep 02 2019 Michael J Gruber - 0.13.0-0.1.20190902svn275 -- build from upstream python3 branch -- previous py3k patches have been upstreamed - -* Mon Aug 19 2019 Miro Hrončok - 0.12.0-12 -- Rebuilt for Python 3.8 - -* Mon Aug 19 2019 Michael J Gruber - 0.12.0-11 -- patch version v0.11.1-74-gc504a64 - -* Sun Aug 18 2019 Michael J Gruber - 0.12.0-10 -- port current svn version to python3 (coordinated with upstream, release pending) -- patch version v0.11.1-74-g0223cd9 -- fixes bug 1731634 - -* Fri Jul 26 2019 Michael J Gruber - 0.12.0-9 -- remove obsolete comment - -* Thu Jul 25 2019 Fedora Release Engineering - 0.12.0-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Fri Feb 01 2019 Fedora Release Engineering - 0.12.0-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Mon Oct 22 2018 Michael J Gruber - 0.12.0-6 -- rebuild for python2-pygame dependency update - -* Fri Jul 13 2018 Michael J Gruber - 0.12.0-5 -- adjust to py2 packaging guidelines - -* Fri Jul 13 2018 Fedora Release Engineering - 0.12.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Wed Feb 07 2018 Iryna Shcherbina - 0.12.0-3 -- Update Python 2 dependency declarations to new packaging standards - (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) - -* Tue Feb 06 2018 Michael J Gruber - 0.12.0-2 -- remove obsolete dependency - -* Tue Feb 06 2018 Michael J Gruber - 0.12.0-1 -- upstream bugfix and feature release - -* Mon Feb 05 2018 Michael J Gruber - 0.11.3-1 -- upstream bugfix release - -* Sat Jan 06 2018 Michael J Gruber - 0.11.2-4 -- use correct shebang - -* Thu Jan 04 2018 Michael J Gruber - 0.11.2-3 -- depend on Py2 packages explicitely - -* Tue Dec 26 2017 Michael J Gruber - 0.11.2-2 -- follow upstream re-tagging - -* Tue Dec 19 2017 Michael J Gruber - 0.11.2-1 -- sync with upstream - -* Wed Jul 26 2017 Fedora Release Engineering - 0.11.1-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Fri Feb 10 2017 Fedora Release Engineering - 0.11.1-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Tue Jul 19 2016 Fedora Release Engineering - 0.11.1-4 -- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages - -* Thu Feb 04 2016 Fedora Release Engineering - 0.11.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Sat Nov 21 2015 Michael J Gruber - 0.11.1-2 -- adjust to current mudraw option syntax -- use mutool for info parsing - -* Sat Nov 21 2015 Michael J Gruber - 0.11.1-1 -- sync with upstream -- fix changelog typos - -* Wed Jun 17 2015 Fedora Release Engineering - 0.10.4-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Sat Jun 07 2014 Fedora Release Engineering - 0.10.4-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Tue Mar 11 2014 Michael J Gruber - 0.10.4-3 -- temporarily remove R pdftk - -* Thu Jan 02 2014 Michael J Gruber - 0.10.4-2 -- upate requires as recommended by upstream - -* Thu Jan 02 2014 Michael J Gruber - 0.10.4-1 -- sync with upstream -- drop pillow compatibility patch (upstreamed) -- drop backported PDF parser fix (upstreamed) - -* Sat Aug 03 2013 Fedora Release Engineering - 0.10.3-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Thu Feb 14 2013 Fedora Release Engineering - 0.10.3-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Tue Jan 15 2013 Michael J Gruber - 0.10.3-10 -- pillow compatibility (bug 895270, patch by Toshio Ernie Kuratomi) - -* Thu Jul 19 2012 Fedora Release Engineering - 0.10.3-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Fri Jan 13 2012 Fedora Release Engineering - 0.10.3-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Mon Nov 28 2011 Michael J Gruber - 0.10.3-7 -- backport PDF parser fix - -* Mon May 02 2011 Michael J Gruber - 0.10.3-6 -- EPEL has no pdftk (recommended but optional requirement) - -* Fri Mar 11 2011 Michael J Gruber - 0.10.3-5 -- Clarify explicit requires. -- Add pdftk as requirement. - -* Wed Feb 09 2011 Fedora Release Engineering - 0.10.3-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Sun Dec 05 2010 Michael J Gruber - 0.10.3-3 -- spec file cleanup. - -* Sun Dec 05 2010 Michael J Gruber - 0.10.3-2 -- Make summary less flashy. -- Install main program in sitelib. -- BR python-devel. - -* Fri Dec 03 2010 Michael J Gruber - 0.10.3-1 -- Sync with upstream. - -* Fri Jul 24 2009 Fedora Release Engineering - 0.10.2-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Tue Feb 24 2009 Fedora Release Engineering - 0.10.2-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Thu Feb 19 2009 Allisson Azevedo 0.10.2-6 -- Added provides keyjnote. - -* Mon Feb 16 2009 Allisson Azevedo 0.10.2-5 -- Obsolete keyjnote. - -* Mon Feb 16 2009 Allisson Azevedo 0.10.2-4 -- Fix requires for dejavu fonts. - -* Thu Feb 12 2009 Allisson Azevedo 0.10.2-3 -- Added OpenGL wrapper. -- Fix requires for dejavu fonts. - -* Thu Feb 12 2009 Allisson Azevedo 0.10.2-2 -- Changed license. -- Added dejavu-fonts to requires. -- Added build section. - -* Mon Feb 9 2009 Allisson Azevedo 0.10.2-1 -- Initial RPM release +%autochangelog diff --git a/sources b/sources index 676ba5f..4e11f23 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (Impressive-0.13.0-WIP-20210612svn311.tar.gz) = 8043582eabf583c7f18b91e09800f6d4bb28402d3ef2fca9acfe99e4267e86c44af73663cef0bcba4d2433acc89e65764f2add225c502e496e81a44fad8b2d8f +SHA512 (Impressive-0.13.1.tar.gz) = f6221337f9dd79f552fb083e1ea7484aeadec1f8d8e05b4e1b7f6a94037b5026022819b346968dea67dbdb1b646d0571a7aeef26f15c25bee88c5b9c2791cf2b From 81afa58541af53d25443390e7c95119a96a00ecd Mon Sep 17 00:00:00 2001 From: Python Maint Date: Mon, 13 Jun 2022 15:46:05 +0200 Subject: [PATCH 48/63] Rebuilt for Python 3.11 From 790b8d493f5af2d2a5dcd733b7e5366145cf93b3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 21 Jul 2022 14:38:02 +0000 Subject: [PATCH 49/63] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering From f89422628aeb8ef13c836021ca53f666e6b77438 Mon Sep 17 00:00:00 2001 From: Michael J Gruber Date: Tue, 6 Dec 2022 16:43:22 +0100 Subject: [PATCH 50/63] SPDX migration --- impressive.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/impressive.spec b/impressive.spec index 04edd35..1ce8e7a 100644 --- a/impressive.spec +++ b/impressive.spec @@ -3,7 +3,7 @@ Version: 0.13.1 Release: %autorelease Summary: A program that displays presentation slides -License: GPLv2 +License: GPL-2.0-or-later URL: http://impressive.sourceforge.net/ Source0: http://downloads.sourceforge.net/%{name}/Impressive-%{version}.tar.gz # Wrapper script for making sure hardware acceleration is available From 5f9ffc0a1ca153baa7759fbbf2b79bbb21a5700f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 13:08:05 +0000 Subject: [PATCH 51/63] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering From 77ba07d47f18ed5a7dc6d9359b461c847daa910c Mon Sep 17 00:00:00 2001 From: Python Maint Date: Tue, 13 Jun 2023 20:21:36 +0200 Subject: [PATCH 52/63] Rebuilt for Python 3.12 From 2924ac48862248204ab3117b5c7dcd3dfb5fe090 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jul 2023 07:23:28 +0000 Subject: [PATCH 53/63] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering From 02ac2e6ad616bdb7fd5938ea804d51f95c60dcf7 Mon Sep 17 00:00:00 2001 From: Michael J Gruber Date: Sat, 4 Nov 2023 20:06:18 +0100 Subject: [PATCH 54/63] rebase to 0.13.2 (rhbz#2247922) - adjust to pillow 10 - fix escape sequence escaping --- .gitignore | 1 + impressive-0.13-escape-escape-sequence.patch | 26 ++++++++++++++++++++ impressive.spec | 5 ++-- sources | 2 +- 4 files changed, 31 insertions(+), 3 deletions(-) create mode 100644 impressive-0.13-escape-escape-sequence.patch diff --git a/.gitignore b/.gitignore index 1ec998e..cafdb13 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ 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 new file mode 100644 index 0000000..7c6890f --- /dev/null +++ b/impressive-0.13-escape-escape-sequence.patch @@ -0,0 +1,26 @@ +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 1ce8e7a..832e954 100644 --- a/impressive.spec +++ b/impressive.spec @@ -1,5 +1,5 @@ Name: impressive -Version: 0.13.1 +Version: 0.13.2 Release: %autorelease Summary: A program that displays presentation slides @@ -8,6 +8,7 @@ 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 @@ -36,7 +37,7 @@ that are really useful for presentations. %prep %autosetup -n Impressive-%{version} -p1 -sed -ie '1s#/usr/bin/env python#/usr/bin/python3#' impressive.py +sed -i -e '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 4e11f23..26695e6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (Impressive-0.13.1.tar.gz) = f6221337f9dd79f552fb083e1ea7484aeadec1f8d8e05b4e1b7f6a94037b5026022819b346968dea67dbdb1b646d0571a7aeef26f15c25bee88c5b9c2791cf2b +SHA512 (Impressive-0.13.2.tar.gz) = 0b24ef39cba25d8813fd3f95f220c466defa50c3ba4a63d2f37b284de2826c2110225fe2016f58c401d1ca239d672ba28ba65069523ab57b1b5711a4222cff92 From 53f7ed33c056b3527eb55c895c41a1388507797c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jan 2024 23:03:33 +0000 Subject: [PATCH 55/63] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 7d0aa967ed16e952b641fc1311860fa49db63246 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jan 2024 22:41:50 +0000 Subject: [PATCH 56/63] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 844cc2a9ee14956cd9a76ae4dbbd1473e776c6f8 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 7 Jun 2024 08:32:08 +0200 Subject: [PATCH 57/63] Rebuilt for Python 3.13 From 24b11e698e55dfc8f1e5d9b06041abde19f4ba93 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 18 Jul 2024 10:20:12 +0000 Subject: [PATCH 58/63] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 2da10c495a365b32a6673643cacfb5bcac5b9a57 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jan 2025 07:06:58 +0000 Subject: [PATCH 59/63] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 604d989a02cf97a090d58ee8d623ef8fcd913086 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Mon, 2 Jun 2025 19:56:41 +0200 Subject: [PATCH 60/63] Rebuilt for Python 3.14 From deeeccbd75f3bf137178fe0ec885a8b5f7fdf203 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 24 Jul 2025 17:38:33 +0000 Subject: [PATCH 61/63] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From a8970956fb15c7c5a0dcccadbdbe421790365386 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 15 Aug 2025 12:52:50 +0200 Subject: [PATCH 62/63] Rebuilt for Python 3.14.0rc2 bytecode From aea67e484f47bae34ac40fa178976a910a875c6d Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 19 Sep 2025 12:23:00 +0200 Subject: [PATCH 63/63] Rebuilt for Python 3.14.0rc3 bytecode