From dee03ed6e5c38071dd24ada8acb77aed03b4be59b94310fb61fed94fb3ae4c00 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.com>
Date: Mon, 4 Dec 2017 12:11:44 +0000
Subject: [PATCH] Accepting request 548064 from
 home:thomas-schraitle:branches:Java:packages

- Fix catalog paths in ws-jaxme-catalog.patch
  The DocBook XML 4.1.2 DTD cannot be retrieved from SGML catalogs
  (/etc/sgml/catalog) but from XML catalogs (/etc/xml/catalog).
  Corrected path from /etc/sgml/catalog to /etc/xml/catalog.

OBS-URL: https://build.opensuse.org/request/show/548064
OBS-URL: https://build.opensuse.org/package/show/Java:packages/ws-jaxme?expand=0&rev=16
---
 ws-jaxme-catalog.patch | 4 ++--
 ws-jaxme.changes       | 8 ++++++++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/ws-jaxme-catalog.patch b/ws-jaxme-catalog.patch
index 151c135..86e1d87 100644
--- a/ws-jaxme-catalog.patch
+++ b/ws-jaxme-catalog.patch
@@ -6,7 +6,7 @@
            <xmlcatalog>
 -            <dtd publicid="-//OASIS//DTD DocBook XML V4.1.2//EN" location="${docbook.home}/docbookx.dtd"/>
 +            <catalogpath>
-+              <pathelement location="/etc/sgml/catalog"/>
++              <pathelement location="/etc/xml/catalog"/>
 +            </catalogpath>
            </xmlcatalog>
          </style>
@@ -17,7 +17,7 @@
            <xmlcatalog>
 -            <dtd publicid="-//OASIS//DTD DocBook XML V4.1.2//EN" location="${docbook.home}/docbookx.dtd"/>
 +            <catalogpath>
-+              <pathelement location="/etc/sgml/catalog"/>
++              <pathelement location="/etc/xml/catalog"/>
 +            </catalogpath>
            </xmlcatalog>
            <factory name="org.apache.xalan.processor.TransformerFactoryImpl"/>
diff --git a/ws-jaxme.changes b/ws-jaxme.changes
index 2849afd..5116b0b 100644
--- a/ws-jaxme.changes
+++ b/ws-jaxme.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Mon Dec  4 12:03:31 UTC 2017 - thomas.schraitle@suse.com
+
+- Fix catalog paths in ws-jaxme-catalog.patch
+  The DocBook XML 4.1.2 DTD cannot be retrieved from SGML catalogs
+  (/etc/sgml/catalog) but from XML catalogs (/etc/xml/catalog).
+  Corrected path from /etc/sgml/catalog to /etc/xml/catalog.
+
 -------------------------------------------------------------------
 Fri Oct  6 15:33:05 UTC 2017 - fstrba@suse.com