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