Attachment 924957 Details for Bug 1127837 – proposed fix

[patch] proposed fix

0001-update-to-0.9.1-1-bz-1127837-and-1127836.patch (text/plain), 5.36 KB, created by Alon Levy on 2014-08-07 16:20:55 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alon Levy

Created: 2014-08-07 16:20:55 UTC

Size: 5.36 KB

patch

obsolete

>From 18fe7bb0c19c51b5ed756e31f35b701c02c51783 Mon Sep 17 00:00:00 2001
>From: Alon Levy <alon@pobox.com>
>Date: Thu, 7 Aug 2014 19:19:45 +0300
>Subject: [PATCH] update to 0.9.1-1 (bz 1127837 and 1127836)
>
>---
> pyphen-0.7-shared-dicts.patch   | 14 ---------
> pyphen-0.9.1-shared-dicts.patch | 65 +++++++++++++++++++++++++++++++++++++++++
> python-pyphen.spec              | 10 +++++--
> sources                         |  2 +-
> 4 files changed, 73 insertions(+), 18 deletions(-)
> delete mode 100644 pyphen-0.7-shared-dicts.patch
> create mode 100644 pyphen-0.9.1-shared-dicts.patch
>
>diff --git a/pyphen-0.7-shared-dicts.patch b/pyphen-0.7-shared-dicts.patch
>deleted file mode 100644
>index 13e50aa..0000000
>--- a/pyphen-0.7-shared-dicts.patch
>+++ /dev/null
>@@ -1,14 +0,0 @@
>-diff -up Pyphen-0.7/pyphen/__init__.py.shared_dicts Pyphen-0.7/pyphen/__init__.py
>---- Pyphen-0.7/pyphen/__init__.py.shared_dicts	2013-07-21 00:51:04.606945135 -0600
>-+++ Pyphen-0.7/pyphen/__init__.py	2013-07-21 00:52:58.757932594 -0600
>-@@ -40,8 +40,8 @@ hdcache = {}
>- parse_hex = re.compile(r'\^{2}([0-9a-f]{2})').sub
>- parse = re.compile(r'(\d?)(\D?)').findall
>- 
>--# included dictionaries
>--dictionaries_root = os.path.join(os.path.dirname(__file__), 'dictionaries')
>-+# dictionaries provided by hyphen-xx RPM packages, e.g. hyphen-en
>-+dictionaries_root = '/usr/share/hyphen'
>- LANGUAGES = dict(
>-     (filename[5:-4], os.path.join(dictionaries_root, filename))
>-     for filename in os.listdir(dictionaries_root)
>diff --git a/pyphen-0.9.1-shared-dicts.patch b/pyphen-0.9.1-shared-dicts.patch
>new file mode 100644
>index 0000000..b973396
>--- /dev/null
>+++ b/pyphen-0.9.1-shared-dicts.patch
>@@ -0,0 +1,65 @@
>+From 988372ed85d7317c2f24a956d50e78542728e575 Mon Sep 17 00:00:00 2001
>+From: Alon Levy <alon@pobox.com>
>+Date: Thu, 7 Aug 2014 18:33:48 +0300
>+Subject: [PATCH] pyphen 0.9.1 shared dicts
>+
>+---
>+ pyphen.py | 19 ++-----------------
>+ setup.py  |  6 ------
>+ 2 files changed, 2 insertions(+), 23 deletions(-)
>+
>+diff --git a/pyphen.py b/pyphen.py
>+index 4ea1499..06cadd8 100755
>+--- a/pyphen.py
>++++ b/pyphen.py
>+@@ -42,23 +42,8 @@ hdcache = {}
>+ parse_hex = re.compile(r'\^{2}([0-9a-f]{2})').sub
>+ parse = re.compile(r'(\d?)(\D?)').findall
>+ 
>+-# included dictionaries are available:
>+-# - at <sys.prefix>/share/pyphen/dictionaries when Pyphen is installed
>+-# - at <project_root>/dictionaries when Pyphen is not installed
>+-# - at <pkg_resources>/share/pyphen/dictionaries when Pyphen is in an egg
>+-try:
>+-    import pkg_resources
>+-except ImportError:
>+-    dictionaries_roots = ()
>+-else:
>+-    dictionaries_roots = (os.path.join(
>+-        pkg_resources.resource_filename('pyphen', ''),
>+-        'share', 'pyphen', 'dictionaries'),)
>+-finally:
>+-    dictionaries_roots += (
>+-        os.path.join(sys.prefix, 'share', 'pyphen', 'dictionaries'),
>+-        os.path.join(os.path.dirname(__file__), 'dictionaries'))
>+-
>++# dictionaries provided by hyphen-xx RPM packages, e.g. hyphen-en
>++dictionaries_roots = ['/usr/share/hyphen']
>+ 
>+ LANGUAGES = dict(
>+     (filename[5:-4], os.path.join(dictionaries_root, filename))
>+diff --git a/setup.py b/setup.py
>+index 94022ab..fc54e24 100755
>+--- a/setup.py
>++++ b/setup.py
>+@@ -21,17 +21,11 @@ classifiers = [
>+     'Topic :: Text Processing :: Linguistic',
>+ ]
>+ 
>+-_dict_folder = os.path.join(os.path.dirname(__file__), 'dictionaries')
>+ setup(
>+     name='Pyphen',
>+     version='0.9.1',
>+     py_modules=['pyphen'],
>+     provides=['pyphen'],
>+-    data_files=[(
>+-        os.path.join('share', 'pyphen', 'dictionaries'), (
>+-            os.path.join(_dict_folder, filename)
>+-            for filename in os.listdir(_dict_folder)
>+-            if filename.endswith('.dic')))],
>+     author='Guillaume Ayoub',
>+     author_email='guillaume.ayoub@kozea.fr',
>+     url='https://github.com/Kozea/Pyphen',
>+-- 
>+1.9.3
>+
>diff --git a/python-pyphen.spec b/python-pyphen.spec
>index e9f0f41..4d53eb4 100644
>--- a/python-pyphen.spec
>+++ b/python-pyphen.spec
>@@ -5,8 +5,8 @@
> %endif
> 
> Name:           python-pyphen
>-Version:        0.7
>-Release:        5%{?dist}
>+Version:        0.9.1
>+Release:        1%{?dist}
> Group:          Development/Libraries
> Summary:        Pure Python module to hyphenate text
> License:        LGPLv2+
>@@ -23,7 +23,7 @@ BuildRequires:  python3-devel python3-setuptools
> # Desktop users will likely have hyphenation dictionaries installed
> # for the languages they use, as part of the Libreoffice language
> # packs, but if not, they can be installed separately.
>-Patch0:         pyphen-0.7-shared-dicts.patch
>+Patch0:         pyphen-0.9.1-shared-dicts.patch
> 
> %description
> Pyphen is a pure Python module to hyphenate text using existing
>@@ -62,6 +62,7 @@ popd
> # hyphenation dictionaries for many languages to be installed.
> 
> %install
>+rm -rf dictionaries
> %{__python} setup.py install --skip-build --prefix=%{_prefix} --root %{buildroot}
> %if 0%{?with_python3}
> pushd %{py3dir}
>@@ -80,6 +81,9 @@ popd
> %endif # with_python3
> 
> %changelog
>+* Thu Aug 07 2014 Alon Levy <alon@pobox.com> - 0.9.1-1
>+- Update to latest release, fixes bz 1127837 (for weasyprint 1127836)
>+
> * Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.7-5
> - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
> 
>diff --git a/sources b/sources
>index af255a4..6e02960 100644
>--- a/sources
>+++ b/sources
>@@ -1 +1 @@
>-aeb22934c6975ebc3ada833205b91350  0.7.tar.gz
>+e874901a2df7bacbb0c89a10d45068bb  0.9.1.tar.gz
>-- 
>1.9.3
>

Actions: View | Diff

Attachments on bug 1127837: 924957