From 657623561b7017d10d73c1d0ffd42330b2328bbcf3d977fefda52d45c909f48e Mon Sep 17 00:00:00 2001 From: Thomas Schraitle Date: Tue, 4 Oct 2016 12:21:28 +0000 Subject: [PATCH] Accepting request 433130 from home:thomas-schraitle:branches:Publishing Fix bsc#1002759: change order in /etc/xml/catalog Needed to make precedence of catalog-d.xml over older method (suse-catalog.xml) OBS-URL: https://build.opensuse.org/request/show/433130 OBS-URL: https://build.opensuse.org/package/show/Publishing/sgml-skel?expand=0&rev=15 --- sgml-skel.changes | 7 +++++++ sgml-skel.spec | 3 ++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/sgml-skel.changes b/sgml-skel.changes index d8c7f57..bb50fbe 100644 --- a/sgml-skel.changes +++ b/sgml-skel.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Oct 4 11:37:09 UTC 2016 - toms@opensuse.org + +- Fix for bsc#1002759: change order in /etc/xml/catalog + Needed to make precedence of catalog-d.xml over older method + (suse-catalog.xml) + ------------------------------------------------------------------- Tue Jun 14 14:50:47 UTC 2016 - fvogt@suse.com diff --git a/sgml-skel.spec b/sgml-skel.spec index 028c7d2..cfa8be6 100644 --- a/sgml-skel.spec +++ b/sgml-skel.spec @@ -62,8 +62,9 @@ install -d -m755 %{buildroot}%{_localstatedir}/lib/sgml touch %{buildroot}%{_sysconfdir}/sgml/catalog xmlcatalog --noout --create %{buildroot}%{_sysconfdir}/xml/suse-catalog.xml xmlcatalog --noout --create %{buildroot}%{_sysconfdir}/xml/catalog -xmlcatalog --noout --add "nextCatalog" "suse-catalog.xml" "suse-catalog.xml" %{buildroot}%{_sysconfdir}/xml/catalog +# Use correct order: first new method, second old method xmlcatalog --noout --add "nextCatalog" "catalog-d.xml" "catalog-d.xml" %{buildroot}%{_sysconfdir}/xml/catalog +xmlcatalog --noout --add "nextCatalog" "suse-catalog.xml" "suse-catalog.xml" %{buildroot}%{_sysconfdir}/xml/catalog install -d -m755 %{buildroot}%{_sysconfdir}/xml/catalog.d %post