From 55a513bc1db79d8e527fbb213534fb835f4cabff24cc6b6e28d7e730186df6ca Mon Sep 17 00:00:00 2001
From: Thomas Schraitle <thomas.schraitle@suse.com>
Date: Tue, 23 Aug 2016 11:19:00 +0000
Subject: [PATCH 1/2] Add group with id="xmlcharent" for xmlcharent.xml catalog

OBS-URL: https://build.opensuse.org/package/show/Publishing/xmlcharent?expand=0&rev=9
---
 xmlcharent.spec | 2 +-
 xmlcharent.xml  | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/xmlcharent.spec b/xmlcharent.spec
index 1c96a04..5b75d71 100644
--- a/xmlcharent.spec
+++ b/xmlcharent.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package xmlcharent
 #
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 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
diff --git a/xmlcharent.xml b/xmlcharent.xml
index 3b8d7d7..ccf7f53 100644
--- a/xmlcharent.xml
+++ b/xmlcharent.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0"?>
 <catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
-	<rewriteSystem systemIdStartString="http://www.oasis-open.org/docbook/xmlcharent/0.3/" rewritePrefix="file://__DIR__/entities/"/>
+  <group id="xmlcharent">
+    <rewriteSystem systemIdStartString="http://www.oasis-open.org/docbook/xmlcharent/0.3/" rewritePrefix="file://__DIR__/entities/"/>
 	<public publicId="ISO 8879:1986//ENTITIES Publishing//EN//XML" uri="file://__DIR__/entities/iso-pub.ent"/>
 	<public publicId="ISO 8879:1986//ENTITIES Greek Letters//EN//XML" uri="file://__DIR__/entities/iso-grk1.ent"/>
 	<public publicId="ISO 8879:1986//ENTITIES Box and Line Drawing//EN//XML" uri="file://__DIR__/entities/iso-box.ent"/>
@@ -19,5 +20,6 @@
 	<public publicId="ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN//XML" uri="file://__DIR__/entities/iso-amsb.ent"/>
 	<public publicId="ISO 8879:1986//ENTITIES Added Latin 2//EN//XML" uri="file://__DIR__/entities/iso-lat2.ent"/>
 	<public publicId="ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN//XML" uri="file://__DIR__/entities/iso-amsr.ent"/>
-	<public publicId="ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN//XML" uri="file://__DIR__/entities/iso-cyr2.ent"/>
+    <public publicId="ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN//XML" uri="file://__DIR__/entities/iso-cyr2.ent"/>
+  </group>
 </catalog>

From bcead7ace6cfa0e63163e636bb0541f29e4a5e9d9bb724836f7deb97aac413ea Mon Sep 17 00:00:00 2001
From: "Dr. Werner Fink" <werner@suse.com>
Date: Tue, 24 May 2022 11:16:58 +0000
Subject: [PATCH 2/2] Update should not remove sgml catalog file

OBS-URL: https://build.opensuse.org/package/show/Publishing/xmlcharent?expand=0&rev=10
---
 xmlcharent.changes |  5 +++++
 xmlcharent.spec    | 13 ++++++++-----
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/xmlcharent.changes b/xmlcharent.changes
index 0c371b0..2d7e556 100644
--- a/xmlcharent.changes
+++ b/xmlcharent.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue May 24 11:15:56 UTC 2022 - Dr. Werner Fink <werner@suse.de>
+
+- Handle update case as well (boo#1199754)
+
 -------------------------------------------------------------------
 Mon Jul 18 12:29:42 UTC 2016 - fvogt@suse.com
 
diff --git a/xmlcharent.spec b/xmlcharent.spec
index 5b75d71..2d95f18 100644
--- a/xmlcharent.spec
+++ b/xmlcharent.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package xmlcharent
 #
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2022 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -12,7 +12,7 @@
 # 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/
 #
 
 
@@ -22,13 +22,13 @@ Release:        0
 Summary:        XML Character Entities
 License:        BSD-3-Clause
 Group:          Productivity/Publishing/XML
-Url:            http://www.oasis-open.org/docbook/xmlcharent/
+URL:            http://www.oasis-open.org/docbook/xmlcharent/
 Source0:        xmlcharent-0.3.tar.bz2
 Source1:        xmlcharent.xml
 Source2:        xmlcharent.sgml
 Requires:       sgml-skel >= 0.7
 Requires(post): sgml-skel >= 0.7
-Requires(postun): sgml-skel >= 0.7
+Requires(postun):sgml-skel >= 0.7
 BuildArch:      noarch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
@@ -55,7 +55,10 @@ sgml-register-catalog -a %{_datadir}/%{name}/%{name}.sgml
 
 %postun
 update-xml-catalog
-sgml-register-catalog -r %{_datadir}/%{name}/%{name}.sgml
+if ! test -e %{_datadir}/%{name}/%{name}.sgml
+then
+    sgml-register-catalog -r %{_datadir}/%{name}/%{name}.sgml
+fi
 
 %files
 %defattr(-, root, root)