rpms
/
docbook-dtds
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Compare commits

merge into: rpms:c8s
Branches Tags
rpms:c8s
rpms:c9s
rpms:c9
rpms:c9-beta
rpms:c8-beta
rpms:c8
rpms:imports/c9/docbook-dtds-1.0-79.el9
rpms:imports/c9-beta/docbook-dtds-1.0-79.el9
rpms:imports/c8-beta/docbook-dtds-1.0-69.el8
rpms:imports/c8/docbook-dtds-1.0-69.el8
rpms:imports/c8s/docbook-dtds-1.0-69.el8
...
pull from: rpms:c9
Branches Tags
rpms:c9s
rpms:c9
rpms:c9-beta
rpms:c8-beta
rpms:c8
rpms:c8s
rpms:imports/c9/docbook-dtds-1.0-79.el9
rpms:imports/c9-beta/docbook-dtds-1.0-79.el9
rpms:imports/c8-beta/docbook-dtds-1.0-69.el8
rpms:imports/c8/docbook-dtds-1.0-69.el8
rpms:imports/c8s/docbook-dtds-1.0-69.el8

No commits in common. "c8s" and "c9" have entirely different histories.
c8s ... c9

6 changed files with 41 additions and 54 deletions
Show Stats Expand all files Collapse all files

9
SOURCES/docbook-dtd30-sgml-1.0.catalog.patch
View File

@ -1,14 +1,5 @@
--- docbook.cat Tue Dec 10 16:35:22 1996
+++ catalog Mon Jun 5 11:08:34 2000
@@ -27,7 +27,7 @@
-- ...................................................................... --
-- SGML declaration associated with DocBook ............................. --
-DTDDECL "-//Davenport//DTD DocBook V3.0//EN" "docbook.dcl"
+SGMLDECL "docbook.dcl"
-- ...................................................................... --
-- DocBook driver file .................................................. --
@@ -41,29 +41,6 @@
PUBLIC "-//Davenport//ELEMENTS DocBook Information Pool V3.0//EN" "dbpool.mod"
PUBLIC "-//Davenport//ELEMENTS DocBook Document Hierarchy V3.0//EN" "dbhier.mod"

9
SOURCES/docbook-dtd31-sgml-1.0.catalog.patch
View File

@ -1,14 +1,5 @@
--- docbook.cat Tue Feb 2 06:53:32 1999
+++ catalog Thu May 25 11:45:01 2000
@@ -19,7 +19,7 @@
-- ...................................................................... --
-- SGML declaration associated with DocBook ............................. --
-DTDDECL "-//OASIS//DTD DocBook V3.1//EN" "docbook.dcl"
+SGMLDECL "docbook.dcl"
-- ...................................................................... --
-- DocBook driver file .................................................. --
@@ -35,29 +35,6 @@
PUBLIC "-//OASIS//ENTITIES DocBook Additional General Entities V3.1//EN" "dbgenent.mod"
PUBLIC "-//OASIS//ENTITIES DocBook Notations V3.1//EN" "dbnotn.mod"

9
SOURCES/docbook-dtd40-sgml-1.0.catalog.patch
View File

@ -1,14 +1,5 @@
--- docbook.cat Mon May 22 22:38:05 2000
+++ catalog Mon May 22 22:12:36 2000
@@ -19,7 +19,7 @@
-- ...................................................................... --
-- SGML declaration associated with DocBook ............................. --
-DTDDECL "-//OASIS//DTD DocBook V4.0//EN" "docbook.dcl"
+SGMLDECL "docbook.dcl"
-- ...................................................................... --
-- DocBook driver file .................................................. --
@@ -35,29 +35,6 @@
PUBLIC "-//OASIS//ENTITIES DocBook Additional General Entities V4.0//EN" "dbgenent.mod"
PUBLIC "-//OASIS//ENTITIES DocBook Notations V4.0//EN" "dbnotn.mod"

9
SOURCES/docbook-dtd41-sgml-1.0.catalog.patch
View File

@ -1,14 +1,5 @@
--- docbook.cat Mon May 22 22:38:05 2000
+++ catalog Mon May 22 22:12:36 2000
@@ -19,7 +19,7 @@
-- ...................................................................... --
-- SGML declaration associated with DocBook ............................. --
-DTDDECL "-//OASIS//DTD DocBook V4.1//EN" "docbook.dcl"
+SGMLDECL "docbook.dcl"
-- ...................................................................... --
-- DocBook driver file .................................................. --
@@ -35,29 +35,6 @@
PUBLIC "-//OASIS//ENTITIES DocBook Additional General Entities V4.1//EN" "dbgenent.mod"
PUBLIC "-//OASIS//ENTITIES DocBook Notations V4.1//EN" "dbnotn.mod"

11
SOURCES/docbook-sgml-systemrewrite.patch
View File

@ -2,7 +2,7 @@ diff -urNp docbook-dtds-1.0-orig/3.0-sgml/docbook.cat docbook-dtds-1.0/3.0-sgml/
--- docbook-dtds-1.0-orig/3.0-sgml/docbook.cat 2009-02-05 16:44:15.000000000 +0100
+++ docbook-dtds-1.0/3.0-sgml/docbook.cat 2009-02-05 16:48:58.000000000 +0100
@@ -30,6 +30,12 @@
SGMLDECL "docbook.dcl"
DTDDECL "-//Davenport//DTD DocBook V3.0//EN" "docbook.dcl"
-- ...................................................................... --
+ -- SYSTEM rewrite of web URL .............. ............................. --
@ -18,12 +18,12 @@ diff -urNp docbook-dtds-1.0-orig/3.1-sgml/docbook.cat docbook-dtds-1.0/3.1-sgml/
--- docbook-dtds-1.0-orig/3.1-sgml/docbook.cat 2009-02-05 16:44:15.000000000 +0100
+++ docbook-dtds-1.0/3.1-sgml/docbook.cat 2009-02-05 16:56:51.000000000 +0100
@@ -22,6 +22,12 @@
SGMLDECL "docbook.dcl"
DTDDECL "-//OASIS//DTD DocBook V3.1//EN" "docbook.dcl"
-- ...................................................................... --
+ -- SYSTEM rewrite of web URL .............. ............................. --
+
+SYSTEM "http://www.oasis-open.org/docbook/sgml/3.0/docbook.dtd"
+SYSTEM "http://www.oasis-open.org/docbook/sgml/3.1/docbook.dtd"
+ "docbook.dtd"
+
+ -- ...................................................................... --
@ -34,7 +34,7 @@ diff -urNp docbook-dtds-1.0-orig/4.0-sgml/docbook.cat docbook-dtds-1.0/4.0-sgml/
--- docbook-dtds-1.0-orig/4.0-sgml/docbook.cat 2009-02-05 16:44:16.000000000 +0100
+++ docbook-dtds-1.0/4.0-sgml/docbook.cat 2009-02-05 16:49:06.000000000 +0100
@@ -22,6 +22,12 @@
SGMLDECL "docbook.dcl"
DTDDECL "-//OASIS//DTD DocBook V4.0//EN" "docbook.dcl"
-- ...................................................................... --
+ -- SYSTEM rewrite of web URL .............. ............................. --
@ -46,12 +46,11 @@ diff -urNp docbook-dtds-1.0-orig/4.0-sgml/docbook.cat docbook-dtds-1.0/4.0-sgml/
-- DocBook driver file .................................................. --
PUBLIC "-//OASIS//DTD DocBook V4.0//EN" "docbook.dtd"
Binární soubory docbook-dtds-1.0-orig/4.0-sgml/.docbook.cat.swp a docbook-dtds-1.0/4.0-sgml/.docbook.cat.swp jsou různé
diff -urNp docbook-dtds-1.0-orig/4.1-sgml/docbook.cat docbook-dtds-1.0/4.1-sgml/docbook.cat
--- docbook-dtds-1.0-orig/4.1-sgml/docbook.cat 2009-02-05 16:44:16.000000000 +0100
+++ docbook-dtds-1.0/4.1-sgml/docbook.cat 2009-02-05 16:49:27.000000000 +0100
@@ -22,6 +22,12 @@
SGMLDECL "docbook.dcl"
DTDDECL "-//OASIS//DTD DocBook V4.1//EN" "docbook.dcl"
-- ...................................................................... --
+ -- SYSTEM rewrite of web URL .............. ............................. --

48
SPECS/docbook-dtds.spec
View File

@ -5,8 +5,7 @@
Name: docbook-dtds
Version: 1.0
Release: 69%{?dist}
Group: Applications/Text
Release: 79%{?dist}
Summary: SGML and XML document type definitions for DocBook
@ -42,7 +41,6 @@ Requires(postun): sed
Requires: sgml-common
Requires: xml-common
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildArch: noarch
Source0: http://www.oasis-open.org/docbook/sgml/3.0/docbk30.zip
@ -233,8 +231,6 @@ fi
%install
rm -rf $RPM_BUILD_ROOT
# Symlinks
mkdir -p $RPM_BUILD_ROOT/etc/sgml
for fmt in sgml xml; do
@ -282,12 +278,8 @@ do
cp -pr --parents $i $RPM_BUILD_ROOT%{_pkgdocdir}
done
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr (0644,root,root,0755)
#in upstream tarballs there is a lot of files with 0755 permissions
#but they don't need to be, 0644 is enough for every file in tarball
%{_pkgdocdir}
@ -435,15 +427,15 @@ ent/iso-cyr2.ent
sgmldir=/usr/share/sgml/docbook/$fmt-dtd-$ver
## SGML catalog
# Update the centralized catalog corresponding to this version of the DTD
$catcmd --sgml --del /etc/sgml/catalog /etc/sgml/$fmt-docbook-$ver.cat
$catcmd --sgml --del /etc/sgml/catalog /etc/sgml/$fmt-docbook-$ver.cat >/dev/null
rm -f /etc/sgml/$fmt-docbook-$ver.cat
## XML catalog
if [ $fmt = xml -a -w $xmlcatalog ]; then
for f in $entities; do
case $ver in 4.[45]) f=${f/-/} ;; esac
$catcmd --del $sgmldir/$f $xmlcatalog
$catcmd --del $sgmldir/$f $xmlcatalog >/dev/null
done
$catcmd --del $sgmldir $xmlcatalog
$catcmd --del $sgmldir $xmlcatalog >/dev/null
fi
done
@ -478,6 +470,38 @@ do
done
%changelog
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1.0-79
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688
* Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 1.0-78
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-77
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-76
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Tue Feb 05 2020 Ondrej Vasik <ovasik@redhat.com> - 1.0-75
- do not print an error when uninstalling and no other catalogs
are present (#1357273)
* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-74
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-73
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-72
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-71
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Mon Jun 11 2018 Ondrej Vasik <ovasik@redhat.com> - 1.0.70
- drop replacement of DTDDECL statements for old sgml catalogs (#1489451)
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-69
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild