From cfcca62f94ef2a69e84d2de25bdc6861b10accd5 Mon Sep 17 00:00:00 2001 From: Ben Rosser Date: Apr 19 2017 16:14:45 +0000 Subject: Update to latest upstream release. --- diff --git a/pdfminer-un-chbang-libs.patch b/pdfminer-un-chbang-libs.patch deleted file mode 100644 index a23ce83..0000000 --- a/pdfminer-un-chbang-libs.patch +++ /dev/null @@ -1,215 +0,0 @@ -diff -rupN pdfminer.six-20160614/pdfminer/arcfour.py pdfminer.six-20160614-patched/pdfminer/arcfour.py ---- pdfminer.six-20160614/pdfminer/arcfour.py 2015-10-13 17:39:46.000000000 -0400 -+++ pdfminer.six-20160614-patched/pdfminer/arcfour.py 2016-06-14 23:12:40.584834780 -0400 -@@ -1,4 +1,3 @@ --#!/usr/bin/env python - - """ Python implementation of Arcfour encryption algorithm. - See https://en.wikipedia.org/wiki/RC4 -diff -rupN pdfminer.six-20160614/pdfminer/ascii85.py pdfminer.six-20160614-patched/pdfminer/ascii85.py ---- pdfminer.six-20160614/pdfminer/ascii85.py 2015-10-13 17:39:46.000000000 -0400 -+++ pdfminer.six-20160614-patched/pdfminer/ascii85.py 2016-06-14 23:12:41.376831352 -0400 -@@ -1,4 +1,3 @@ --#!/usr/bin/env python - - """ Python implementation of ASCII85/ASCIIHex decoder (Adobe version). - -diff -rupN pdfminer.six-20160614/pdfminer/ccitt.py pdfminer.six-20160614-patched/pdfminer/ccitt.py ---- pdfminer.six-20160614/pdfminer/ccitt.py 2015-10-13 17:39:46.000000000 -0400 -+++ pdfminer.six-20160614-patched/pdfminer/ccitt.py 2016-06-14 23:12:42.200827784 -0400 -@@ -1,4 +1,3 @@ --#!/usr/bin/env python - # CCITT Fax decoder - # - # Bugs: uncompressed mode untested. -diff -rupN pdfminer.six-20160614/pdfminer/cmapdb.py pdfminer.six-20160614-patched/pdfminer/cmapdb.py ---- pdfminer.six-20160614/pdfminer/cmapdb.py 2016-06-14 18:59:38.000000000 -0400 -+++ pdfminer.six-20160614-patched/pdfminer/cmapdb.py 2016-06-14 23:12:42.999824325 -0400 -@@ -1,4 +1,3 @@ --#!/usr/bin/env python - - """ Adobe character mapping (CMap) support. - -diff -rupN pdfminer.six-20160614/pdfminer/converter.py pdfminer.six-20160614-patched/pdfminer/converter.py ---- pdfminer.six-20160614/pdfminer/converter.py 2016-06-14 18:59:38.000000000 -0400 -+++ pdfminer.six-20160614-patched/pdfminer/converter.py 2016-06-14 23:12:43.704821273 -0400 -@@ -1,4 +1,3 @@ --#!/usr/bin/env python - # -*- coding: utf-8 -*- - import logging - import re -diff -rupN pdfminer.six-20160614/pdfminer/encodingdb.py pdfminer.six-20160614-patched/pdfminer/encodingdb.py ---- pdfminer.six-20160614/pdfminer/encodingdb.py 2015-10-13 17:39:46.000000000 -0400 -+++ pdfminer.six-20160614-patched/pdfminer/encodingdb.py 2016-06-14 23:12:44.432818121 -0400 -@@ -1,4 +1,3 @@ --#!/usr/bin/env python - import re - from .psparser import PSLiteral - from .glyphlist import glyphname2unicode -diff -rupN pdfminer.six-20160614/pdfminer/fontmetrics.py pdfminer.six-20160614-patched/pdfminer/fontmetrics.py ---- pdfminer.six-20160614/pdfminer/fontmetrics.py 2015-10-13 17:39:46.000000000 -0400 -+++ pdfminer.six-20160614-patched/pdfminer/fontmetrics.py 2016-06-14 23:12:45.264814518 -0400 -@@ -1,4 +1,3 @@ --#!/usr/bin/env python - - """ Font metrics for the Adobe core 14 fonts. - -diff -rupN pdfminer.six-20160614/pdfminer/glyphlist.py pdfminer.six-20160614-patched/pdfminer/glyphlist.py ---- pdfminer.six-20160614/pdfminer/glyphlist.py 2015-10-13 17:39:46.000000000 -0400 -+++ pdfminer.six-20160614-patched/pdfminer/glyphlist.py 2016-06-14 23:12:45.993811363 -0400 -@@ -1,4 +1,3 @@ --#!/usr/bin/env python - - """ Mappings from Adobe glyph names to Unicode characters. - -diff -rupN pdfminer.six-20160614/pdfminer/high_level.py pdfminer.six-20160614-patched/pdfminer/high_level.py ---- pdfminer.six-20160614/pdfminer/high_level.py 2016-06-14 23:12:03.804994013 -0400 -+++ pdfminer.six-20160614-patched/pdfminer/high_level.py 2016-06-14 23:12:46.760808043 -0400 -@@ -1,4 +1,3 @@ --#!/usr/bin/env python3 - # -*- coding: utf-8 -*- - """ - Functions that encapsulate "usual" use-cases for pdfminer, for use making -diff -rupN pdfminer.six-20160614/pdfminer/image.py pdfminer.six-20160614-patched/pdfminer/image.py ---- pdfminer.six-20160614/pdfminer/image.py 2015-10-13 17:39:46.000000000 -0400 -+++ pdfminer.six-20160614-patched/pdfminer/image.py 2016-06-14 23:12:47.520804752 -0400 -@@ -1,4 +1,3 @@ --#!/usr/bin/env python - import struct - import os - import os.path -diff -rupN pdfminer.six-20160614/pdfminer/__init__.py pdfminer.six-20160614-patched/pdfminer/__init__.py ---- pdfminer.six-20160614/pdfminer/__init__.py 2016-06-14 19:00:42.000000000 -0400 -+++ pdfminer.six-20160614-patched/pdfminer/__init__.py 2016-06-14 23:12:48.352801150 -0400 -@@ -1,4 +1,3 @@ --#!/usr/bin/env python - # -*- coding: utf-8 -*- - __version__ = '20160614' - -diff -rupN pdfminer.six-20160614/pdfminer/latin_enc.py pdfminer.six-20160614-patched/pdfminer/latin_enc.py ---- pdfminer.six-20160614/pdfminer/latin_enc.py 2015-10-13 17:39:46.000000000 -0400 -+++ pdfminer.six-20160614-patched/pdfminer/latin_enc.py 2016-06-14 23:12:49.120797825 -0400 -@@ -1,4 +1,3 @@ --#!/usr/bin/env python - - """ Standard encoding tables used in PDF. - -diff -rupN pdfminer.six-20160614/pdfminer/layout.py pdfminer.six-20160614-patched/pdfminer/layout.py ---- pdfminer.six-20160614/pdfminer/layout.py 2015-10-13 17:39:46.000000000 -0400 -+++ pdfminer.six-20160614-patched/pdfminer/layout.py 2016-06-14 23:12:49.905794427 -0400 -@@ -1,4 +1,3 @@ --#!/usr/bin/env python - from .utils import INF - from .utils import Plane - from .utils import get_bound -diff -rupN pdfminer.six-20160614/pdfminer/lzw.py pdfminer.six-20160614-patched/pdfminer/lzw.py ---- pdfminer.six-20160614/pdfminer/lzw.py 2016-06-14 18:59:38.000000000 -0400 -+++ pdfminer.six-20160614-patched/pdfminer/lzw.py 2016-06-14 23:12:50.657791171 -0400 -@@ -1,4 +1,3 @@ --#!/usr/bin/env python - from io import BytesIO - - import six #Python 2+3 compatibility -diff -rupN pdfminer.six-20160614/pdfminer/pdfcolor.py pdfminer.six-20160614-patched/pdfminer/pdfcolor.py ---- pdfminer.six-20160614/pdfminer/pdfcolor.py 2015-10-13 17:39:46.000000000 -0400 -+++ pdfminer.six-20160614-patched/pdfminer/pdfcolor.py 2016-06-14 23:12:51.433787811 -0400 -@@ -1,4 +1,3 @@ --#!/usr/bin/env python - from .psparser import LIT - - import six #Python 2+3 compatibility -@@ -34,4 +33,4 @@ for (name, n) in six.iteritems({ - 'Pattern': 1, - }) : - PREDEFINED_COLORSPACE[name]=PDFColorSpace(name, n) -- -\ No newline at end of file -+ -diff -rupN pdfminer.six-20160614/pdfminer/pdfdevice.py pdfminer.six-20160614-patched/pdfminer/pdfdevice.py ---- pdfminer.six-20160614/pdfminer/pdfdevice.py 2015-10-13 17:39:46.000000000 -0400 -+++ pdfminer.six-20160614-patched/pdfminer/pdfdevice.py 2016-06-14 23:12:52.371783751 -0400 -@@ -1,4 +1,3 @@ --#!/usr/bin/env python - from .pdffont import PDFUnicodeNotDefined - - from . import utils -diff -rupN pdfminer.six-20160614/pdfminer/pdfdocument.py pdfminer.six-20160614-patched/pdfminer/pdfdocument.py ---- pdfminer.six-20160614/pdfminer/pdfdocument.py 2016-06-14 18:59:38.000000000 -0400 -+++ pdfminer.six-20160614-patched/pdfminer/pdfdocument.py 2016-06-14 23:12:53.193780192 -0400 -@@ -1,4 +1,3 @@ --#!/usr/bin/env python - import re - import struct - import logging -diff -rupN pdfminer.six-20160614/pdfminer/pdffont.py pdfminer.six-20160614-patched/pdfminer/pdffont.py ---- pdfminer.six-20160614/pdfminer/pdffont.py 2016-02-02 19:50:22.000000000 -0500 -+++ pdfminer.six-20160614-patched/pdfminer/pdffont.py 2016-06-14 23:12:53.929777005 -0400 -@@ -1,4 +1,3 @@ --#!/usr/bin/env python - import sys - import struct - from io import BytesIO -diff -rupN pdfminer.six-20160614/pdfminer/pdfinterp.py pdfminer.six-20160614-patched/pdfminer/pdfinterp.py ---- pdfminer.six-20160614/pdfminer/pdfinterp.py 2016-06-14 18:59:38.000000000 -0400 -+++ pdfminer.six-20160614-patched/pdfminer/pdfinterp.py 2016-06-14 23:12:54.777773334 -0400 -@@ -1,4 +1,3 @@ --#!/usr/bin/env python - import re - import logging - from io import BytesIO -diff -rupN pdfminer.six-20160614/pdfminer/pdfpage.py pdfminer.six-20160614-patched/pdfminer/pdfpage.py ---- pdfminer.six-20160614/pdfminer/pdfpage.py 2016-06-14 18:59:38.000000000 -0400 -+++ pdfminer.six-20160614-patched/pdfminer/pdfpage.py 2016-06-14 23:12:55.537770044 -0400 -@@ -1,4 +1,3 @@ --#!/usr/bin/env python - import logging - from .psparser import LIT - from .pdftypes import PDFObjectNotFound -diff -rupN pdfminer.six-20160614/pdfminer/pdfparser.py pdfminer.six-20160614-patched/pdfminer/pdfparser.py ---- pdfminer.six-20160614/pdfminer/pdfparser.py 2016-06-14 18:59:38.000000000 -0400 -+++ pdfminer.six-20160614-patched/pdfminer/pdfparser.py 2016-06-14 23:12:56.289766788 -0400 -@@ -1,4 +1,3 @@ --#!/usr/bin/env python - import logging - from io import BytesIO - from .psparser import PSStackParser -diff -rupN pdfminer.six-20160614/pdfminer/pdftypes.py pdfminer.six-20160614-patched/pdfminer/pdftypes.py ---- pdfminer.six-20160614/pdfminer/pdftypes.py 2016-06-14 18:59:38.000000000 -0400 -+++ pdfminer.six-20160614-patched/pdfminer/pdftypes.py 2016-06-14 23:12:57.065763429 -0400 -@@ -1,4 +1,3 @@ --#!/usr/bin/env python - import zlib - import logging - from .lzw import lzwdecode -diff -rupN pdfminer.six-20160614/pdfminer/psparser.py pdfminer.six-20160614-patched/pdfminer/psparser.py ---- pdfminer.six-20160614/pdfminer/psparser.py 2016-06-14 18:59:38.000000000 -0400 -+++ pdfminer.six-20160614-patched/pdfminer/psparser.py 2016-06-14 23:12:57.969759514 -0400 -@@ -1,4 +1,3 @@ --#!/usr/bin/python - # -*- coding: utf-8 -*- - - import re -diff -rupN pdfminer.six-20160614/pdfminer/rijndael.py pdfminer.six-20160614-patched/pdfminer/rijndael.py ---- pdfminer.six-20160614/pdfminer/rijndael.py 2015-10-13 17:39:46.000000000 -0400 -+++ pdfminer.six-20160614-patched/pdfminer/rijndael.py 2016-06-14 23:12:59.393753350 -0400 -@@ -1,4 +1,3 @@ --#!/usr/bin/env python - - """ Python implementation of Rijndael encryption algorithm. - -diff -rupN pdfminer.six-20160614/pdfminer/runlength.py pdfminer.six-20160614-patched/pdfminer/runlength.py ---- pdfminer.six-20160614/pdfminer/runlength.py 2015-10-13 17:39:46.000000000 -0400 -+++ pdfminer.six-20160614-patched/pdfminer/runlength.py 2016-06-14 23:13:01.217745453 -0400 -@@ -1,4 +1,3 @@ --#!/usr/bin/env python - # - # RunLength decoder (Adobe version) implementation based on PDF Reference - # version 1.4 section 3.3.4. -diff -rupN pdfminer.six-20160614/pdfminer/utils.py pdfminer.six-20160614-patched/pdfminer/utils.py ---- pdfminer.six-20160614/pdfminer/utils.py 2015-10-13 17:39:46.000000000 -0400 -+++ pdfminer.six-20160614-patched/pdfminer/utils.py 2016-06-14 23:13:04.897729521 -0400 -@@ -1,4 +1,3 @@ --#!/usr/bin/env python - """ - Miscellaneous Routines. - """ diff --git a/python-pdfminer.spec b/python-pdfminer.spec index 5806ef9..b436878 100644 --- a/python-pdfminer.spec +++ b/python-pdfminer.spec @@ -2,18 +2,14 @@ %global pypi_name pdfminer.six Name: python-pdfminer -Version: 20160614 -Release: 7%{?dist} +Version: 20170418 +Release: 1%{?dist} Summary: PDF parser and analyzer License: MIT URL: http://github.com/goulu/pdfminer -# The new urls don't seem to work for this one, yet? -Source0: https://pypi.python.org/packages/56/6b/fce5baf6ed0a498266734e26a97980c97597cef069e22ca329277bb8853d/%{pypi_name}-%{version}.zip -#Source0: https://files.pythonhosted.org/packages/source/p/%{pypi_name}/%{pypi_name}-%{version}.tar.gz - -Patch0: pdfminer-un-chbang-libs.patch +Source0: https://files.pythonhosted.org/packages/source/p/%{pypi_name}/%{pypi_name}-%{version}.tar.gz BuildArch: noarch @@ -108,7 +104,7 @@ dos2unix tools/* dos2unix docs/* # A single file has a 'python3' chbang in it, fix that so later assumptions work. -sed 's/env python3/env python/g' -i pdfminer/high_level.py +#sed 's/env python3/env python/g' -i pdfminer/high_level.py %build # Make the cmap resources. @@ -176,6 +172,9 @@ ln -sf %{_bindir}/latin2ascii.py-3 %{buildroot}/%{_bindir}/latin2ascii %doc docs/* %changelog +* Wed Apr 19 2017 Ben Rosser - 20170418-1 +- Updated to latest upstream release + * Sat Feb 11 2017 Fedora Release Engineering - 20160614-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild