diff --git a/.gitignore b/.gitignore index 37b0ea9..7769ecf 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,6 @@ sgml-common-0.6.3.tgz sgml-common-automake.tar.gz /xml.xsd +/xmldsig-core-schema.xsd +/XMLSchema.dtd +/datatypes.dtd diff --git a/sgml-common.spec b/sgml-common.spec index 4638d61..0e2b024 100644 --- a/sgml-common.spec +++ b/sgml-common.spec @@ -2,36 +2,40 @@ Name: sgml-common Version: 0.6.3 -Release: 46%{?dist} -Group: Applications/Text +Release: 69%{?dist} Summary: Common SGML catalog and DTD files -License: GPL+ +License: GPL-1.0-or-later BuildArch: noarch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) #Actually - there is no homepage of this project, on that URL #page you could get complete ISO 8879 listing as was on the #old page - only part of it is included in sgml-common package. -URL: http://www.w3.org/2003/entities/ +URL: https://www.w3.org/2003/entities/ -Source0: ftp://sources.redhat.com/pub/docbook-tools/new-trials/SOURCES/%{name}-%{version}.tgz +Source0: https://www.sourceware.org/pub/docbook-tools/new-trials/SOURCES/%{name}-%{version}.tgz # Following 4 from openjade/pubtext - same maintainer as in SGML-common, so up2date: Source1: xml.dcl 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 +Source9: sgmlwhich.1 +Source10: sgml.conf.5 Patch0: sgml-common-umask.patch Patch1: sgml-common-xmldir.patch Patch2: sgml-common-quotes.patch +BuildRequires: make BuildRequires: libxml2 BuildRequires: automake -Requires: /bin/basename +Requires: %{_bindir}/basename %description The sgml-common package contains a collection of entities and DTDs @@ -40,9 +44,8 @@ included in multiple packages. Sgml-common also includes an up-to-date Open Catalog file. %package -n xml-common -Group: Applications/Text Summary: Common XML catalog and DTD files -License: GPL+ +License: GPL-1.0-or-later Requires(pre): %{_bindir}/xmlcatalog %description -n xml-common @@ -52,9 +55,9 @@ but that don't need to be included in main package. %prep %setup -q -%patch0 -p1 -b .umask -%patch1 -p1 -b .xmldir -%patch2 -p1 -b .quotes +%patch -P0 -p1 -b .umask +%patch -P1 -p1 -b .xmldir +%patch -P2 -p1 -b .quotes # replace bogus links with files automakedir=`ls -1d /usr/share/automake* | head -n +1` @@ -67,8 +70,7 @@ done %configure %install -rm -rf $RPM_BUILD_ROOT -make install DESTDIR="$RPM_BUILD_ROOT" htmldir='%{_datadir}/doc' INSTALL='install -p' +%make_install htmldir='%{_datadir}/doc' mkdir $RPM_BUILD_ROOT%{_sysconfdir}/xml mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sgml/docbook mkdir -p $RPM_BUILD_ROOT%{_datadir}/sgml/docbook @@ -84,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" \ @@ -101,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 @@ -111,7 +126,12 @@ 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 +mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1 +mkdir -p $RPM_BUILD_ROOT%{_mandir}/man5 +install -p -m0644 %{SOURCE9} $RPM_BUILD_ROOT%{_mandir}/man1 +install -p -m0644 %{SOURCE10} $RPM_BUILD_ROOT%{_mandir}/man5 # remove installed doc file and prepare installation with %%doc rm $RPM_BUILD_ROOT%{_datadir}/doc/*.html @@ -120,9 +140,6 @@ mkdir -p __dist_doc/html/ cp -p doc/HTML/*.html __dist_doc/html/ -%clean -rm -rf $RPM_BUILD_ROOT - %pre -n xml-common if [ $1 -gt 1 ] && [ -e %{_sysconfdir}/xml/catalog ]; then for type in system uri ; do @@ -132,11 +149,18 @@ 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 %files -%defattr (-,root,root, -) %doc __dist_doc/html/ AUTHORS NEWS ChangeLog COPYING README %dir %{_sysconfdir}/sgml %config(noreplace) %{_sysconfdir}/sgml/sgml.conf @@ -151,9 +175,10 @@ fi %{_bindir}/sgmlwhich %{_bindir}/install-catalog %{_mandir}/man8/install-catalog.8* +%{_mandir}/man1/sgmlwhich.1* +%{_mandir}/man5/sgml.conf.5* %files -n xml-common -%defattr (-,root,root,-) %doc AUTHORS NEWS ChangeLog COPYING README %dir %{_sysconfdir}/xml %dir %{_sysconfdir}/sgml @@ -165,8 +190,80 @@ 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 +* Fri Jul 17 2026 Fedora Release Engineering - 0.6.3-69 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild + +* Sat Jan 17 2026 Fedora Release Engineering - 0.6.3-68 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + +* Fri Jul 25 2025 Fedora Release Engineering - 0.6.3-67 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + +* Sun Jan 19 2025 Fedora Release Engineering - 0.6.3-66 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Sat Jul 20 2024 Fedora Release Engineering - 0.6.3-65 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Mon Jun 17 2024 Miroslav Suchý - 0.6.3-64 +- convert license to SPDX + +* Sat Jan 27 2024 Fedora Release Engineering - 0.6.3-63 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Mon Oct 23 2023 Ondrej Sloup - 0.6.3-62 +- Update license tag to the SPDX format + +* Sat Jul 22 2023 Fedora Release Engineering - 0.6.3-61 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Sat Jan 21 2023 Fedora Release Engineering - 0.6.3-60 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Sat Jul 23 2022 Fedora Release Engineering - 0.6.3-59 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Sat Jan 22 2022 Fedora Release Engineering - 0.6.3-58 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Fri Jul 23 2021 Fedora Release Engineering - 0.6.3-57 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Wed Jan 27 2021 Fedora Release Engineering - 0.6.3-56 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Wed Jul 29 2020 Fedora Release Engineering - 0.6.3-55 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Thu Jan 30 2020 Fedora Release Engineering - 0.6.3-54 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Fri Jul 26 2019 Fedora Release Engineering - 0.6.3-53 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Sat Feb 02 2019 Fedora Release Engineering - 0.6.3-52 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Fri Oct 05 2018 Ondrej Vasik - 0.6.3-51 +- add basic manpages for sgml.conf(5) and sgmlwhich(1) (#1612272) + +* Sat Jul 14 2018 Fedora Release Engineering - 0.6.3-50 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* 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 + +* Tue Oct 31 2017 Igor Gnatenko - 0.6.3-47 +- Use /usr/bin instead of /bin in Requires + * Thu Jul 27 2017 Fedora Release Engineering - 0.6.3-46 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild @@ -210,7 +307,7 @@ fi - ship COPYING file with both sgml-common and xml-common - ship documentation with xml-common -* Fri Jan 14 2010 Ondrej Vasik 0.6.3-32 +* Fri Jan 15 2010 Ondrej Vasik 0.6.3-32 - Merge review #226415: remove unapplied patches, remove versioned BR diff --git a/sgml.conf.5 b/sgml.conf.5 new file mode 100644 index 0000000..7d97166 --- /dev/null +++ b/sgml.conf.5 @@ -0,0 +1,40 @@ +.TH SGML.CONF 5 +.\" NAME should be all caps, SECTION should be 1-8, maybe w/ subsection +.\" other parms are allowed: see man(7), man(1) +.SH NAME +sgml.conf \- basic configuration file for SGML environment variables + +.SH "DESCRIPTION" +This file contains basic variables for SGML environment. +.HP +Format of this file is straightforward: + +- Lines are either empty lines, comment lines (starting with hash mark) or variable assignments. + +- Assigments take form of "variable=value" where whitespace is not allowed. This makes the format Bourne-shell includable. + +.SH "VARIABLES" +.TP +.B SGML_BASE_DIR +This variable contains root of the location of sgml components. Suggested value for this variable is /usr/share/sgml. +.TP +.B SGML_CATALOGS_DIRS +This variable contains location of sgml catalog files. Suggested value is /etc/sgml. +.TP +.B SGML_EXTRA_BASE_DIRS +This variable contains the directory name(s) of the root of the location(s) of optional sgml components that the system administrator doesn't want to install to primary SGML_BASE_DIR directory. If multiple directory names are mentioned, they are separated by colons. +.TP +.B SGML_BIN_DIR +This variable contains the directory where executables should be placed. By default /usr/bin. +.TP +.B SGML_EXTRA_BIN_DIRS +This variable contains the directory name(s) where optional executables can be placed. Suggested and default value is /usr/local/bin. If multiple directory names are mentioned, they are separated by colons. +.TP +.B SGML_TMP_DIR +A hint to components where to put temporary files. The suggested and default value is /tmp. +.TP +.B SGML_POSTINSTALL_CMD +A command that is to be executed when new components have been installed. This mechanism is not used by default, sgml components are usually registered by %post scriptlets. +.SH "SEE ALSO" +.\" Always quote multiple words for .SH +.BR xsltproc (1) diff --git a/sgmlwhich.1 b/sgmlwhich.1 new file mode 100644 index 0000000..b00e7fd --- /dev/null +++ b/sgmlwhich.1 @@ -0,0 +1,21 @@ +.TH SGMLWHICH 1 +.\" NAME should be all caps, SECTION should be 1-8, maybe w/ subsection +.\" other parms are allowed: see man(7), man(1) +.SH NAME +sgmlwhich \- prints location of main sgml configuration file +.SH SYNOPSIS +.B sgmlwhich + +.SH "DESCRIPTION" +Simple script which prints location of main sgml configuration file. +It is provided for consistency with non-LSB platforms. + +.SH OPTIONS +Script doesn't accept any options. + +.SH "SEE ALSO" +.\" Always quote multiple words for .SH +.BR sgml.conf (5) + +.SH AUTHOR +Eric Bischoff diff --git a/sources b/sources index 128f119..c2211cd 100644 --- a/sources +++ b/sources @@ -1,3 +1,6 @@ -103c9828f24820df86e55e7862e28974 sgml-common-0.6.3.tgz -85a611bea6fc1fcdb15c62b373a953e5 sgml-common-automake.tar.gz -85f312ac34d69d898f15f16b57563320 xml.xsd +SHA512 (sgml-common-0.6.3.tgz) = 3c4a55f555596b2a6bf6af66c497679226e7b40625ac16832150488311cba7f9fc523435eea5837262a5517f5c09c4c0e07fe4a2cf02184d4027609c26e4bc0c +SHA512 (sgml-common-automake.tar.gz) = 4861db1f12726e1cefd1f7565b71af1485c146b73ef32492fff58207e50fb58e134721bb28f640b59261e5aee7f9c46d33bca95f7cfeb8986cf1dbaf9f13ccb3 +SHA512 (xml.xsd) = 9b4efba3b49a15ab3e0a429eec47eebd052be32286925b27ffbe0bddf42b2294979c70856d52e71c4e7f18f7bd3c8fc72cf6c258e2d700ea9a560a9863bd542f +SHA512 (xmldsig-core-schema.xsd) = ce73effa9cc94a9958d1de465d9398e2c157f1fd6eac56e4e5e6e2bd7e9ef7aef7093d1af2789d99ce817d1a7899ebc5a6ebea17882b02ba3274dc5317c64c14 +SHA512 (XMLSchema.dtd) = b978fa4df8a891654c4738952c6aeca0790ce16655ead566966a60900ce7067ccc21eb923b2dc3e8061f6d002f9d64a075e35047eace022812df23afe473ad0b +SHA512 (datatypes.dtd) = 68e778b3a7917a4514525a580975e547abcde2bc2d79491bcb4fd25f6f04f2ea2287fa19e5548d154c0f615178811a03bac8b724fb3ecaebe3e871e3c66b72ff