diff --git a/sgml-common.spec b/sgml-common.spec index beca03b..d6852f6 100644 --- a/sgml-common.spec +++ b/sgml-common.spec @@ -2,7 +2,7 @@ Name: sgml-common Version: 0.6.3 -Release: 48%{?dist} +Release: 49%{?dist} Group: Applications/Text Summary: Common SGML catalog and DTD files @@ -23,6 +23,9 @@ Source2: xml.soc Source3: html.dcl Source4: html.soc Source5: http://www.w3.org/%{xmlxsdver}/xml.xsd +Source6: http://www.w3.org/TR/xmldsig-core/xmldsig-core-schema.xsd +Source7: http://www.w3.org/2001/XMLSchema.dtd +Source8: http://www.w3.org/2001/datatypes.dtd Patch0: sgml-common-umask.patch Patch1: sgml-common-xmldir.patch @@ -83,6 +86,10 @@ for type in system uri ; do "http://www.w3.org/$path/xml.xsd" \ "file://%{_datadir}/xml/xml.xsd" $XMLCATALOG done + # Add xmldsig-core-schema.xsd to catalog + %{_bindir}/xmlcatalog --noout --add $type \ + "http://www.w3.org/TR/xmldsig-core/xmldsig-core-schema.xsd" \ + "file://%{_datadir}/xml/xmldsig-core-schema.xsd" $XMLCATALOG done # Now put the common DocBook entries in it %{_bindir}/xmlcatalog --noout --add "delegatePublic" \ @@ -100,6 +107,15 @@ done %{_bindir}/xmlcatalog --noout --add "delegateURI" \ "http://www.oasis-open.org/docbook/" \ "file://%{_sysconfdir}/sgml/docbook/xmlcatalog" $XMLCATALOG +for public in "-//W3C//DTD XMLSchema 200102//EN" "-//W3C//DTD XMLSCHEMA 200102//EN" ; do + %{_bindir}/xmlcatalog --noout --add "public" \ + "$public" \ + "file://%{_datadir}/xml/XMLSchema.dtd" $XMLCATALOG +done +%{_bindir}/xmlcatalog --noout --add "system" \ + "http://www.w3.org/2001/XMLSchema.dtd" \ + "file://%{_datadir}/xml/XMLSchema.dtd" $XMLCATALOG + # Also create the common DocBook catalog %{_bindir}/xmlcatalog --noout --create \ $RPM_BUILD_ROOT%{_sysconfdir}/sgml/docbook/xmlcatalog @@ -110,7 +126,8 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/sgml/xml.dcl install -p -m0644 %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} \ $RPM_BUILD_ROOT%{_datadir}/sgml rm -rf $RPM_BUILD_ROOT%{_datadir}/xml/* -install -p -m0644 %{SOURCE5} $RPM_BUILD_ROOT%{_datadir}/xml +install -p -m0644 %{SOURCE5} %{SOURCE6} %{SOURCE7} %{SOURCE8} \ + $RPM_BUILD_ROOT%{_datadir}/xml # remove installed doc file and prepare installation with %%doc rm $RPM_BUILD_ROOT%{_datadir}/doc/*.html @@ -128,6 +145,14 @@ if [ $1 -gt 1 ] && [ -e %{_sysconfdir}/xml/catalog ]; then "file://%{_datadir}/xml/xml.xsd" \ %{_sysconfdir}/xml/catalog done + %{_bindir}/xmlcatalog --noout --add $type \ + "http://www.w3.org/TR/xmldsig-core/xmldsig-core-schema.xsd" \ + "file://%{_datadir}/xml/xmldsig-core-schema.xsd" %{_sysconfdir}/xml/catalog + done + for public in "-//W3C//DTD XMLSchema 200102//EN" "-//W3C//DTD XMLSCHEMA 200102//EN" ; do + %{_bindir}/xmlcatalog --noout --add "public" \ + "$public" \ + "file://%{_datadir}/xml/XMLSchema.dtd" %{_sysconfdir}/xml/catalog done fi @@ -161,8 +186,14 @@ fi %{_datadir}/sgml/docbook/xmlcatalog %dir %{_datadir}/xml %{_datadir}/xml/xml.xsd +%{_datadir}/xml/xmldsig-core-schema.xsd +%{_datadir}/xml/XMLSchema.dtd +%{_datadir}/xml/datatypes.dtd %changelog +* Tue Jun 12 2018 Jan Pazdziora - 0.6.3-49 +- Package and catalog xmldsig-core-schema.xsd, XMLSchema.dtd, and datatypes.dtd + * Fri Feb 09 2018 Fedora Release Engineering - 0.6.3-48 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild