From 107e25789e1ff4482be85b5b5138cea4b947e522236424e326de3a8ce58b5c20 Mon Sep 17 00:00:00 2001
From: Stefan Knorr <sknorr@suse.com>
Date: Fri, 30 Sep 2016 12:43:15 +0000
Subject: [PATCH] Stable release of the SUSE XSL stylesheets 2.0.6.3

OBS-URL: https://build.opensuse.org/package/show/Documentation:Tools/suse-xsl-stylesheets?expand=0&rev=109
---
 suse-xsl-stylesheets-2.0.6.2.tar.bz2 |  3 ---
 suse-xsl-stylesheets-2.0.6.3.tar.bz2 |  3 +++
 suse-xsl-stylesheets.changes         | 18 ++++++++++++++++++
 suse-xsl-stylesheets.spec            | 25 +++++++++++++++++--------
 4 files changed, 38 insertions(+), 11 deletions(-)
 delete mode 100644 suse-xsl-stylesheets-2.0.6.2.tar.bz2
 create mode 100644 suse-xsl-stylesheets-2.0.6.3.tar.bz2

diff --git a/suse-xsl-stylesheets-2.0.6.2.tar.bz2 b/suse-xsl-stylesheets-2.0.6.2.tar.bz2
deleted file mode 100644
index fa339b7..0000000
--- a/suse-xsl-stylesheets-2.0.6.2.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:00a826c35d40fef2ba0f95b9460e2b14072e6f3bbb4cfb2fcba80b0910b1d9d5
-size 1795559
diff --git a/suse-xsl-stylesheets-2.0.6.3.tar.bz2 b/suse-xsl-stylesheets-2.0.6.3.tar.bz2
new file mode 100644
index 0000000..cf72031
--- /dev/null
+++ b/suse-xsl-stylesheets-2.0.6.3.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2c81a878431f96278adc9006fb0abcbe45e33ff2dc2909b558beb7e6d09ccd5e
+size 1796218
diff --git a/suse-xsl-stylesheets.changes b/suse-xsl-stylesheets.changes
index 22fdb41..b2615c7 100644
--- a/suse-xsl-stylesheets.changes
+++ b/suse-xsl-stylesheets.changes
@@ -1,3 +1,21 @@
+-------------------------------------------------------------------
+Fri Sep 30 11:44:57 UTC 2016 - sknorr@suse.com
+
+Stable release of the SUSE XSL stylesheets 2.0.6.3:
+
+Find issues in our GitHub tracker at
+https://github.com/openSUSE/suse-xsl/issues/NUMBER
+
+* Packaging
+  - Update post/postun segments of spec file to install the catalog
+
+* Catalog
+  - Remove mentions of NovDoc, as NovDoc is now part of a separate
+    package
+
+* Stylesheets (common)
+  - Updated translations for `suse2013` stylesheets
+
 -------------------------------------------------------------------
 Thu Sep 15 15:06:10 UTC 2016 - sknorr@suse.com
 
diff --git a/suse-xsl-stylesheets.spec b/suse-xsl-stylesheets.spec
index aafb035..aff8781 100644
--- a/suse-xsl-stylesheets.spec
+++ b/suse-xsl-stylesheets.spec
@@ -17,7 +17,7 @@
 
 
 Name:           suse-xsl-stylesheets
-Version:        2.0.6.2
+Version:        2.0.6.3
 Release:        0
 
 ###############################################################
@@ -34,6 +34,7 @@ Release:        0
 #
 ################################################################
 
+%define susexsl_catalog   catalog-for-%{name}.xml
 %define db_xml_dir        %{_datadir}/xml/docbook
 %define suse_styles_dir   %{db_xml_dir}/stylesheet
 
@@ -142,14 +143,20 @@ make install DESTDIR=%{buildroot}  LIBDIR=%{_libdir}
 #----------------------
 
 %post
-%reconfigure_fonts_post
-if [ ! -f %{_sysconfdir}/xml/suse-catalog.xml -a -x %{_bindir}/edit-xml-catalog ] ; then
-    # susexsl entry
-    edit-xml-catalog --group --catalog %{_sysconfdir}/xml/suse-catalog.xml \
-       --del %{name}
-    edit-xml-catalog --group --catalog %{_sysconfdir}/xml/suse-catalog.xml \
-       --del suse_schemas
+# XML Catalogs
+#
+# remove existing entries first - needed for
+# zypper in, since it does not call postun
+# delete ...
+if [ "2" = "$1" ]; then
+  edit-xml-catalog --group --catalog %{_sysconfdir}/xml/suse-catalog.xml \
+    --del %{name} || true
 fi
+
+# ... and (re)add it again
+edit-xml-catalog --group --catalog %{_sysconfdir}/xml/suse-catalog.xml \
+  --add %{_sysconfdir}/xml/%{susexsl_catalog}
+%reconfigure_fonts_post
 exit 0
 
 #----------------------
@@ -157,6 +164,8 @@ exit 0
 %postun
 if [ "0" = "$1" ]; then
   %reconfigure_fonts_post
+  edit-xml-catalog --group --catalog %{_sysconfdir}/xml/suse-catalog.xml \
+    --del %{name} || true
 fi
 
 exit 0