From 0e4bc65c429d5772d74271d837c5f47c8b7cf1b2 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Jul 28 2020 10:52:01 +0000
Subject: import itstool-2.0.6-2.el8


---

diff --git a/.gitignore b/.gitignore
index a582dc9..8dd41c2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/itstool-2.0.4.tar.bz2
+SOURCES/itstool-2.0.6.tar.bz2
diff --git a/.itstool.metadata b/.itstool.metadata
index 1dc6b82..36a301c 100644
--- a/.itstool.metadata
+++ b/.itstool.metadata
@@ -1 +1 @@
-5345615becb5c463c6e7f2462e387fdc327f3a35 SOURCES/itstool-2.0.4.tar.bz2
+9a7a3cd6e33763f6f369a907e79da98cc47b86e7 SOURCES/itstool-2.0.6.tar.bz2
diff --git a/SOURCES/fix-segfaults.patch b/SOURCES/fix-segfaults.patch
deleted file mode 100644
index e76dd2e..0000000
--- a/SOURCES/fix-segfaults.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff --git a/itstool.in b/itstool.in
-index c1d0585..a16eba9 100755
---- a/itstool.in
-+++ b/itstool.in
-@@ -477,6 +477,7 @@ class Document (object):
-         if load_dtd:
-             ctxt.loadSubset(1)
-         if keep_entities:
-+            ctxt.loadSubset(1)
-             ctxt.ctxtUseOptions(libxml2.XML_PARSE_DTDLOAD)
-             ctxt.replaceEntities(0)
-         else:
-@@ -1043,6 +1044,7 @@ class Document (object):
-         if self._load_dtd:
-             ctxt.loadSubset(1)
-         if self._keep_entities:
-+            ctxt.loadSubset(1)
-             ctxt.ctxtUseOptions(libxml2.XML_PARSE_DTDLOAD)
-             ctxt.replaceEntities(0)
-         else:
-@@ -1069,7 +1071,9 @@ class Document (object):
-                     ph_node = msg.get_placeholder(child.name).node
-                     if self.has_child_elements(ph_node):
-                         self.merge_translations(translations, None, ph_node, strict=strict)
--                        child.replaceNode(ph_node)
-+                        newnode = ph_node.copyNode(1)
-+                        newnode.setTreeDoc(self._doc)
-+                        child.replaceNode(newnode)
-                     else:
-                         repl = self.get_translated(ph_node, translations, strict=strict, lang=lang)
-                         child.replaceNode(repl)
-@@ -1084,10 +1088,15 @@ class Document (object):
-                     (lang + ' ') if lang is not None else '',
-                     msgstr.encode('utf-8')))
-                 self._xml_err = ''
-+                ctxt.doc().freeDoc()
-                 return node
-         retnode = node.copyNode(2)
-+        retnode.setTreeDoc(self._doc)
-         for child in xml_child_iter(trnode):
--            retnode.addChild(child.copyNode(1))
-+            newnode = child.copyNode(1)
-+            newnode.setTreeDoc(self._doc)
-+            retnode.addChild(newnode)
-+
-         ctxt.doc().freeDoc()
-         return retnode
- 
diff --git a/SPECS/itstool.spec b/SPECS/itstool.spec
index d2fca43..c82b2c8 100644
--- a/SPECS/itstool.spec
+++ b/SPECS/itstool.spec
@@ -1,5 +1,5 @@
 Name:           itstool
-Version:        2.0.4
+Version:        2.0.6
 Release:        2%{?dist}
 Summary:        ITS-based XML translation tool
 
@@ -7,10 +7,6 @@ Group:          Development/Tools
 License:        GPLv3+
 URL:            http://itstool.org/
 Source0:        http://files.itstool.org/itstool/%{name}-%{version}.tar.bz2
-# An issue with libxml2 is causing segfaults for packages using
-# itstool. Backported the workaround from upstream.
-# https://github.com/itstool/itstool/commit/9b84c007a73e8275ca45762f1bfa3ab7c3a852e2
-Patch0:         fix-segfaults.patch
 
 BuildArch:      noarch
 
@@ -25,7 +21,6 @@ how to separate it into PO file messages.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 export PYTHON=%{__python3}
@@ -42,6 +37,16 @@ make install DESTDIR=$RPM_BUILD_ROOT
 %doc %{_mandir}/man1/itstool.1.gz
 
 %changelog
+* Fri Jun 05 2020 Sundeep Anand <suanand@redhat.com> - 2.0.6-2
+- sync with Fedora package
+
+* Tue May 19 2020 Sundeep Anand <suanand@redhat.com> - 2.0.6-1
+- Update to 2.0.6 (rhbz#1836152)
+- Remove fix-segfaults.patch, as it is a part of upstream now
+
+* Sat May 09 2020 Sundeep Anand <suanand@redhat.com> - 2.0.4-3
+- rebuild for s390x (rhbz#1800548)
+
 * Mon Jul 16 2018 Charalampos Stratakis <cstratak@redhat.com> - 2.0.4-2
 - Fix libxml2 related segfaults