pool/sgml-skel
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 433130 from home:thomas-schraitle:branches:Publishing

Browse Source 
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
This commit is contained in:
Thomas Schraitle 2016-10-04 12:21:28 +00:00 committed by Git OBS Bridge
parent 14e6293309
commit 657623561b
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sgml-skel.changes
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 Tue Jun 14 14:50:47 UTC 2016 - fvogt@suse.com

3
sgml-skel.spec
View File

@ -62,8 +62,9 @@ install -d -m755 %{buildroot}%{_localstatedir}/lib/sgml
touch %{buildroot}%{_sysconfdir}/sgml/catalog touch %{buildroot}%{_sysconfdir}/sgml/catalog
xmlcatalog --noout --create %{buildroot}%{_sysconfdir}/xml/suse-catalog.xml xmlcatalog --noout --create %{buildroot}%{_sysconfdir}/xml/suse-catalog.xml
xmlcatalog --noout --create %{buildroot}%{_sysconfdir}/xml/catalog 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" "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 install -d -m755 %{buildroot}%{_sysconfdir}/xml/catalog.d
%post %post