From 9d48b190fffc8fda23f6cad22fdf616e75d5fcbd72511488dc3dbb7c15b381d2 Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dimstar@opensuse.org>
Date: Mon, 9 Oct 2017 18:16:07 +0000
Subject: [PATCH 1/5] Accepting request 531967 from
 home:luc14n0:branches:GNOME:Factory

Update to version 2.0.3

OBS-URL: https://build.opensuse.org/request/show/531967
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/itstool?expand=0&rev=22
---
 itstool-2.0.2.tar.bz2 |  3 ---
 itstool-2.0.3.tar.bz2 |  3 +++
 itstool.changes       | 12 ++++++++++++
 itstool.spec          |  4 ++--
 4 files changed, 17 insertions(+), 5 deletions(-)
 delete mode 100644 itstool-2.0.2.tar.bz2
 create mode 100644 itstool-2.0.3.tar.bz2

diff --git a/itstool-2.0.2.tar.bz2 b/itstool-2.0.2.tar.bz2
deleted file mode 100644
index 93e742f..0000000
--- a/itstool-2.0.2.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:bf909fb59b11a646681a8534d5700fec99be83bb2c57badf8c1844512227033a
-size 96748
diff --git a/itstool-2.0.3.tar.bz2 b/itstool-2.0.3.tar.bz2
new file mode 100644
index 0000000..e27b7eb
--- /dev/null
+++ b/itstool-2.0.3.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8c7a5c639eb4714a91ad829910fd06c1c677abcbbb60aee9211141faa7fb02c7
+size 101813
diff --git a/itstool.changes b/itstool.changes
index 2b2af13..83eba8e 100644
--- a/itstool.changes
+++ b/itstool.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+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
 
diff --git a/itstool.spec b/itstool.spec
index 20dc5ed..bddd48e 100644
--- a/itstool.spec
+++ b/itstool.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package itstool
 #
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 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
@@ -17,7 +17,7 @@
 
 
 Name:           itstool
-Version:        2.0.2
+Version:        2.0.3
 Release:        0
 Summary:        Tool to translate XML documents using PO files
 License:        GPL-3.0+

From a596e3e27850e212d7b34a2f29a4709011b14ce8425e31285dfe5879e61b18ca Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dimstar@opensuse.org>
Date: Thu, 12 Oct 2017 14:53:54 +0000
Subject: [PATCH 2/5] Accepting request 533673 from GNOME:Factory

Even with upstream patch things still seem borked, so revert

OBS-URL: https://build.opensuse.org/request/show/533673
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/itstool?expand=0&rev=23
---
 itstool-2.0.2.tar.bz2 |  3 +++
 itstool-2.0.3.tar.bz2 |  3 ---
 itstool.changes       | 12 ------------
 itstool.spec          |  4 ++--
 4 files changed, 5 insertions(+), 17 deletions(-)
 create mode 100644 itstool-2.0.2.tar.bz2
 delete mode 100644 itstool-2.0.3.tar.bz2

diff --git a/itstool-2.0.2.tar.bz2 b/itstool-2.0.2.tar.bz2
new file mode 100644
index 0000000..93e742f
--- /dev/null
+++ b/itstool-2.0.2.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:bf909fb59b11a646681a8534d5700fec99be83bb2c57badf8c1844512227033a
+size 96748
diff --git a/itstool-2.0.3.tar.bz2 b/itstool-2.0.3.tar.bz2
deleted file mode 100644
index e27b7eb..0000000
--- a/itstool-2.0.3.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8c7a5c639eb4714a91ad829910fd06c1c677abcbbb60aee9211141faa7fb02c7
-size 101813
diff --git a/itstool.changes b/itstool.changes
index 83eba8e..2b2af13 100644
--- a/itstool.changes
+++ b/itstool.changes
@@ -1,15 +1,3 @@
--------------------------------------------------------------------
-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
 
diff --git a/itstool.spec b/itstool.spec
index bddd48e..20dc5ed 100644
--- a/itstool.spec
+++ b/itstool.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package itstool
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
 
 
 Name:           itstool
-Version:        2.0.3
+Version:        2.0.2
 Release:        0
 Summary:        Tool to translate XML documents using PO files
 License:        GPL-3.0+

From ab804fb655a3fde4dd9c9d85b83704f43ee5b1f1092dbd10909d48645ac3d616 Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dimstar@opensuse.org>
Date: Mon, 30 Oct 2017 10:35:03 +0000
Subject: [PATCH 3/5] Accepting request 536558 from GNOME:Next

- 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.

- 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/536558
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/itstool?expand=0&rev=24
---
 itstool-2.0.2.tar.bz2          |  3 ---
 itstool-2.0.4-no-freedoc.patch | 22 ++++++++++++++++++++++
 itstool-2.0.4.tar.bz2          |  3 +++
 itstool.changes                | 30 ++++++++++++++++++++++++++++++
 itstool.spec                   | 15 +++++++++++----
 5 files changed, 66 insertions(+), 7 deletions(-)
 delete mode 100644 itstool-2.0.2.tar.bz2
 create mode 100644 itstool-2.0.4-no-freedoc.patch
 create mode 100644 itstool-2.0.4.tar.bz2

diff --git a/itstool-2.0.2.tar.bz2 b/itstool-2.0.2.tar.bz2
deleted file mode 100644
index 93e742f..0000000
--- a/itstool-2.0.2.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:bf909fb59b11a646681a8534d5700fec99be83bb2c57badf8c1844512227033a
-size 96748
diff --git a/itstool-2.0.4-no-freedoc.patch b/itstool-2.0.4-no-freedoc.patch
new file mode 100644
index 0000000..ac6559d
--- /dev/null
+++ b/itstool-2.0.4-no-freedoc.patch
@@ -0,0 +1,22 @@
+Index: itstool-2.0.4/itstool.in
+===================================================================
+--- itstool-2.0.4.orig/itstool.in
++++ itstool-2.0.4/itstool.in
+@@ -553,9 +553,6 @@ class Document (object):
+         self._itst_credits = None
+         self._its_externals = {}
+ 
+-    def __del__ (self):
+-        self._doc.freeDoc()
+-
+     def _check_errors(self):
+         if self._xml_err:
+             raise libxml2.parserError(self._xml_err)
+@@ -1088,7 +1085,6 @@ class Document (object):
+         retnode = node.copyNode(2)
+         for child in xml_child_iter(trnode):
+             retnode.addChild(child.copyNode(1))
+-        ctxt.doc().freeDoc()
+         return retnode
+ 
+     def generate_messages(self, comments=True):
diff --git a/itstool-2.0.4.tar.bz2 b/itstool-2.0.4.tar.bz2
new file mode 100644
index 0000000..c67eeb0
--- /dev/null
+++ b/itstool-2.0.4.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:97c208b51da33e0b553e830b92655f8deb9132f8fbe9a646771f95c33226eb60
+size 102107
diff --git a/itstool.changes b/itstool.changes
index 2b2af13..a0e9b87 100644
--- a/itstool.changes
+++ b/itstool.changes
@@ -1,3 +1,33 @@
+-------------------------------------------------------------------
+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.
+
+-------------------------------------------------------------------
+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
 
diff --git a/itstool.spec b/itstool.spec
index 20dc5ed..a5e5581 100644
--- a/itstool.spec
+++ b/itstool.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package itstool
 #
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 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
@@ -17,15 +17,18 @@
 
 
 Name:           itstool
-Version:        2.0.2
+Version:        2.0.4
 Release:        0
 Summary:        Tool to translate XML documents using PO files
 License:        GPL-3.0+
 Group:          Development/Tools/Other
 Url:            http://itstool.org
 Source:         http://files.itstool.org/itstool/%{name}-%{version}.tar.bz2
-BuildRequires:  libxml2-python
-Requires:       libxml2-python
+# PATCH-FIX-UPSTREAM itstool-2.0.4-no-freedoc.patch boo#1064286 gh#itstool/itstool#17 jmatejek@suse.com -- Do not double free
+Patch0:         itstool-2.0.4-no-freedoc.patch
+BuildRequires:  python3-base
+BuildRequires:  python3-libxml2-python
+Requires:       python3-libxml2-python
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildArch:      noarch
 
@@ -37,8 +40,12 @@ 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
+export PYTHON=%{_bindir}/python3
 %configure
 make %{?_smp_mflags}
 

From d484dfd83df17f68ef39e64dd417d8b2295f2d9530468e85eb1ef4c60c9703a2 Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dimstar@opensuse.org>
Date: Mon, 30 Oct 2017 14:28:13 +0000
Subject: [PATCH 4/5] Accepting request 537584 from GNOME:Factory

Let's stabilize this in G:N first

OBS-URL: https://build.opensuse.org/request/show/537584
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/itstool?expand=0&rev=25
---
 itstool-2.0.2.tar.bz2          |  3 +++
 itstool-2.0.4-no-freedoc.patch | 22 ----------------------
 itstool-2.0.4.tar.bz2          |  3 ---
 itstool.changes                | 30 ------------------------------
 itstool.spec                   | 15 ++++-----------
 5 files changed, 7 insertions(+), 66 deletions(-)
 create mode 100644 itstool-2.0.2.tar.bz2
 delete mode 100644 itstool-2.0.4-no-freedoc.patch
 delete mode 100644 itstool-2.0.4.tar.bz2

diff --git a/itstool-2.0.2.tar.bz2 b/itstool-2.0.2.tar.bz2
new file mode 100644
index 0000000..93e742f
--- /dev/null
+++ b/itstool-2.0.2.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:bf909fb59b11a646681a8534d5700fec99be83bb2c57badf8c1844512227033a
+size 96748
diff --git a/itstool-2.0.4-no-freedoc.patch b/itstool-2.0.4-no-freedoc.patch
deleted file mode 100644
index ac6559d..0000000
--- a/itstool-2.0.4-no-freedoc.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: itstool-2.0.4/itstool.in
-===================================================================
---- itstool-2.0.4.orig/itstool.in
-+++ itstool-2.0.4/itstool.in
-@@ -553,9 +553,6 @@ class Document (object):
-         self._itst_credits = None
-         self._its_externals = {}
- 
--    def __del__ (self):
--        self._doc.freeDoc()
--
-     def _check_errors(self):
-         if self._xml_err:
-             raise libxml2.parserError(self._xml_err)
-@@ -1088,7 +1085,6 @@ class Document (object):
-         retnode = node.copyNode(2)
-         for child in xml_child_iter(trnode):
-             retnode.addChild(child.copyNode(1))
--        ctxt.doc().freeDoc()
-         return retnode
- 
-     def generate_messages(self, comments=True):
diff --git a/itstool-2.0.4.tar.bz2 b/itstool-2.0.4.tar.bz2
deleted file mode 100644
index c67eeb0..0000000
--- a/itstool-2.0.4.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:97c208b51da33e0b553e830b92655f8deb9132f8fbe9a646771f95c33226eb60
-size 102107
diff --git a/itstool.changes b/itstool.changes
index a0e9b87..2b2af13 100644
--- a/itstool.changes
+++ b/itstool.changes
@@ -1,33 +1,3 @@
--------------------------------------------------------------------
-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.
-
--------------------------------------------------------------------
-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
 
diff --git a/itstool.spec b/itstool.spec
index a5e5581..20dc5ed 100644
--- a/itstool.spec
+++ b/itstool.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package itstool
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,18 +17,15 @@
 
 
 Name:           itstool
-Version:        2.0.4
+Version:        2.0.2
 Release:        0
 Summary:        Tool to translate XML documents using PO files
 License:        GPL-3.0+
 Group:          Development/Tools/Other
 Url:            http://itstool.org
 Source:         http://files.itstool.org/itstool/%{name}-%{version}.tar.bz2
-# PATCH-FIX-UPSTREAM itstool-2.0.4-no-freedoc.patch boo#1064286 gh#itstool/itstool#17 jmatejek@suse.com -- Do not double free
-Patch0:         itstool-2.0.4-no-freedoc.patch
-BuildRequires:  python3-base
-BuildRequires:  python3-libxml2-python
-Requires:       python3-libxml2-python
+BuildRequires:  libxml2-python
+Requires:       libxml2-python
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildArch:      noarch
 
@@ -40,12 +37,8 @@ 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
-export PYTHON=%{_bindir}/python3
 %configure
 make %{?_smp_mflags}
 

From 93269f2311b9403696dd84918b864d705427b033f8ffdfcc452e78a309e700de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= <bjorn.lie@gmail.com>
Date: Fri, 21 Dec 2018 08:46:55 +0000
Subject: [PATCH 5/5] 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
---
 itstool-2.0.2.tar.bz2         |  3 --
 itstool-2.0.5.tar.bz2         |  3 ++
 itstool-Apply-ITS-files.patch | 25 ++++++++++++
 itstool.changes               | 73 +++++++++++++++++++++++++++++++++++
 itstool.spec                  | 30 ++++++++------
 5 files changed, 120 insertions(+), 14 deletions(-)
 delete mode 100644 itstool-2.0.2.tar.bz2
 create mode 100644 itstool-2.0.5.tar.bz2
 create mode 100644 itstool-Apply-ITS-files.patch

diff --git a/itstool-2.0.2.tar.bz2 b/itstool-2.0.2.tar.bz2
deleted file mode 100644
index 93e742f..0000000
--- a/itstool-2.0.2.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:bf909fb59b11a646681a8534d5700fec99be83bb2c57badf8c1844512227033a
-size 96748
diff --git a/itstool-2.0.5.tar.bz2 b/itstool-2.0.5.tar.bz2
new file mode 100644
index 0000000..f53f820
--- /dev/null
+++ b/itstool-2.0.5.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:100506f8df62cca6225ec3e631a8237e9c04650c77495af4919ac6a100d4b308
+size 102751
diff --git a/itstool-Apply-ITS-files.patch b/itstool-Apply-ITS-files.patch
new file mode 100644
index 0000000..eb83314
--- /dev/null
+++ b/itstool-Apply-ITS-files.patch
@@ -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:
+
diff --git a/itstool.changes b/itstool.changes
index 2b2af13..a693b9d 100644
--- a/itstool.changes
+++ b/itstool.changes
@@ -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
 
diff --git a/itstool.spec b/itstool.spec
index 20dc5ed..c3a3a90 100644
--- a/itstool.spec
+++ b/itstool.spec
@@ -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}