.gitignore

@@ -1,2 +1,2 @@
-docbook-5.0.zip
+SOURCES/docbook-5.0.zip
-/docbook-v5.1-os.zip
+/docbook-5.0.zip

docbook5-schemas.spec

@@ -1,6 +1,7 @@
 Name: docbook5-schemas
-Version: 5.1
+Version: 5.0
-Release: 13%{?dist}
+Release: 17%{?dist}
+Group: Applications/Text
 
 Summary: Norman Walsh's schemas (DTD, Relax NG, W3C schema) for Docbook 5.X
 
@@ -21,8 +22,7 @@ BuildRequires: libxml2 >= 2.4.8
 
 BuildArch: noarch
 
-Source0:  http://www.docbook.org/xml/5.0/docbook-5.0.zip
+Source0:  http://www.docbook.org/xml/%{version}/docbook-%{version}.zip
-Source1:  http://www.docbook.org/xml/5.1/docbook-v5.1-os.zip
 
 %description
 Docbook 5.X is a complete rewrite of Docbook in RELAX NG and not compatible
@@ -31,43 +31,8 @@ schema for Docbook 5.X. Syntax of those schemas is XML-compliant and is
 developed by the OASIS consortium.
 
 %prep
-%setup -c -T 
+%setup -q -n docbook-5.0
-mkdir 5.0
-mkdir 5.1
 
-#Unzip Docbook 5.0 specification
-cd 5.0
-unzip %{SOURCE0}
-mv docbook-5.0/* .
-
-# Remove perl script
-rm tools/db4-entities.pl
-rm tools/db4-upgrade.xsl
-rmdir tools/
-
-# Remove howto docs
-rm docs/howto.html
-rm docs/howto.pdf
-rm docs/howto.xml
-rm -rf docs/images/*
-
-# Prepare docs to right place
-mv docs/ ../
-mv README ../
-mv ChangeLog ../
-cd ..
-
-# Unzip Docbook 5.1 specification
-cd 5.1
-unzip %{SOURCE1}
-rm tools/db4-entities.pl
-rm tools/db4-upgrade.xsl
-rmdir tools/
-mv schemas/rng .
-mv schemas/sch .
-mv schemas/catalog.xml .
-mv schemas/docbook.nvdl .
-cd ..
 
 %build
 CATALOG=docbook-5.xml
@@ -84,6 +49,34 @@ do
   %{_bindir}/xmlcatalog --noout --add "system" \
      "http://docbook.org/xml/${v}/dtd/docbook.dtd" \
      "file://%{_datadir}/xml/docbook5/schema/dtd/${v}/docbook.dtd" ${CATALOG}
+  # RNG
+  %{_bindir}/xmlcatalog --noout --add "uri" \
+     "http://www.oasis-open.org/docbook/xml/${v}/rng/docbook.rng" \
+     "file://%{_datadir}/xml/docbook5/schema/rng/${v}/docbook.rng" ${CATALOG}
+  %{_bindir}/xmlcatalog --noout --add "uri" \
+     "http://docbook.org/xml/${v}/rng/docbook.rng" \
+     "file://%{_datadir}/xml/docbook5/schema/rng/${v}/docbook.rng" ${CATALOG}
+  # RNG+XInclude
+  %{_bindir}/xmlcatalog --noout --add "uri" \
+     "http://www.oasis-open.org/docbook/xml/${v}/rng/docbookxi.rng" \
+     "file://%{_datadir}/xml/docbook5/schema/rng/${v}/docbookxi.rng" ${CATALOG}
+  %{_bindir}/xmlcatalog --noout --add "uri" \
+     "http://docbook.org/xml/${v}/rng/docbookxi.rng" \
+     "file://%{_datadir}/xml/docbook5/schema/rng/${v}/docbookxi.rng" ${CATALOG}
+  # RNC
+  %{_bindir}/xmlcatalog --noout --add "uri" \
+     "http://www.oasis-open.org/docbook/xml/${v}/rnc/docbook.rnc" \
+     "file://%{_datadir}/xml/docbook5/schema/rng/${v}/docbook.rnc" ${CATALOG}
+  %{_bindir}/xmlcatalog --noout --add "uri" \
+     "http://docbook.org/xml/${v}/rng/docbook.rnc" \
+     "file://%{_datadir}/xml/docbook5/schema/rng/${v}/docbook.rnc" ${CATALOG}
+  # RNC+XInclude
+  %{_bindir}/xmlcatalog --noout --add "uri" \
+     "http://www.oasis-open.org/docbook/xml/${v}/rnc/docbookxi.rnc" \
+     "file://%{_datadir}/xml/docbook5/schema/rng/${v}/docbookxi.rnc" ${CATALOG}
+  %{_bindir}/xmlcatalog --noout --add "uri" \
+     "http://docbook.org/xml/${v}/rng/docbookxi.rnc" \
+     "file://%{_datadir}/xml/docbook5/schema/rng/${v}/docbookxi.rnc" ${CATALOG}
   # XSD
   %{_bindir}/xmlcatalog --noout --add "uri" \
      "http://www.oasis-open.org/docbook/xml/${v}/xsd/docbook.xsd" \
@@ -117,37 +110,6 @@ do
   %{_bindir}/xmlcatalog --noout --add "uri" \
      "http://docbook.org/xml/${v}/xsd/xml.xsd" \
      "file://%{_datadir}/xml/docbook5/schema/xsd/${v}/xml.xsd" ${CATALOG}
-done
-for v in 5.0 5.1
-do
-  # RNG
-  %{_bindir}/xmlcatalog --noout --add "uri" \
-     "http://www.oasis-open.org/docbook/xml/${v}/rng/docbook.rng" \
-     "file://%{_datadir}/xml/docbook5/schema/rng/${v}/docbook.rng" ${CATALOG}
-  %{_bindir}/xmlcatalog --noout --add "uri" \
-     "http://docbook.org/xml/${v}/rng/docbook.rng" \
-     "file://%{_datadir}/xml/docbook5/schema/rng/${v}/docbook.rng" ${CATALOG}
-  # RNG+XInclude
-  %{_bindir}/xmlcatalog --noout --add "uri" \
-     "http://www.oasis-open.org/docbook/xml/${v}/rng/docbookxi.rng" \
-     "file://%{_datadir}/xml/docbook5/schema/rng/${v}/docbookxi.rng" ${CATALOG}
-  %{_bindir}/xmlcatalog --noout --add "uri" \
-     "http://docbook.org/xml/${v}/rng/docbookxi.rng" \
-     "file://%{_datadir}/xml/docbook5/schema/rng/${v}/docbookxi.rng" ${CATALOG}
-  # RNC
-  %{_bindir}/xmlcatalog --noout --add "uri" \
-     "http://www.oasis-open.org/docbook/xml/${v}/rnc/docbook.rnc" \
-     "file://%{_datadir}/xml/docbook5/schema/rng/${v}/docbook.rnc" ${CATALOG}
-  %{_bindir}/xmlcatalog --noout --add "uri" \
-     "http://docbook.org/xml/${v}/rng/docbook.rnc" \
-     "file://%{_datadir}/xml/docbook5/schema/rng/${v}/docbook.rnc" ${CATALOG}
-  # RNC+XInclude
-  %{_bindir}/xmlcatalog --noout --add "uri" \
-     "http://www.oasis-open.org/docbook/xml/${v}/rnc/docbookxi.rnc" \
-     "file://%{_datadir}/xml/docbook5/schema/rng/${v}/docbookxi.rnc" ${CATALOG}
-  %{_bindir}/xmlcatalog --noout --add "uri" \
-     "http://docbook.org/xml/${v}/rng/docbookxi.rnc" \
-     "file://%{_datadir}/xml/docbook5/schema/rng/${v}/docbookxi.rnc" ${CATALOG}
   # Schematron
   %{_bindir}/xmlcatalog --noout --add "uri" \
      "http://www.oasis-open.org/docbook/xml/${v}/sch/docbook.sch" \
@@ -158,12 +120,20 @@ do
 done
 # ---------------------
 # Build XML catalog files for each Schema
-for v in 5.0 5.1
+for v in 5.0
 do
-  for s in rng sch; do
+  for s in dtd rng sch xsd; do
-   cat=${v}/${s}/catalog.xml
+   cat=${s}/catalog.xml
    %{_bindir}/xmlcatalog --noout --create ${cat}
    case $s in
+    dtd)
+     %{_bindir}/xmlcatalog --noout --add "public" \
+       "-//OASIS//DTD DocBook XML ${v}//EN" \
+       "docbook.dtd" ${cat}
+     %{_bindir}/xmlcatalog --noout --add "system" \
+       "http://www.oasis-open.org/docbook/xml/${v}/dtd/docbook.dtd" \
+       "docbook.dtd" ${cat}
+     ;;
     sch)
      %{_bindir}/xmlcatalog --noout --add "uri" \
        "http://docbook.org/xml/${v}/${s}/docbook.${s}" \
@@ -198,23 +168,6 @@ do
        "http://www.oasis-open.org/docbook/xml/${v}/${s}/docbookxi.rnc" \
        "docbookxi.rnc" ${cat}
      ;;
-   esac
-  done
-done
-for v in 5.0
-do
-  for s in dtd xsd; do
-   cat=${v}/${s}/catalog.xml
-   %{_bindir}/xmlcatalog --noout --create ${cat}
-   case $s in
-    dtd)
-     %{_bindir}/xmlcatalog --noout --add "public" \
-       "-//OASIS//DTD DocBook XML ${v}//EN" \
-       "docbook.dtd" ${cat}
-     %{_bindir}/xmlcatalog --noout --add "system" \
-       "http://www.oasis-open.org/docbook/xml/${v}/dtd/docbook.dtd" \
-       "docbook.dtd" ${cat}
-     ;;
     xsd)
      # http://www.oasis-open.org/docbook/xml/5.0/xsd/docbookxi.xsd
      # http://www.oasis-open.org/docbook/xml/5.0/xsd/xlink.xsd
@@ -250,31 +203,45 @@ done
 
 %install
 DOCBOOK5DIR=$RPM_BUILD_ROOT%{_datadir}/xml/docbook5
-for v in 5.0 5.1
+for v in 5.0
 do
+mkdir -p ${DOCBOOK5DIR}/schema/dtd/$v
 mkdir -p ${DOCBOOK5DIR}/schema/rng/$v
 mkdir -p ${DOCBOOK5DIR}/schema/sch/$v
-install -m644 $v/rng/* ${DOCBOOK5DIR}/schema/rng/$v
+mkdir -p ${DOCBOOK5DIR}/schema/xsd/$v
-install -m644 $v/sch/* ${DOCBOOK5DIR}/schema/sch/$v
+install -m644 dtd/* ${DOCBOOK5DIR}/schema/dtd/$v
+install -m644 rng/* ${DOCBOOK5DIR}/schema/rng/$v
+install -m644 sch/* ${DOCBOOK5DIR}/schema/sch/$v
+install -m644 xsd/* ${DOCBOOK5DIR}/schema/xsd/$v
 done
-mkdir -p ${DOCBOOK5DIR}/schema/dtd/5.0
+mkdir -p $RPM_BUILD_ROOT%{_bindir}
-mkdir -p ${DOCBOOK5DIR}/schema/xsd/5.0
+install -m755 tools/db4-entities.pl $RPM_BUILD_ROOT%{_bindir}
-install -m644 5.0/dtd/* ${DOCBOOK5DIR}/schema/dtd/5.0
+mkdir -p ${DOCBOOK5DIR}/stylesheet/upgrade
-install -m644 5.0/xsd/* ${DOCBOOK5DIR}/schema/xsd/5.0
+install -m644 tools/db4-upgrade.xsl ${DOCBOOK5DIR}/stylesheet/upgrade
 
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/xml
 install -m644 docbook-5.xml $RPM_BUILD_ROOT%{_sysconfdir}/xml/docbook-5.xml
 
+%clean
+
 %post
 ROOTCATALOG=%{_sysconfdir}/xml/catalog
 if [ -w $ROOTCATALOG ]
 then
-  for v in 5.0 5.1
+  for v in 5.0
   do
   %{_bindir}/xmlcatalog --noout --add "delegatePublic" \
     "-//OASIS//DTD DocBook XML ${v}//EN" \
     "file://%{_datadir}/xml/docbook5/schema/dtd/${v}/catalog.xml" \
     $ROOTCATALOG
+  %{_bindir}/xmlcatalog --noout --add "delegateSystem" \
+    "http://docbook.org/xml/${v}/dtd/" \
+    "file://%{_datadir}/xml/docbook5/schema/dtd/${v}/catalog.xml" \
+    $ROOTCATALOG
+  %{_bindir}/xmlcatalog --noout --add "delegateURI" \
+    "http://docbook.org/xml/${v}/dtd/" \
+    "file://%{_datadir}/xml/docbook5/schema/dtd/${v}/catalog.xml" \
+    $ROOTCATALOG
   %{_bindir}/xmlcatalog --noout --add "delegateURI" \
     "http://docbook.org/xml/${v}/rng/"  \
     "file://%{_datadir}/xml/docbook5/schema/rng/${v}/catalog.xml" \
@@ -283,19 +250,11 @@ then
     "http://docbook.org/xml/${v}/sch/"  \
     "file://%{_datadir}/xml/docbook5/schema/sch/${v}/catalog.xml" \
     $ROOTCATALOG
-   done
   %{_bindir}/xmlcatalog --noout --add "delegateURI" \
-    "http://docbook.org/xml/5.0/xsd/"  \
+    "http://docbook.org/xml/${v}/xsd/"  \
     "file://%{_datadir}/xml/docbook5/schema/xsd/${v}/catalog.xml" \
     $ROOTCATALOG
-  %{_bindir}/xmlcatalog --noout --add "delegateSystem" \
+   done
-    "http://docbook.org/xml/5.0/dtd/" \
-    "file://%{_datadir}/xml/docbook5/schema/dtd/${v}/catalog.xml" \
-    $ROOTCATALOG
-  %{_bindir}/xmlcatalog --noout --add "delegateURI" \
-    "http://docbook.org/xml/5.0/dtd/" \
-    "file://%{_datadir}/xml/docbook5/schema/dtd/${v}/catalog.xml" \
-    $ROOTCATALOG
 fi
 
 %postun
@@ -303,26 +262,26 @@ if [ "$1" = 0 ]; then
   ROOTCATALOG=%{_sysconfdir}/xml/catalog
   if [ -w $ROOTCATALOG ]
   then
-    for v in 5.0 5.1
+    for v in 5.0
     do
+       %{_bindir}/xmlcatalog --noout --del \
+       "file://%{_datadir}/xml/docbook5/schema/dtd/${v}/catalog.xml" \
+       $ROOTCATALOG
        %{_bindir}/xmlcatalog --noout --del \
        "file://%{_datadir}/xml/docbook5/schema/rng/${v}/catalog.xml" \
        $ROOTCATALOG
        %{_bindir}/xmlcatalog --noout --del \
        "file://%{_datadir}/xml/docbook5/schema/sch/${v}/catalog.xml" \
        $ROOTCATALOG
+       %{_bindir}/xmlcatalog --noout --del \
+       "file://%{_datadir}/xml/docbook5/schema/xsd/${v}/catalog.xml" \
+       $ROOTCATALOG
      done
-      %{_bindir}/xmlcatalog --noout --del \
-       "file://%{_datadir}/xml/docbook5/schema/dtd/5.0/catalog.xml" \
-       $ROOTCATALOG
-      %{_bindir}/xmlcatalog --noout --del \
-       "file://%{_datadir}/xml/docbook5/schema/xsd/5.0/catalog.xml" \
-       $ROOTCATALOG
-
   fi
 fi
 
 %files
+%defattr(-, root, root, -)
 %doc docs/* README ChangeLog
 %config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/xml/docbook-5.xml
 %dir %{_datadir}/xml/docbook5/
@@ -331,68 +290,17 @@ fi
 %dir %{_datadir}/xml/docbook5/schema/rng
 %dir %{_datadir}/xml/docbook5/schema/sch
 %dir %{_datadir}/xml/docbook5/schema/xsd
+%dir %{_datadir}/xml/docbook5/stylesheet
+%dir %{_datadir}/xml/docbook5/stylesheet/upgrade
 # Docbook5.0
-%{_datadir}/xml/docbook5/schema/dtd/5.0
+%{_datadir}/xml/docbook5/schema/dtd/%{version}
-%{_datadir}/xml/docbook5/schema/rng/5.0
-%{_datadir}/xml/docbook5/schema/sch/5.0
-%{_datadir}/xml/docbook5/schema/xsd/5.0
-# Docbook 5.1
 %{_datadir}/xml/docbook5/schema/rng/%{version}
 %{_datadir}/xml/docbook5/schema/sch/%{version}
+%{_datadir}/xml/docbook5/schema/xsd/%{version}
+%{_datadir}/xml/docbook5/stylesheet/upgrade/db4-upgrade.xsl
+%{_bindir}/db4-entities.pl
 
 %changelog
-* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 5.1-13
-- Bump release for October 2024 mass rebuild:
-  Resolves: RHEL-64018
-
-* Mon Aug 19 2024 Ales Nezbeda <anezbeda@redhat.com> - 5.1-12
-- Remove unlicensed perl script and howto docs
-
-* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 5.1-11
-- Bump release for June 2024 mass rebuild
-
-* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 5.1-10
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 5.1-9
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 5.1-8
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 5.1-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 5.1-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 5.1-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 5.1-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 5.1-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 5.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Wed Feb 05 2020 Ondrej Vasik <ovasik@redhat.com> - 5.1-1
-- add Docbook 5.1 (no dtd and xsd schemas provided)
-
-* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 5.0-21
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 5.0-20
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 5.0-19
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 5.0-18
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
 * Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 5.0-17
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
 

gating.yaml

@@ -0,0 +1,6 @@
+--- !Policy
+product_versions:
+  - rhel-8
+decision_context: osci_compose_gate
+rules:
+  - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1.functional}

sources

@@ -1,2 +1 @@
 SHA512 (docbook-5.0.zip) = a245796881762cf001f0d32b7c87315cba0454750d6b4178e4546357e320e2ab602d84c08a7e44329f406a8d32340605671c351e87c0b9097582ebf6d10fede4
-SHA512 (docbook-v5.1-os.zip) = b55f8eda4dcff9d4ebd31876bc33c244ef3884afc167da1425531266963ba64000fbe619ec7c049ae65c0aab864a5a7228caef08b53f546e2686296d97190873