Accepting request 659962 from GNOME:Next

All of PPC built now :-) 
Seems we can finally move forward with this one. Fedora is already shipping this version.

- Update to version 2.0.5:
  + Allow preserveSpace on XML attributes.
  + Fixed issue with writing files under macOS.
  + Fixed various differences between Python 2 and 3.
  + Fixed issues with libxml2 memory management.
- Add itstool-Apply-ITS-files.patch: Apply ITS files passed with -i
  in --join mode.
- Drop patch itstool-2.0.4-serialize_to_str.patch and
  itstool-2.0.4-memory-management.patch: fixed upstream.
- Switch directly to py3 istool, as it seems it does not break there
  should be no real requirement to use the python2 variant (even on
  old products it should be ok to use py3 one)
- Add patch itstool-2.0.4-serialize_to_str.patch
  to fix upstream big #19 (fix str/bytes issue)
- Be consistent in using python%{_python_ver}
- Modernize spec-file by calling spec-cleaner
- Introduce _python_ver variable, currently set to '2': allow for
  an easy way to toggle between python3 and python2 based itstool.
  Currently using python2, as python3-based itstool still has
  issues.
- Switch to python3 version:
  + Add python3-base BuildRequires: unlike python2, py3 is not
    implicit in the buildroot yet.
  + Export PYTHON=python3 before configure.
  + Replace libxml2-python (Build)?Requires with
    python3-libxml2-python.
- Replace itstool-2.0.4-no-freedoc.patch with
  itstool-2.0.4-memory-management.patch: use upstream provided
  solution for the crshes.
- Update to version 2.0.4:
  + Fixed a massive performance issue.
- Add itstool-2.0.4-no-freedoc.patch: Do not free xmlDocs, avoid
  crashes (gh#itstool/itstool#17).
- Update to version 2.0.3:
  + Added:
    - Python 3 support. Keeping Python 2 support for now.
    - --path option for extra paths for ITS files.
  + Fixed:
    - --keep-entities mode after some libxml2 changes.
    - UTF-8 handling for translated attributes.
  + Don't error out (except under -s) for mismatched placeholders.

OBS-URL: https://build.opensuse.org/request/show/659962
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/itstool?expand=0&rev=26
This commit is contained in:
Bjørn Lie 2018-12-21 08:46:55 +00:00 committed by Git OBS Bridge
parent d484dfd83d
commit 93269f2311
5 changed files with 120 additions and 14 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:bf909fb59b11a646681a8534d5700fec99be83bb2c57badf8c1844512227033a
size 96748

3
itstool-2.0.5.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:100506f8df62cca6225ec3e631a8237e9c04650c77495af4919ac6a100d4b308
size 102751

View File

@ -0,0 +1,25 @@
From bc5724ed98eb591d4b82dff1b4b47ed77ec47eda Mon Sep 17 00:00:00 2001
From: Shaun McCance <shaunm@redhat.com>
Date: Thu, 8 Nov 2018 19:01:43 -0500
Subject: [PATCH] Apply ITS files passed with -i in --join mode
Fixes https://github.com/itstool/itstool/issues/34
---
itstool.in | 3 +++
1 file changed, 3 insertions(+)
diff --git a/itstool.in b/itstool.in
index b3c0033..e64cd34 100755
--- a/itstool.in
+++ b/itstool.in
@@ -1635,6 +1635,9 @@ if __name__ == '__main__':
messages = MessageList()
doc = Document(opts.join, messages)
doc.apply_its_rules(not(opts.nobuiltins), params=params)
+ if opts.itsfile is not None:
+ for itsfile in opts.itsfile:
+ doc.apply_its_file(itsfile, params=params)
doc.join_translations(translations, strict=opts.strict)
serialized = doc._doc.serialize('utf-8')
if PY3:

View File

@ -1,3 +1,76 @@
-------------------------------------------------------------------
Wed Dec 19 02:37:30 UTC 2018 - bjorn.lie@gmail.com
- Update to version 2.0.5:
+ Allow preserveSpace on XML attributes.
+ Fixed issue with writing files under macOS.
+ Fixed various differences between Python 2 and 3.
+ Fixed issues with libxml2 memory management.
- Add itstool-Apply-ITS-files.patch: Apply ITS files passed with -i
in --join mode.
- Drop patch itstool-2.0.4-serialize_to_str.patch and
itstool-2.0.4-memory-management.patch: fixed upstream.
-------------------------------------------------------------------
Wed Jul 4 10:16:26 UTC 2018 - tchvatal@suse.com
- Switch directly to py3 istool, as it seems it does not break there
should be no real requirement to use the python2 variant (even on
old products it should be ok to use py3 one)
-------------------------------------------------------------------
Wed Jun 20 09:16:27 UTC 2018 - mcepl@suse.com
- Add patch itstool-2.0.4-serialize_to_str.patch
to fix upstream big #19 (fix str/bytes issue)
- Be consistent in using python%{_python_ver}
-------------------------------------------------------------------
Wed Feb 28 16:33:42 UTC 2018 - dimstar@opensuse.org
- Modernize spec-file by calling spec-cleaner
-------------------------------------------------------------------
Tue Feb 13 16:47:40 UTC 2018 - dimstar@opensuse.org
- Introduce _python_ver variable, currently set to '2': allow for
an easy way to toggle between python3 and python2 based itstool.
Currently using python2, as python3-based itstool still has
issues.
-------------------------------------------------------------------
Tue Oct 24 14:17:44 UTC 2017 - dimstar@opensuse.org
- Switch to python3 version:
+ Add python3-base BuildRequires: unlike python2, py3 is not
implicit in the buildroot yet.
+ Export PYTHON=python3 before configure.
+ Replace libxml2-python (Build)?Requires with
python3-libxml2-python.
- Replace itstool-2.0.4-no-freedoc.patch with
itstool-2.0.4-memory-management.patch: use upstream provided
solution for the crshes.
-------------------------------------------------------------------
Tue Oct 24 13:56:35 UTC 2017 - dimstar@opensuse.org
- Update to version 2.0.4:
+ Fixed a massive performance issue.
- Add itstool-2.0.4-no-freedoc.patch: Do not free xmlDocs, avoid
crashes (gh#itstool/itstool#17).
-------------------------------------------------------------------
Thu Oct 5 23:06:10 UTC 2017 - luc14n0@linuxmail.org
- Update to version 2.0.3:
+ Added:
- Python 3 support. Keeping Python 2 support for now.
- --path option for extra paths for ITS files.
+ Fixed:
- --keep-entities mode after some libxml2 changes.
- UTF-8 handling for translated attributes.
+ Don't error out (except under -s) for mismatched placeholders.
-------------------------------------------------------------------
Tue Dec 24 19:28:51 UTC 2013 - dimstar@opensuse.org

View File

@ -1,7 +1,7 @@
#
# spec file for package itstool
#
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -12,21 +12,24 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
Name: itstool
Version: 2.0.2
Version: 2.0.5
Release: 0
Summary: Tool to translate XML documents using PO files
License: GPL-3.0+
License: GPL-3.0-or-later
Group: Development/Tools/Other
Url: http://itstool.org
URL: http://itstool.org
Source: http://files.itstool.org/itstool/%{name}-%{version}.tar.bz2
BuildRequires: libxml2-python
Requires: libxml2-python
BuildRoot: %{_tmppath}/%{name}-%{version}-build
# PATCH-FIX-UPSTREAM itstool-Apply-ITS-files.patch -- Apply ITS files passed with -i in --join mode
Patch0: itstool-Apply-ITS-files.patch
BuildRequires: python3-base
BuildRequires: python3-libxml2-python
Requires: python3-libxml2-python
BuildArch: noarch
%description
@ -37,17 +40,22 @@ Internationalization Tag Set (ITS).
%prep
%setup -q
# remove itstool - we patch itstool.in and want to ensure we get the right version
rm itstool
%patch0 -p1
%build
sed -i -e "/^echo.*import/s/python/python3/" configure
export PYTHON=%{_bindir}/python3
%configure
make %{?_smp_mflags}
%install
%make_install
%make_install PYTHON=%{_bindir}/python3
%files
%defattr(-,root,root)
%doc ChangeLog COPYING COPYING.GPL3 NEWS
%license COPYING
%doc ChangeLog NEWS
%{_bindir}/%{name}
%{_datadir}/%{name}/
%{_mandir}/man1/itstool.1%{?ext_man}