From 8ab6c4bd5da16c4fc173e09be976e738fc5160cb Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Tue, 31 Oct 2017 06:29:38 +0100 Subject: [PATCH 01/32] Use /usr/bin instead of /bin in Requires Signed-off-by: Igor Gnatenko --- sgml-common.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/sgml-common.spec b/sgml-common.spec index 4638d61..759abe9 100644 --- a/sgml-common.spec +++ b/sgml-common.spec @@ -2,7 +2,7 @@ Name: sgml-common Version: 0.6.3 -Release: 46%{?dist} +Release: 47%{?dist} Group: Applications/Text Summary: Common SGML catalog and DTD files @@ -31,7 +31,7 @@ Patch2: sgml-common-quotes.patch BuildRequires: libxml2 BuildRequires: automake -Requires: /bin/basename +Requires: %{_bindir}/basename %description The sgml-common package contains a collection of entities and DTDs @@ -167,6 +167,9 @@ fi %{_datadir}/xml/xml.xsd %changelog +* 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 From 9bdbf01453c8c098229c59ec9e17bc4ddd6e1bcd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 9 Feb 2018 16:35:15 +0000 Subject: [PATCH 02/32] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- sgml-common.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sgml-common.spec b/sgml-common.spec index 759abe9..091b4d4 100644 --- a/sgml-common.spec +++ b/sgml-common.spec @@ -2,7 +2,7 @@ Name: sgml-common Version: 0.6.3 -Release: 47%{?dist} +Release: 48%{?dist} Group: Applications/Text Summary: Common SGML catalog and DTD files @@ -167,6 +167,9 @@ fi %{_datadir}/xml/xml.xsd %changelog +* 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 From ccc55aec0da0fd4680f5bd3a9b4103bc6f3a842f Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Wed, 14 Feb 2018 00:37:08 +0100 Subject: [PATCH 03/32] Remove BuildRoot definition None of currently supported distributions need that. It was needed last for EL5 which is EOL now Signed-off-by: Igor Gnatenko --- sgml-common.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/sgml-common.spec b/sgml-common.spec index 091b4d4..6cf9c32 100644 --- a/sgml-common.spec +++ b/sgml-common.spec @@ -10,7 +10,6 @@ Summary: Common SGML catalog and DTD files License: GPL+ 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 From 72e6fbc98789dd01647a7c84550b8f5a263bb3a1 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Wed, 14 Feb 2018 08:49:42 +0100 Subject: [PATCH 04/32] Remove %clean section None of currently supported distributions need that. Last one was EL5 which is EOL for a while. Signed-off-by: Igor Gnatenko --- sgml-common.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/sgml-common.spec b/sgml-common.spec index 6cf9c32..1efe6f1 100644 --- a/sgml-common.spec +++ b/sgml-common.spec @@ -119,9 +119,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 From e330af06af82040af79dacb94f16c479cb85f928 Mon Sep 17 00:00:00 2001 From: Jan Pazdziora Date: Tue, 12 Jun 2018 16:15:04 +0200 Subject: [PATCH 05/32] Package and catalog xmldsig-core-schema.xsd, XMLSchema.dtd, and datatypes.dtd. --- sgml-common.spec | 35 +++++++++++++++++++++++++++++++++-- 1 file changed, 33 insertions(+), 2 deletions(-) diff --git a/sgml-common.spec b/sgml-common.spec index 1efe6f1..70e3150 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 From d5f50ec84f5845a60d226baa9159aed3f8f480c3 Mon Sep 17 00:00:00 2001 From: Jan Pazdziora Date: Tue, 12 Jun 2018 16:27:52 +0200 Subject: [PATCH 06/32] Silence rpmlint. Addressing $ rpmlint sgml-common.spec sgml-common.spec: E: specfile-error warning: bogus date in %changelog: Fri Jan 14 2010 Ondrej Vasik 0.6.3-32 0 packages and 1 specfiles checked; 1 errors, 0 warnings. --- sgml-common.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sgml-common.spec b/sgml-common.spec index 1efe6f1..beca03b 100644 --- a/sgml-common.spec +++ b/sgml-common.spec @@ -212,7 +212,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 From 6b330f0de0ce325faceac0302ad57d6bd8790867 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Va=C5=A1=C3=ADk?= Date: Wed, 13 Jun 2018 11:45:51 +0200 Subject: [PATCH 07/32] Upload new sources --- .gitignore | 3 +++ sources | 9 ++++++--- 2 files changed, 9 insertions(+), 3 deletions(-) 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/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 From bd1fe7b01dfc670dc82fa45bd6425947de8e77e4 Mon Sep 17 00:00:00 2001 From: Jason Tibbitts Date: Tue, 10 Jul 2018 01:20:47 -0500 Subject: [PATCH 08/32] Remove needless use of %defattr --- sgml-common.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/sgml-common.spec b/sgml-common.spec index d6852f6..fb0bef8 100644 --- a/sgml-common.spec +++ b/sgml-common.spec @@ -157,7 +157,6 @@ if [ $1 -gt 1 ] && [ -e %{_sysconfdir}/xml/catalog ]; then fi %files -%defattr (-,root,root, -) %doc __dist_doc/html/ AUTHORS NEWS ChangeLog COPYING README %dir %{_sysconfdir}/sgml %config(noreplace) %{_sysconfdir}/sgml/sgml.conf @@ -174,7 +173,6 @@ fi %{_mandir}/man8/install-catalog.8* %files -n xml-common -%defattr (-,root,root,-) %doc AUTHORS NEWS ChangeLog COPYING README %dir %{_sysconfdir}/xml %dir %{_sysconfdir}/sgml From 8f8457ad1d0dbf4a97068dd1c2b81d04e5be106f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 14 Jul 2018 06:01:45 +0000 Subject: [PATCH 09/32] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- sgml-common.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sgml-common.spec b/sgml-common.spec index fb0bef8..e2706b9 100644 --- a/sgml-common.spec +++ b/sgml-common.spec @@ -2,7 +2,7 @@ Name: sgml-common Version: 0.6.3 -Release: 49%{?dist} +Release: 50%{?dist} Group: Applications/Text Summary: Common SGML catalog and DTD files @@ -189,6 +189,9 @@ fi %{_datadir}/xml/datatypes.dtd %changelog +* 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 From 14e52bb4b2e80fcdfa5636db8d71c5a43c742837 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Va=C5=A1=C3=ADk?= Date: Fri, 5 Oct 2018 14:14:30 +0200 Subject: [PATCH 10/32] add basic manpages for sgml.conf(5) and sgmlwhich(1) (#1612272) --- sgml-common.spec | 13 ++++++++++++- sgml.conf.5 | 40 ++++++++++++++++++++++++++++++++++++++++ sgmlwhich.1 | 21 +++++++++++++++++++++ 3 files changed, 73 insertions(+), 1 deletion(-) create mode 100644 sgml.conf.5 create mode 100644 sgmlwhich.1 diff --git a/sgml-common.spec b/sgml-common.spec index e2706b9..0f5d83e 100644 --- a/sgml-common.spec +++ b/sgml-common.spec @@ -2,7 +2,7 @@ Name: sgml-common Version: 0.6.3 -Release: 50%{?dist} +Release: 51%{?dist} Group: Applications/Text Summary: Common SGML catalog and DTD files @@ -26,6 +26,8 @@ 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 @@ -128,6 +130,10 @@ install -p -m0644 %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} \ rm -rf $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 @@ -171,6 +177,8 @@ fi %{_bindir}/sgmlwhich %{_bindir}/install-catalog %{_mandir}/man8/install-catalog.8* +%{_mandir}/man1/sgmlwhich.1* +%{_mandir}/man5/sgml.conf.5* %files -n xml-common %doc AUTHORS NEWS ChangeLog COPYING README @@ -189,6 +197,9 @@ fi %{_datadir}/xml/datatypes.dtd %changelog +* 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 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 From 13b68f854ec290b6a442f40d929422800f185e11 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 28 Jan 2019 20:18:25 +0100 Subject: [PATCH 11/32] Remove obsolete Group tag References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag --- sgml-common.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/sgml-common.spec b/sgml-common.spec index 0f5d83e..38c6034 100644 --- a/sgml-common.spec +++ b/sgml-common.spec @@ -3,7 +3,6 @@ Name: sgml-common Version: 0.6.3 Release: 51%{?dist} -Group: Applications/Text Summary: Common SGML catalog and DTD files @@ -44,7 +43,6 @@ 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+ Requires(pre): %{_bindir}/xmlcatalog From 97f73336ad06d8c9719084e35941ae89abd9c671 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 2 Feb 2019 15:16:35 +0000 Subject: [PATCH 12/32] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- sgml-common.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sgml-common.spec b/sgml-common.spec index 38c6034..b6ec40b 100644 --- a/sgml-common.spec +++ b/sgml-common.spec @@ -2,7 +2,7 @@ Name: sgml-common Version: 0.6.3 -Release: 51%{?dist} +Release: 52%{?dist} Summary: Common SGML catalog and DTD files @@ -195,6 +195,9 @@ fi %{_datadir}/xml/datatypes.dtd %changelog +* 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) From b979f9f7ec1ff98626dfbef87b106f9f9cb15e8f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 26 Jul 2019 23:09:47 +0000 Subject: [PATCH 13/32] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- sgml-common.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sgml-common.spec b/sgml-common.spec index b6ec40b..c5718a1 100644 --- a/sgml-common.spec +++ b/sgml-common.spec @@ -2,7 +2,7 @@ Name: sgml-common Version: 0.6.3 -Release: 52%{?dist} +Release: 53%{?dist} Summary: Common SGML catalog and DTD files @@ -195,6 +195,9 @@ fi %{_datadir}/xml/datatypes.dtd %changelog +* 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 From e066068e195f0da7d59f31473914b9cc151d484d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 30 Jan 2020 23:19:30 +0000 Subject: [PATCH 14/32] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- sgml-common.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sgml-common.spec b/sgml-common.spec index c5718a1..34d35d8 100644 --- a/sgml-common.spec +++ b/sgml-common.spec @@ -2,7 +2,7 @@ Name: sgml-common Version: 0.6.3 -Release: 53%{?dist} +Release: 54%{?dist} Summary: Common SGML catalog and DTD files @@ -195,6 +195,9 @@ fi %{_datadir}/xml/datatypes.dtd %changelog +* 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 From 8fae6a9221aa6ba9c65f273a9285d39425403b23 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 10:36:52 +0000 Subject: [PATCH 15/32] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- sgml-common.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sgml-common.spec b/sgml-common.spec index 34d35d8..f2923d7 100644 --- a/sgml-common.spec +++ b/sgml-common.spec @@ -2,7 +2,7 @@ Name: sgml-common Version: 0.6.3 -Release: 54%{?dist} +Release: 55%{?dist} Summary: Common SGML catalog and DTD files @@ -195,6 +195,9 @@ fi %{_datadir}/xml/datatypes.dtd %changelog +* 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 From 11a2a625244cd2c88fbbf0cffcd2d7cb7c76e2a5 Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Thu, 24 Dec 2020 21:45:06 +0000 Subject: [PATCH 16/32] Minor spec file cleanup --- sgml-common.spec | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/sgml-common.spec b/sgml-common.spec index f2923d7..151ed67 100644 --- a/sgml-common.spec +++ b/sgml-common.spec @@ -13,9 +13,9 @@ BuildArch: noarch #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 @@ -69,8 +69,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 From bd100d5815cde4fd13aff9b051b54ba64158c70e Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Fri, 8 Jan 2021 21:25:22 +0000 Subject: [PATCH 17/32] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- sgml-common.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/sgml-common.spec b/sgml-common.spec index f2923d7..20d7791 100644 --- a/sgml-common.spec +++ b/sgml-common.spec @@ -32,6 +32,7 @@ Patch0: sgml-common-umask.patch Patch1: sgml-common-xmldir.patch Patch2: sgml-common-quotes.patch +BuildRequires: make BuildRequires: libxml2 BuildRequires: automake Requires: %{_bindir}/basename From 11c238dace4215c153640dc331e2cbd533b239ab Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 20:16:58 +0000 Subject: [PATCH 18/32] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- sgml-common.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sgml-common.spec b/sgml-common.spec index 49b8d94..b9ea865 100644 --- a/sgml-common.spec +++ b/sgml-common.spec @@ -2,7 +2,7 @@ Name: sgml-common Version: 0.6.3 -Release: 55%{?dist} +Release: 56%{?dist} Summary: Common SGML catalog and DTD files @@ -195,6 +195,9 @@ fi %{_datadir}/xml/datatypes.dtd %changelog +* 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 From f1f540ced86553f0b790068f8e4d00bfd8a021b5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 17:26:53 +0000 Subject: [PATCH 19/32] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- sgml-common.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sgml-common.spec b/sgml-common.spec index b9ea865..fbbbd64 100644 --- a/sgml-common.spec +++ b/sgml-common.spec @@ -2,7 +2,7 @@ Name: sgml-common Version: 0.6.3 -Release: 56%{?dist} +Release: 57%{?dist} Summary: Common SGML catalog and DTD files @@ -195,6 +195,9 @@ fi %{_datadir}/xml/datatypes.dtd %changelog +* 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 From 26e4ba90c7feabf5b6e2fa526035f50f982fc78a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 00:45:55 +0000 Subject: [PATCH 20/32] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- sgml-common.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sgml-common.spec b/sgml-common.spec index fbbbd64..73f5635 100644 --- a/sgml-common.spec +++ b/sgml-common.spec @@ -2,7 +2,7 @@ Name: sgml-common Version: 0.6.3 -Release: 57%{?dist} +Release: 58%{?dist} Summary: Common SGML catalog and DTD files @@ -195,6 +195,9 @@ fi %{_datadir}/xml/datatypes.dtd %changelog +* 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 From 81578231b0c34772172fb94c25675a14334bbedd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 08:28:07 +0000 Subject: [PATCH 21/32] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- sgml-common.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sgml-common.spec b/sgml-common.spec index 73f5635..a6cd0b8 100644 --- a/sgml-common.spec +++ b/sgml-common.spec @@ -2,7 +2,7 @@ Name: sgml-common Version: 0.6.3 -Release: 58%{?dist} +Release: 59%{?dist} Summary: Common SGML catalog and DTD files @@ -195,6 +195,9 @@ fi %{_datadir}/xml/datatypes.dtd %changelog +* 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 From e23d4c02fb016dc661eb2924ba499544e2549142 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 03:06:03 +0000 Subject: [PATCH 22/32] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- sgml-common.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sgml-common.spec b/sgml-common.spec index a6cd0b8..8527523 100644 --- a/sgml-common.spec +++ b/sgml-common.spec @@ -2,7 +2,7 @@ Name: sgml-common Version: 0.6.3 -Release: 59%{?dist} +Release: 60%{?dist} Summary: Common SGML catalog and DTD files @@ -195,6 +195,9 @@ fi %{_datadir}/xml/datatypes.dtd %changelog +* 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 From 33161d13717c491addebb08599bcfce9e38c7307 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 01:30:40 +0000 Subject: [PATCH 23/32] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- sgml-common.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sgml-common.spec b/sgml-common.spec index 8527523..ba3ce2c 100644 --- a/sgml-common.spec +++ b/sgml-common.spec @@ -2,7 +2,7 @@ Name: sgml-common Version: 0.6.3 -Release: 60%{?dist} +Release: 61%{?dist} Summary: Common SGML catalog and DTD files @@ -195,6 +195,9 @@ fi %{_datadir}/xml/datatypes.dtd %changelog +* 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 From ba83d2461e9939b7d2585f254dca527a693e8b79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Sloup?= Date: Mon, 23 Oct 2023 22:57:33 +0200 Subject: [PATCH 24/32] Update license tag to the SPDX format (GPL-1.0-or-later) --- sgml-common.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/sgml-common.spec b/sgml-common.spec index ba3ce2c..4e39385 100644 --- a/sgml-common.spec +++ b/sgml-common.spec @@ -2,11 +2,11 @@ Name: sgml-common Version: 0.6.3 -Release: 61%{?dist} +Release: 62%{?dist} Summary: Common SGML catalog and DTD files -License: GPL+ +License: GPL-1.0-or-later BuildArch: noarch @@ -195,6 +195,9 @@ fi %{_datadir}/xml/datatypes.dtd %changelog +* 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 From b4ac264a2961d629cd593a217f5c6c8321be7c27 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 02:46:47 +0000 Subject: [PATCH 25/32] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- sgml-common.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sgml-common.spec b/sgml-common.spec index 4e39385..971f9e5 100644 --- a/sgml-common.spec +++ b/sgml-common.spec @@ -2,7 +2,7 @@ Name: sgml-common Version: 0.6.3 -Release: 62%{?dist} +Release: 63%{?dist} Summary: Common SGML catalog and DTD files @@ -195,6 +195,9 @@ fi %{_datadir}/xml/datatypes.dtd %changelog +* 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 From 833a9bfc2bc7c98c5f9f0e17d81a5f6b54ca921e Mon Sep 17 00:00:00 2001 From: Software Management Team Date: Thu, 30 May 2024 12:46:49 +0200 Subject: [PATCH 26/32] Eliminate use of obsolete %patchN syntax (#2283636) --- sgml-common.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sgml-common.spec b/sgml-common.spec index 971f9e5..1480520 100644 --- a/sgml-common.spec +++ b/sgml-common.spec @@ -55,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` From fa14ef1978a3b6e762169dd42110794c6d63b5fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Mon, 17 Jun 2024 16:14:27 +0200 Subject: [PATCH 27/32] convert GPL+ license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- sgml-common.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/sgml-common.spec b/sgml-common.spec index 1480520..4f27f3a 100644 --- a/sgml-common.spec +++ b/sgml-common.spec @@ -2,7 +2,7 @@ Name: sgml-common Version: 0.6.3 -Release: 63%{?dist} +Release: 64%{?dist} Summary: Common SGML catalog and DTD files @@ -45,7 +45,7 @@ up-to-date Open Catalog file. %package -n xml-common Summary: Common XML catalog and DTD files -License: GPL+ +License: GPL-1.0-or-later Requires(pre): %{_bindir}/xmlcatalog %description -n xml-common @@ -195,6 +195,9 @@ fi %{_datadir}/xml/datatypes.dtd %changelog +* 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 From 7f1ff4eb3812c37a737b716e6db4dd26c957e334 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 05:21:46 +0000 Subject: [PATCH 28/32] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- sgml-common.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sgml-common.spec b/sgml-common.spec index 4f27f3a..aabe0fe 100644 --- a/sgml-common.spec +++ b/sgml-common.spec @@ -2,7 +2,7 @@ Name: sgml-common Version: 0.6.3 -Release: 64%{?dist} +Release: 65%{?dist} Summary: Common SGML catalog and DTD files @@ -195,6 +195,9 @@ fi %{_datadir}/xml/datatypes.dtd %changelog +* 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 From dfc26a866e090917ee4904202223de5d75dd6e87 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 10:31:05 +0000 Subject: [PATCH 29/32] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- sgml-common.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sgml-common.spec b/sgml-common.spec index aabe0fe..40cefba 100644 --- a/sgml-common.spec +++ b/sgml-common.spec @@ -2,7 +2,7 @@ Name: sgml-common Version: 0.6.3 -Release: 65%{?dist} +Release: 66%{?dist} Summary: Common SGML catalog and DTD files @@ -195,6 +195,9 @@ fi %{_datadir}/xml/datatypes.dtd %changelog +* 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 From ffc93d33952781d35f6d31e595e5777e26d95a86 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 18:12:19 +0000 Subject: [PATCH 30/32] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- sgml-common.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sgml-common.spec b/sgml-common.spec index 40cefba..fff5bfa 100644 --- a/sgml-common.spec +++ b/sgml-common.spec @@ -2,7 +2,7 @@ Name: sgml-common Version: 0.6.3 -Release: 66%{?dist} +Release: 67%{?dist} Summary: Common SGML catalog and DTD files @@ -195,6 +195,9 @@ fi %{_datadir}/xml/datatypes.dtd %changelog +* 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 From 7d819d376d8121e3de0d03001615500121bed352 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 17 Jan 2026 17:57:11 +0000 Subject: [PATCH 31/32] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- sgml-common.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sgml-common.spec b/sgml-common.spec index fff5bfa..25b0dcb 100644 --- a/sgml-common.spec +++ b/sgml-common.spec @@ -2,7 +2,7 @@ Name: sgml-common Version: 0.6.3 -Release: 67%{?dist} +Release: 68%{?dist} Summary: Common SGML catalog and DTD files @@ -195,6 +195,9 @@ fi %{_datadir}/xml/datatypes.dtd %changelog +* 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 From 67ee8776064a81b8fbf9e5992013a1979a3138ce Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 06:27:16 +0000 Subject: [PATCH 32/32] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild --- sgml-common.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sgml-common.spec b/sgml-common.spec index 25b0dcb..0e2b024 100644 --- a/sgml-common.spec +++ b/sgml-common.spec @@ -2,7 +2,7 @@ Name: sgml-common Version: 0.6.3 -Release: 68%{?dist} +Release: 69%{?dist} Summary: Common SGML catalog and DTD files @@ -195,6 +195,9 @@ fi %{_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