Accepting request 433132 from Publishing

1

OBS-URL: https://build.opensuse.org/request/show/433132
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/sgml-skel?expand=0&rev=21
This commit is contained in:
Dominique Leuenberger 2016-10-06 10:31:23 +00:00 committed by Git OBS Bridge
commit 6ca38324c9
2 changed files with 9 additions and 1 deletions

View File

@ -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

View File

@ -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