From 4bcb7d2e22ea599d5b7a80f839d04395c79482fa Mon Sep 17 00:00:00 2001 From: =?utf8?q?Elan=20Ruusam=C3=A4e?= Date: Sun, 23 Apr 2017 18:28:46 +0300 Subject: [PATCH] up to 2.1.0 --- egg-deps.patch | 9 --------- translate-toolkit-stoplist.patch | 9 ++++----- translate-toolkit.spec | 12 +++++------- 3 files changed, 9 insertions(+), 21 deletions(-) delete mode 100644 egg-deps.patch diff --git a/egg-deps.patch b/egg-deps.patch deleted file mode 100644 index 747b718..0000000 --- a/egg-deps.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- translate-toolkit-1.14.0-rc1/requirements/required.txt~ 2016-03-07 17:18:17.000000000 +0200 -+++ translate-toolkit-1.14.0-rc1/requirements/required.txt 2016-09-15 12:55:53.773712158 +0300 -@@ -1,6 +1,5 @@ - # argparse is required for Python 2.6, it is a - # standard library in Python >= 2.7 --argparse - six>=1.9 - - # Required to provide compatibility for old Virtaal releases: diff --git a/translate-toolkit-stoplist.patch b/translate-toolkit-stoplist.patch index 9e09a6e..d3fb5c0 100644 --- a/translate-toolkit-stoplist.patch +++ b/translate-toolkit-stoplist.patch @@ -1,13 +1,12 @@ -diff -up translate-toolkit-1.5.3/translate/tools/poterminology.py.stoplist translate-toolkit-1.5.3/translate/tools/poterminology.py ---- translate-toolkit-1.5.3/translate/tools/poterminology.py.stoplist 2010-01-23 01:18:39.000000000 +0200 -+++ translate-toolkit-1.5.3/translate/tools/poterminology.py 2010-02-02 15:35:24.000000000 +0200 -@@ -74,7 +74,7 @@ class TerminologyExtractor(object): +--- translate-toolkit-2.1.0/translate/tools/poterminology.py~ 2017-04-23 18:23:57.000000000 +0300 ++++ translate-toolkit-2.1.0/translate/tools/poterminology.py 2017-04-23 18:24:31.871529381 +0300 +@@ -79,7 +79,7 @@ if stopfile is None: try: - stopfile = file_discovery.get_abs_data_filename('stoplist-%s' % self.sourcelanguage) + stopfile = '/usr/share/translate-toolkit/stoplist-%s' % self.sourcelanguage - except: + except Exception: pass self.stopfile = stopfile @@ -457,7 +457,7 @@ def main(): diff --git a/translate-toolkit.spec b/translate-toolkit.spec index 2d3f75d..f827340 100644 --- a/translate-toolkit.spec +++ b/translate-toolkit.spec @@ -5,16 +5,15 @@ Summary: Tools to assist with translation and software localization Name: translate-toolkit -Version: 1.14.0 -Release: 2 +Version: 2.1.0 +Release: 1 License: GPL v2+ Group: Development/Tools -Source0: https://github.com/translate/translate/releases/download/%{version}-rc1/%{name}-%{version}-rc1.tar.bz2 -# Source0-md5: 5c9db1077098d7cc10a2704bf673c8b3 +Source0: https://github.com/translate/translate/releases/download/%{version}/%{name}-%{version}.tar.bz2 +# Source0-md5: 302d20ad12a34da9992ef14f4ba13261 Patch0: %{name}-stoplist.patch Patch1: %{name}-langmodel_dir.patch Patch2: unbash.patch -Patch3: egg-deps.patch URL: http://toolkit.translatehouse.org/ BuildRequires: checkbashisms BuildRequires: python-dateutil @@ -78,11 +77,10 @@ Group: Documentation Documentation for translate-toolkit. %prep -%setup -q -n %{name}-%{version}-rc1 +%setup -q %patch0 -p1 %patch1 -p1 %patch2 -p1 -%patch3 -p1 # FIXME: they do it wrong apparently? that can't do via setup.py? %{__sed} -i -e 's#packagesdir = get_python_lib()#packagesdir = "%{py_sitescriptdir}"#' setup.py -- 2.44.0