[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. dbfde53218e258c5b0e660caa12458249e510631
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 3.x development tree".
The branch, master has been updated via dbfde53218e258c5b0e660caa12458249e510631 (commit) via 2c4dff1b71465acafb67ced75361e28830148194 (commit) via 37fa87c837a833aac25b17a4fd43d816916a1e0d (commit) via 28e9d98b4e303b88dcc59884248200b70e531f36 (commit) via fe6e37198dbc4d88020a39850acfefe09a91904f (commit) via 207338f48fa1ad2f2072ab0c880624327f876ea0 (commit) via 7fc5b5117e4b055ba5b86636ce254b53073edfaa (commit) via c26b32927ec4bb31c482dfc6b7f505e8d0c647b6 (commit) via debccf241c0d250b0837bd9257bbbe6a0fa61378 (commit) via a0b4e0f5ebb220bdd8e0f45baa6bc46028c7670b (commit) via 9b61777289fb1571984e7315982964838d5b1d31 (commit) via 72fd38a0e2d4c5a40ae792d5f0dd24c8d20c63a8 (commit) via 691049f081372558fc7166ff348dcfefd85ba218 (commit) via ef51663373716fcfc9bc7986c3ddb95e635456d3 (commit) via f4205ac4851a16866e9f63734d6329101338101c (commit) via 31e07973a8438fd44e09936936ed6b8f9c6fa403 (commit) via 29ce5abfce7145528160bbd7f4d594b2273a7f99 (commit) via 469e9856d4bb5dfaee0f0b8fd34913552f280cfd (commit) via 7df74be47b396c515f100042596032606634a519 (commit) via e409c63331db9c3e2838669ea123f377cad5230e (commit) via ed1ec7470883d29081d8fa2f142a425f4624198d (commit) via c9eeae3dcb6929fa8c7bc5c530509d711f4b64ea (commit) via 2481650a6b232719e50bd256548f0b4014978a3c (commit) via 075b7114caf085a3cd62844c2ddff43928cc2981 (commit) via b0e47e81a5e4c6b58276cf966fe34c4db8eeff7e (commit) via 3fc309162c423d538e4d1dfcbdbdbde9fd6d806c (commit) via 3dc7a8e6f4492d81b5a521d8987f5c710cc9a00a (commit) via 332c8f43086d168dc070137f47154eab213d0ed2 (commit) via e16624527075a88e0403e7ddc537f18b1070f6f1 (commit) via b1549e3eaa28f866f563794b7221ed10182ab792 (commit) via 5d8bf6c92e96a0f460e8082a963769397e6f326f (commit) via 0bd8efc6b4750bd5275f46a4de237eef2bcd71da (commit) via 8b4a9cdbe4042bb079ca29820013fe8d1f504007 (commit) via f7ab12aea6124e928fcf4a8ae14201fd941b3e45 (commit) via 3e8355640c22a22ed4445ea938cb6b3ec5e373ab (commit) from bcf38aec7a90408d4cdc8602540afdafb8483170 (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit dbfde53218e258c5b0e660caa12458249e510631 Merge: 2c4dff1 bcf38ae Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Oct 19 19:52:46 2011 +0200
Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x
commit 2c4dff1b71465acafb67ced75361e28830148194 Merge: 7fc5b51 37fa87c Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Oct 19 19:29:32 2011 +0200
Merge remote-tracking branch 'stevee/docbook-manpages'
commit 37fa87c837a833aac25b17a4fd43d816916a1e0d Author: Stefan Schantl stefan.schantl@ipfire.org Date: Tue Oct 18 20:14:02 2011 +0200
tunctl: Build manpages with docbook.
commit 28e9d98b4e303b88dcc59884248200b70e531f36 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Tue Oct 18 19:52:06 2011 +0200
iputils: Build manpages with docbook.
commit fe6e37198dbc4d88020a39850acfefe09a91904f Author: Stefan Schantl stefan.schantl@ipfire.org Date: Tue Oct 18 18:59:14 2011 +0200
systemd: Build manpages with docbook.
commit 207338f48fa1ad2f2072ab0c880624327f876ea0 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Tue Oct 18 18:56:49 2011 +0200
dracut: Build manpages with docbook.
commit 7fc5b5117e4b055ba5b86636ce254b53073edfaa Author: Stefan Schantl stefan.schantl@ipfire.org Date: Mon Oct 17 21:50:29 2011 +0200
docbook-xsl: Add libxslt as runtime dep.
Referencece #74
commit c26b32927ec4bb31c482dfc6b7f505e8d0c647b6 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Mon Oct 17 21:07:36 2011 +0200
openjade: Add dependencies, improve catalog actions.
Reference #74
commit debccf241c0d250b0837bd9257bbbe6a0fa61378 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Mon Oct 17 21:00:38 2011 +0200
opensp: Add support for doc build.
Reference #74.
commit a0b4e0f5ebb220bdd8e0f45baa6bc46028c7670b Author: Stefan Schantl stefan.schantl@ipfire.org Date: Mon Oct 17 20:59:44 2011 +0200
xmlto: New package.
Reference #74.
commit 9b61777289fb1571984e7315982964838d5b1d31 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Mon Oct 17 20:59:06 2011 +0200
docbook-xsl: New package.
Reference #74.
commit 72fd38a0e2d4c5a40ae792d5f0dd24c8d20c63a8 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Mon Oct 17 20:53:42 2011 +0200
docbook-dtds: Remove dep to openjade, fix xml catalog.
Reference #74
commit 691049f081372558fc7166ff348dcfefd85ba218 Merge: ef51663 0d1a903 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Mon Oct 17 19:48:11 2011 +0200
Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x into docbook
commit ef51663373716fcfc9bc7986c3ddb95e635456d3 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sun Oct 16 19:18:22 2011 +0200
perl-SGMLSpm: New package.
This perl module is required by docbook-utils to convert docbook files to other formats.
Reference #74
commit f4205ac4851a16866e9f63734d6329101338101c Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sun Oct 16 19:17:44 2011 +0200
docbook-utils: Add more dependencies.
Reference #74
commit 31e07973a8438fd44e09936936ed6b8f9c6fa403 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sun Oct 16 19:17:05 2011 +0200
openjade: Fix scriptlet.
Reference #74
commit 29ce5abfce7145528160bbd7f4d594b2273a7f99 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sun Oct 16 19:15:44 2011 +0200
docbook-dtds: Rework package.
* Change package arch to noarch. * Remove a lot of unnedet stuff. * Fix scriptlet and dependencies.
Reference #74
commit 469e9856d4bb5dfaee0f0b8fd34913552f280cfd Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sun Oct 16 19:13:48 2011 +0200
docbook-dsssl: Rework package.
* Change arch to noarch. * Remove unneedet addition file. * Add download URL. * Remove unneedet catalog-install in install stage. * Fix scriptlet.
Reference #74
commit 7df74be47b396c515f100042596032606634a519 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sun Oct 16 19:12:14 2011 +0200
opensp: Enable http output.
References #74
commit e409c63331db9c3e2838669ea123f377cad5230e Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sun Oct 16 19:11:09 2011 +0200
sgml-common: Change pakage arch to noarch.
References #74
commit ed1ec7470883d29081d8fa2f142a425f4624198d Author: Stefan Schantl stefan.schantl@ipfire.org Date: Fri Oct 7 20:48:33 2011 +0200
docbook-dtds: Convert package to new layout.
commit c9eeae3dcb6929fa8c7bc5c530509d711f4b64ea Author: Stefan Schantl stefan.schantl@ipfire.org Date: Fri Oct 7 20:47:09 2011 +0200
Revert "docbook-dtds: Convert package to new layout."
This reverts commit 0bd8efc6b4750bd5275f46a4de237eef2bcd71da.
commit 2481650a6b232719e50bd256548f0b4014978a3c Author: Stefan Schantl stefan.schantl@ipfire.org Date: Fri Oct 7 20:41:48 2011 +0200
docbook-utils: Convert package to new layout.
commit 075b7114caf085a3cd62844c2ddff43928cc2981 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Fri Oct 7 20:41:04 2011 +0200
docbook-dsssl: Convert package to new layout.
commit b0e47e81a5e4c6b58276cf966fe34c4db8eeff7e Author: Stefan Schantl stefan.schantl@ipfire.org Date: Fri Oct 7 20:40:22 2011 +0200
openjade: Convert package to new layout.
commit 3fc309162c423d538e4d1dfcbdbdbde9fd6d806c Author: Stefan Schantl stefan.schantl@ipfire.org Date: Fri Oct 7 20:39:11 2011 +0200
opensp: Convert package to new layout.
commit 3dc7a8e6f4492d81b5a521d8987f5c710cc9a00a Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Jan 2 15:16:57 2011 +0100
docbook-utils: Add dependency to docbook-dsssl.
commit 332c8f43086d168dc070137f47154eab213d0ed2 Author: Schantl Stefan Stevee@ipfire.org Date: Fri Oct 1 21:20:58 2010 +0200
docbook-utils: New package.
Refers to #74
commit e16624527075a88e0403e7ddc537f18b1070f6f1 Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Jan 2 15:16:45 2011 +0100
docbook-dssl: New package.
commit b1549e3eaa28f866f563794b7221ed10182ab792 Author: Schantl Stefan Stevee@ipfire.org Date: Fri Oct 1 21:19:04 2010 +0200
openjade: New package.
Refers to #74
commit 5d8bf6c92e96a0f460e8082a963769397e6f326f Author: Schantl Stefan Stevee@ipfire.org Date: Fri Oct 1 21:16:03 2010 +0200
opensp: New package.
Refers to #74
commit 0bd8efc6b4750bd5275f46a4de237eef2bcd71da Author: Stefan Schantl stefan.schantl@ipfire.org Date: Fri Oct 7 18:09:00 2011 +0200
docbook-dtds: Convert package to new layout.
commit 8b4a9cdbe4042bb079ca29820013fe8d1f504007 Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Oct 1 11:33:02 2010 +0200
docbook-dtds: New package.
commit f7ab12aea6124e928fcf4a8ae14201fd941b3e45 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Mon Oct 3 20:24:11 2011 +0200
sgml-common: Convert package to new layout.
commit 3e8355640c22a22ed4445ea938cb6b3ec5e373ab Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Oct 1 11:32:47 2010 +0200
sgml-common: New package.
-----------------------------------------------------------------------
Summary of changes: docbook-dsssl/docbook-dsssl.nm | 69 ++++ docbook-dtds/docbook-dtds.nm | 260 +++++++++++++ docbook-dtds/patches/docbook-4.2-euro.patch | 22 ++ .../patches/docbook-dtd30-sgml-1.0.catalog.patch | 41 ++ .../patches/docbook-dtd31-sgml-1.0.catalog.patch | 41 ++ .../patches/docbook-dtd40-sgml-1.0.catalog.patch | 41 ++ .../patches/docbook-dtd41-sgml-1.0.catalog.patch | 41 ++ docbook-dtds/patches/docbook-dtd412-entities.patch | 48 +++ .../patches/docbook-dtd42-sgml-1.0.catalog.patch | 68 ++++ docbook-dtds/patches/docbook-dtds-ents.patch | 53 +++ .../patches/docbook-sgml-systemrewrite.patch | 210 +++++++++++ docbook-utils/docbook-utils.nm | 53 +++ .../patches/docbook-utils-2ndspaces.patch | 260 +++++++++++++ .../patches/docbook-utils-grepnocolors.patch | 15 + docbook-utils/patches/docbook-utils-newgrep.patch | 24 ++ .../patches/docbook-utils-nofinalecho.patch | 12 + .../patches/docbook-utils-papersize.patch | 12 + .../patches/docbook-utils-rtfmanpage.patch | 15 + .../patches/docbook-utils-sgmlinclude.patch | 24 ++ docbook-utils/patches/docbook-utils-spaces.patch | 32 ++ .../patches/docbook-utils-w3mtxtconvert.patch | 12 + docbook-xsl/Makefile | 52 +++ docbook-xsl/docbook-xsl.nm | 85 +++++ .../patches/docbook-xsl-list-item-body.patch | 110 ++++++ docbook-xsl/patches/docbook-xsl-mandir.patch | 19 + docbook-xsl/patches/docbook-xsl-marginleft.patch | 100 +++++ docbook-xsl/patches/docbook-xsl-newmethods.patch | 394 ++++++++++++++++++++ .../docbook-xsl-non-constant-expressions.patch | 25 ++ docbook-xsl/patches/docbook-xsl-pagesetup.patch | 227 +++++++++++ dracut/dracut.nm | 11 +- iputils/iputils.nm | 26 +- openjade/openjade.nm | 96 +++++ openjade/patches/openjade-1.3.1-manpage.patch | 5 + openjade/patches/openjade-1.3.1-nsl.patch | 21 + openjade/patches/openjade-1.3.2-gcc46.patch | 82 ++++ openjade/patches/openjade-deplibs.patch | 40 ++ openjade/patches/openjade-nola.patch | 12 + opensp/opensp.nm | 63 +++ opensp/patches/opensp-multilib.patch | 91 +++++ opensp/patches/opensp-nodeids.patch | 128 +++++++ opensp/patches/opensp-sigsegv.patch | 20 + perl-SGMLSpm/perl-SGMLSpm.nm | 44 +++ sgml-common/MLCATALOG | 9 + sgml-common/html.dcl | 88 +++++ sgml-common/html.soc | 31 ++ sgml-common/patches/sgml-common-quotes.patch | 94 +++++ sgml-common/patches/sgml-common-umask.patch | 12 + sgml-common/patches/sgml-common-xmldir.patch | 19 + sgml-common/sgml-common.nm | 112 ++++++ sgml-common/xml.dcl | 179 +++++++++ sgml-common/xml.soc | 1 + systemd/patches/systemd-36-no_manpages.patch | 90 ----- systemd/systemd.nm | 4 +- tunctl/tunctl.nm | 14 +- xmlto/xmlto.nm | 46 +++ 55 files changed, 3591 insertions(+), 112 deletions(-) create mode 100644 docbook-dsssl/docbook-dsssl.nm create mode 100644 docbook-dtds/docbook-dtds.nm create mode 100644 docbook-dtds/patches/docbook-4.2-euro.patch create mode 100644 docbook-dtds/patches/docbook-dtd30-sgml-1.0.catalog.patch create mode 100644 docbook-dtds/patches/docbook-dtd31-sgml-1.0.catalog.patch create mode 100644 docbook-dtds/patches/docbook-dtd40-sgml-1.0.catalog.patch create mode 100644 docbook-dtds/patches/docbook-dtd41-sgml-1.0.catalog.patch create mode 100644 docbook-dtds/patches/docbook-dtd412-entities.patch create mode 100644 docbook-dtds/patches/docbook-dtd42-sgml-1.0.catalog.patch create mode 100644 docbook-dtds/patches/docbook-dtds-ents.patch create mode 100644 docbook-dtds/patches/docbook-sgml-systemrewrite.patch create mode 100644 docbook-utils/docbook-utils.nm create mode 100644 docbook-utils/patches/docbook-utils-2ndspaces.patch create mode 100644 docbook-utils/patches/docbook-utils-grepnocolors.patch create mode 100644 docbook-utils/patches/docbook-utils-newgrep.patch create mode 100644 docbook-utils/patches/docbook-utils-nofinalecho.patch create mode 100644 docbook-utils/patches/docbook-utils-papersize.patch create mode 100644 docbook-utils/patches/docbook-utils-rtfmanpage.patch create mode 100644 docbook-utils/patches/docbook-utils-sgmlinclude.patch create mode 100644 docbook-utils/patches/docbook-utils-spaces.patch create mode 100644 docbook-utils/patches/docbook-utils-w3mtxtconvert.patch create mode 100644 docbook-xsl/Makefile create mode 100644 docbook-xsl/docbook-xsl.nm create mode 100644 docbook-xsl/patches/docbook-xsl-list-item-body.patch create mode 100644 docbook-xsl/patches/docbook-xsl-mandir.patch create mode 100644 docbook-xsl/patches/docbook-xsl-marginleft.patch create mode 100644 docbook-xsl/patches/docbook-xsl-newmethods.patch create mode 100644 docbook-xsl/patches/docbook-xsl-non-constant-expressions.patch create mode 100644 docbook-xsl/patches/docbook-xsl-pagesetup.patch create mode 100644 openjade/openjade.nm create mode 100644 openjade/patches/openjade-1.3.1-manpage.patch create mode 100644 openjade/patches/openjade-1.3.1-nsl.patch create mode 100644 openjade/patches/openjade-1.3.2-gcc46.patch create mode 100644 openjade/patches/openjade-deplibs.patch create mode 100644 openjade/patches/openjade-nola.patch create mode 100644 opensp/opensp.nm create mode 100644 opensp/patches/opensp-multilib.patch create mode 100644 opensp/patches/opensp-nodeids.patch create mode 100644 opensp/patches/opensp-sigsegv.patch create mode 100644 perl-SGMLSpm/perl-SGMLSpm.nm create mode 100644 sgml-common/MLCATALOG create mode 100644 sgml-common/html.dcl create mode 100644 sgml-common/html.soc create mode 100644 sgml-common/patches/sgml-common-quotes.patch create mode 100644 sgml-common/patches/sgml-common-umask.patch create mode 100644 sgml-common/patches/sgml-common-xmldir.patch create mode 100644 sgml-common/sgml-common.nm create mode 100644 sgml-common/xml.dcl create mode 100644 sgml-common/xml.soc delete mode 100644 systemd/patches/systemd-36-no_manpages.patch create mode 100644 xmlto/xmlto.nm
Difference in files: diff --git a/docbook-dsssl/docbook-dsssl.nm b/docbook-dsssl/docbook-dsssl.nm new file mode 100644 index 0000000..db78d0d --- /dev/null +++ b/docbook-dsssl/docbook-dsssl.nm @@ -0,0 +1,69 @@ +############################################################################### +# IPFire.org - An Open Source Firewall Solution # +# Copyright (C) - IPFire Development Team info@ipfire.org # +############################################################################### + +name = docbook-dsssl +version = 1.79 +release = 2 +arch = noarch + +groups = Applications/Text +url = http://docbook.sourceforge.net/ +license = GPLv2+ +summary = The DocBook DSSSL Stylesheets package contains DSSSL stylesheets. + +description + The DocBook DSSSL Stylesheets package contains DSSSL stylesheets. These + are used by OpenJade or other tools to transform SGML and XML DocBook files. +end + +source_dl = http://prdownloads.sourceforge.net/docbook/ + +build + requires + sgml-common + end + + build = # empty + + install + mkdir -pv %{BUILDROOT}/usr/bin %{BUILDROOT}/usr/share/man/man1 + install -v -m755 bin/collateindex.pl %{BUILDROOT}/usr/bin + install -v -m644 bin/collateindex.pl.1 %{BUILDROOT}/usr/share/man/man1 + + install -v -d -m755 %{BUILDROOT}/usr/share/sgml/docbook/dsssl-stylesheets-%{version} + cp -v -R * %{BUILDROOT}/usr/share/sgml/docbook/dsssl-stylesheets-%{version} + + # Remove empty conflicting file. + rm -rvf %{BUILDROOT}/etc/sgml/sgml-docbook.cat + end +end + +packages + package %{name} + requires + docbook-dtds + sgml-common + end + + prerequires +=\ + docbook-dtds \ + libxml2 \ + sgml-common + + script postin + # Install catalog files. + for centralized in /etc/sgml/*-docbook-*.cat; do + /usr/bin/xmlcatalog --sgml --noout --add ${centralized} /usr/share/sgml/docbook/dsssl-stylesheets-%{version}/catalog > /dev/null 2>/dev/null + done + end + + script preun + # Uninstall catalog files. + for centralized in /etc/sgml/*-docbook-*.cat; do + /usr/bin/xmlcatalog --remove ${centralized} /usr/share/sgml/docbook/dsssl-stylesheets-%{version}/catalog > /dev/null 2>/dev/null + done + end + end +end diff --git a/docbook-dtds/docbook-dtds.nm b/docbook-dtds/docbook-dtds.nm new file mode 100644 index 0000000..0adc696 --- /dev/null +++ b/docbook-dtds/docbook-dtds.nm @@ -0,0 +1,260 @@ +############################################################################### +# IPFire.org - An Open Source Firewall Solution # +# Copyright (C) - IPFire Development Team info@ipfire.org # +############################################################################### + +name = docbook-dtds +version = 1.0 +release = 3 +arch = noarch + +groups = Applications/Text +url = http://www.oasis-open.org/docbook/ +license = Copyright only +summary = SGML and XML document type definitions for DocBook. + +description + The DocBook Document Type Definition (DTD) describes the syntax of + technical documentation texts (articles, books and manual pages). + This syntax is XML-compliant and is developed by the OASIS consortium. + This package contains SGML and XML versions of the DocBook DTD. +end + +sources = \ + docbk30.zip \ + docbk31.zip \ + docbk40.zip \ + docbk41.zip \ + docbkx412.zip \ + docbook-4.2.zip \ + docbook-xml-4.2.zip \ + docbook-4.3.zip \ + docbook-xml-4.3.zip \ + docbook-4.4.zip \ + docbook-xml-4.4.zip \ + docbook-4.5.zip \ + docbook-xml-4.5.zip + +# Update directories at the scriptlets if there will be any changes. +directories = \ + 3.0-sgml \ + 3.1-sgml \ + 4.0-sgml \ + 4.1-sgml \ + 4.1.2-xml \ + 4.2-sgml \ + 4.2-xml \ + 4.3-sgml \ + 4.3-xml \ + 4.4-sgml \ + 4.4-xml \ + 4.5-sgml \ + 4.5-xml + +build + requires + dos2unix + unzip>=6.0-3 + end + + prepare + # Define a bash function to extract the files + function macro_extract() + { + mkdir -pv %{DIR_APP}/$2 + cd %{DIR_APP}/$2 && unzip %{DIR_DL}/$1 + } + + # Extract files + macro_extract docbk30.zip 3.0-sgml + macro_extract docbk31.zip 3.1-sgml + macro_extract docbk40.zip 4.0-sgml + macro_extract docbk41.zip 4.1-sgml + macro_extract docbkx412.zip 4.1.2-xml + macro_extract docbook-4.2.zip 4.2-sgml + macro_extract docbook-xml-4.2.zip 4.2-xml + macro_extract docbook-4.3.zip 4.3-sgml + macro_extract docbook-xml-4.3.zip 4.3-xml + macro_extract docbook-4.4.zip 4.4-sgml + macro_extract docbook-xml-4.4.zip 4.4-xml + macro_extract docbook-4.5.zip 4.5-sgml + macro_extract docbook-xml-4.5.zip 4.5-xml + + # Convert all catalog files to unix format + cd %{DIR_APP} && dos2unix */docbook.cat + + %{MACRO_PATCHES} + + sed -e's,(NAMELEN\s+)44(\s*)?,\1256,' -i.namelen */docbook.dcl + sed -i 's/\r//' */*.txt + chown -R root:root . + chmod -R a+rX,g-w,o-w . + end + + build = # Nothing to do + + install + # Create Symlinks. + mkdir -pv %{BUILDROOT}/etc/sgml + for fmt in sgml xml; do + ln -svf $fmt-docbook-4.5.cat %{BUILDROOT}/etc/sgml/$fmt-docbook.cat + done + + for dir in %{directories}; do + fmt=${dir#*-}; ver=${dir%%-*} + cd %{DIR_APP}/$dir + DESTDIR=%{BUILDROOT}/usr/share/sgml/docbook/$fmt-dtd-$ver + mkdir -pv $DESTDIR + case $fmt in + sgml) mkdir -pv $DESTDIR; install -v *.dcl $DESTDIR ;; + xml) mkdir -pv $DESTDIR/ent; install -v ent/* $DESTDIR/ent ;; + esac + install -v *.dtd *.mod $DESTDIR + install -v docbook.cat $DESTDIR/catalog + touch %{BUILDROOT}/etc/sgml/${dir#*-}-docbook-$ver.cat + done + end +end + +packages + package %{name} + + prerequires += \ + libxml2 \ + sgml-common + + script postin + # Install catalog files. + for dir in %{directories}; do + fmt=${dir#*-} + ver=${dir%%-*} + /usr/bin/xmlcatalog --sgml --noout --add /etc/sgml/${fmt}-docbook-${ver}.cat \ + /usr/share/sgml/docbook/${fmt}-dtd-${ver}/catalog > /dev/null 2>/dev/null + /usr/bin/xmlcatalog --sgml --noout --add /etc/sgml/${fmt}-docbook-${ver}.cat \ + /usr/share/sgml/sgml-iso-entities-8879.1986/catalog > /dev/null 2>/dev/null + done + + # Create XML catalog. + for dir in %{directories}; do + fmt=${dir#*-} + ver=${dir%%-*} + + if [ $fmt = xml -a -w /usr/share/sgml/docbook/xmlcatalog ]; then + while read f desc; do + case $ver in 4.[45]) f={$f/-/} ;; esac + /usr/bin/xmlcatalog --noout --add public "$desc" /usr/share/sgml/docbook/${fmt}-dtd-${ver}/${f} \ + /etc/sgml/docbook/xmlcatalog /dev/null 2>/dev/null + done <<ENDENT + ent/iso-pub.ent ISO 8879:1986//ENTITIES Publishing//EN + ent/iso-grk1.ent ISO 8879:1986//ENTITIES Greek Letters//EN + dbpoolx.mod -//OASIS//ELEMENTS DocBook XML Information Pool V${ver}//EN + ent/iso-box.ent ISO 8879:1986//ENTITIES Box and Line Drawing//EN + docbookx.dtd -//OASIS//DTD DocBook XML V${ver}//EN + ent/iso-grk3.ent ISO 8879:1986//ENTITIES Greek Symbols//EN + ent/iso-amsn.ent ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN + ent/iso-num.ent ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN + dbcentx.mod -//OASIS//ENTITIES DocBook XML Character Entities V${ver}//EN + ent/iso-grk4.ent ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN + dbnotnx.mod -//OASIS//ENTITIES DocBook XML Notations V${ver}//EN + ent/iso-dia.ent ISO 8879:1986//ENTITIES Diacritical Marks//EN + ent/iso-grk2.ent ISO 8879:1986//ENTITIES Monotoniko Greek//EN + dbgenent.mod -//OASIS//ENTITIES DocBook XML Additional General Entities V${ver}//EN + dbhierx.mod -//OASIS//ELEMENTS DocBook XML Document Hierarchy V${vers}//EN + ent/iso-amsa.ent ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN + ent/iso-amso.ent ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN + ent/iso-cyr1.ent ISO 8879:1986//ENTITIES Russian Cyrillic//EN + ent/iso-tech.ent ISO 8879:1986//ENTITIES General Technical//EN + ent/iso-amsc.ent ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN + soextblx.dtd -//OASIS//DTD XML Exchange Table Model 19990315//EN + calstblx.dtd -//OASIS//DTD DocBook XML CALS Table Model V${ver}//EN + ent/iso-lat1.ent ISO 8879:1986//ENTITIES Added Latin 1//EN + ent/iso-amsb.ent ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN + ent/iso-lat2.ent ISO 8879:1986//ENTITIES Added Latin 2//EN + ent/iso-amsr.ent ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN + ent/iso-cyr2.ent ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN + ENDENT + + for f in System URI; do + /usr/bin/xmlcatalog --noout --add rewrite${f} "http://www.oasis-open.org/docbook/xml/$%7Bver%7D" \ + /usr/share/sgml/docbook/${fmt}-dtd-${ver} /etc/sgml/docbook/xmlcatalog > /dev/null 2>/dev/null + done + fi + done + + sed -ni ' + /xml-docbook/ H + /xml-docbook/ !p + $ { + g + s/^\n//p + } + ' /etc/sgml/catalog + + # Finally, make sure everything in /etc/sgml is readable! + chmod a+r /etc/sgml/* + end + + script postun + # remove entries only on removal of package + if [ "$1" = 0 ]; then + + entities=" + ent/iso-pub.ent + ent/iso-grk1.ent + dbpoolx.mod + ent/iso-box.ent + docbookx.dtd + ent/iso-grk3.ent + ent/iso-amsn.ent + ent/iso-num.ent + dbcentx.mod + ent/iso-grk4.ent + dbnotnx.mod + ent/iso-dia.ent + ent/iso-grk2.ent + dbgenent.mod + dbhierx.mod + ent/iso-amsa.ent + ent/iso-amso.ent + ent/iso-cyr1.ent + ent/iso-tech.ent + ent/iso-amsc.ent + soextblx.dtd + calstblx.dtd + ent/iso-lat1.ent + ent/iso-amsb.ent + ent/iso-lat2.ent + ent/iso-amsr.ent + ent/iso-cyr2.ent" + + for dir in %{directories}; do + fmt=${dir#*-} ver=${dir%%-*} + + ## SGML catalog + # Update the centralized catalog corresponding to this version of the DTD + /usr/bin/xmlcatalog --noout --sgml --del /etc/sgml/catalog /etc/sgml/$fmt-docbook-$ver.cat + rm -f /etc/sgml/$fmt-docbook-$ver.cat + + ## XML catalog + if [ $fmt = xml -a -w /usr/share/sgml/docbook/xmlcatalog ]; then + for f in $entities; do + case $ver in 4.[45]) f=${f/-/} ;; esac + /usr/bin/xmlcatalog --noout --del /usr/share/sgml/docbook/$fmt-dtd-$ver/$f /usr/share/sgml/docbook/xmlcatalog + done + /usr/bin/xmlcatalog --noout --del /usr/share/sgml/docbook/$fmt-dtd-$ver /usr/share/sgml/docbook/xmlcatalog + fi + done + + # See the comment attached to this command in the postin scriptlet. + sed -ni ' + /xml-docbook/ H + /xml-docbook/ !p + $ { + g + s/^\n//p + } + ' /etc/sgml/catalog + fi + end + end +end diff --git a/docbook-dtds/patches/docbook-4.2-euro.patch b/docbook-dtds/patches/docbook-4.2-euro.patch new file mode 100644 index 0000000..bbace5d --- /dev/null +++ b/docbook-dtds/patches/docbook-4.2-euro.patch @@ -0,0 +1,22 @@ +--- docbook-dtds-1.0/4.2-sgml/docbookx.dtd.euro 2003-07-15 09:07:58.000000000 +0100 ++++ docbook-dtds-1.0/4.2-sgml/docbookx.dtd 2003-07-15 09:08:12.000000000 +0100 +@@ -106,7 +106,7 @@ + <![%dbcent.module;[ + + <![%sgml.features;[ +-<!ENTITY euro "[euro ]"><!-- euro sign, U+20AC NEW --> ++<!ENTITY euro SDATA "[euro ]"><!-- euro sign, U+20AC NEW --> + ]]> + <![%xml.features;[ + <!ENTITY euro "€"><!-- euro sign, U+20AC NEW --> +--- docbook-dtds-1.0/4.2-xml/docbookx.dtd.euro 2003-07-15 09:08:02.000000000 +0100 ++++ docbook-dtds-1.0/4.2-xml/docbookx.dtd 2003-07-15 09:08:21.000000000 +0100 +@@ -106,7 +106,7 @@ + <![%dbcent.module;[ + + <![%sgml.features;[ +-<!ENTITY euro "[euro ]"><!-- euro sign, U+20AC NEW --> ++<!ENTITY euro SDATA "[euro ]"><!-- euro sign, U+20AC NEW --> + ]]> + <![%xml.features;[ + <!ENTITY euro "€"><!-- euro sign, U+20AC NEW --> diff --git a/docbook-dtds/patches/docbook-dtd30-sgml-1.0.catalog.patch b/docbook-dtds/patches/docbook-dtd30-sgml-1.0.catalog.patch new file mode 100644 index 0000000..81bff59 --- /dev/null +++ b/docbook-dtds/patches/docbook-dtd30-sgml-1.0.catalog.patch @@ -0,0 +1,41 @@ +--- a/3.0-sgml/docbook.cat Tue Dec 10 16:35:22 1996 ++++ b/3.0-sgml/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" + PUBLIC "-//Davenport//ENTITIES DocBook Additional General Entities V3.0//EN" "dbgenent.mod" +- +- -- ...................................................................... -- +- -- ISO entity sets ...................................................... -- +- +-PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN" "iso-dia.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN" "iso-num.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN" "iso-pub.gml" +-PUBLIC "ISO 8879:1986//ENTITIES General Technical//EN" "iso-tech.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN" "iso-lat1.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Added Latin 2//EN" "iso-lat2.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Greek Letters//EN" "iso-grk1.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Monotoniko Greek//EN" "iso-grk2.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Greek Symbols//EN" "iso-grk3.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN" "iso-grk4.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN" "iso-amsa.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN" "iso-amsb.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN" "iso-amsc.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN" "iso-amsn.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN" "iso-amso.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN" "iso-amsr.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Box and Line Drawing//EN" "iso-box.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Russian Cyrillic//EN" "iso-cyr1.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN" "iso-cyr2.gml" + + -- End of catalog data for DocBook V3.0 ................................. -- + -- ...................................................................... -- diff --git a/docbook-dtds/patches/docbook-dtd31-sgml-1.0.catalog.patch b/docbook-dtds/patches/docbook-dtd31-sgml-1.0.catalog.patch new file mode 100644 index 0000000..d4789b3 --- /dev/null +++ b/docbook-dtds/patches/docbook-dtd31-sgml-1.0.catalog.patch @@ -0,0 +1,41 @@ +--- a/3.1-sgml/docbook.cat Tue Feb 2 06:53:32 1999 ++++ b/3.1-sgml/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" + PUBLIC "-//OASIS//ENTITIES DocBook Character Entities V3.1//EN" "dbcent.mod" +- +- -- ...................................................................... -- +- -- ISO entity sets ...................................................... -- +- +-PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN" "iso-dia.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN" "iso-num.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN" "iso-pub.gml" +-PUBLIC "ISO 8879:1986//ENTITIES General Technical//EN" "iso-tech.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN" "iso-lat1.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Added Latin 2//EN" "iso-lat2.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Greek Letters//EN" "iso-grk1.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Monotoniko Greek//EN" "iso-grk2.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Greek Symbols//EN" "iso-grk3.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN" "iso-grk4.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN" "iso-amsa.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN" "iso-amsb.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN" "iso-amsc.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN" "iso-amsn.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN" "iso-amso.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN" "iso-amsr.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Box and Line Drawing//EN" "iso-box.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Russian Cyrillic//EN" "iso-cyr1.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN" "iso-cyr2.gml" + + -- End of catalog data for DocBook V3.1 ................................. -- + -- ...................................................................... -- diff --git a/docbook-dtds/patches/docbook-dtd40-sgml-1.0.catalog.patch b/docbook-dtds/patches/docbook-dtd40-sgml-1.0.catalog.patch new file mode 100644 index 0000000..367279f --- /dev/null +++ b/docbook-dtds/patches/docbook-dtd40-sgml-1.0.catalog.patch @@ -0,0 +1,41 @@ +--- a/4.0-sgml/docbook.cat Mon May 22 22:38:05 2000 ++++ b/4.0-sgml/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" + PUBLIC "-//OASIS//ENTITIES DocBook Character Entities V4.0//EN" "dbcent.mod" +- +- -- ...................................................................... -- +- -- ISO entity sets ...................................................... -- +- +-PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN" "iso-dia.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN" "iso-num.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN" "iso-pub.gml" +-PUBLIC "ISO 8879:1986//ENTITIES General Technical//EN" "iso-tech.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN" "iso-lat1.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Added Latin 2//EN" "iso-lat2.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Greek Letters//EN" "iso-grk1.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Monotoniko Greek//EN" "iso-grk2.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Greek Symbols//EN" "iso-grk3.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN" "iso-grk4.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN" "iso-amsa.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN" "iso-amsb.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN" "iso-amsc.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN" "iso-amsn.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN" "iso-amso.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN" "iso-amsr.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Box and Line Drawing//EN" "iso-box.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Russian Cyrillic//EN" "iso-cyr1.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN" "iso-cyr2.gml" + + -- End of catalog data for DocBook V4.0 ................................. -- + -- ...................................................................... -- diff --git a/docbook-dtds/patches/docbook-dtd41-sgml-1.0.catalog.patch b/docbook-dtds/patches/docbook-dtd41-sgml-1.0.catalog.patch new file mode 100644 index 0000000..2a10e7d --- /dev/null +++ b/docbook-dtds/patches/docbook-dtd41-sgml-1.0.catalog.patch @@ -0,0 +1,41 @@ +--- a/4.1-sgml/docbook.cat Mon May 22 22:38:05 2000 ++++ b/4.1-sgml/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" + PUBLIC "-//OASIS//ENTITIES DocBook Character Entities V4.1//EN" "dbcent.mod" +- +- -- ...................................................................... -- +- -- ISO entity sets ...................................................... -- +- +-PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN" "iso-dia.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN" "iso-num.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN" "iso-pub.gml" +-PUBLIC "ISO 8879:1986//ENTITIES General Technical//EN" "iso-tech.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN" "iso-lat1.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Added Latin 2//EN" "iso-lat2.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Greek Letters//EN" "iso-grk1.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Monotoniko Greek//EN" "iso-grk2.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Greek Symbols//EN" "iso-grk3.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN" "iso-grk4.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN" "iso-amsa.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN" "iso-amsb.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN" "iso-amsc.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN" "iso-amsn.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN" "iso-amso.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN" "iso-amsr.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Box and Line Drawing//EN" "iso-box.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Russian Cyrillic//EN" "iso-cyr1.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN" "iso-cyr2.gml" + + -- End of catalog data for DocBook V4.1 ................................. -- + -- ...................................................................... -- diff --git a/docbook-dtds/patches/docbook-dtd412-entities.patch b/docbook-dtds/patches/docbook-dtd412-entities.patch new file mode 100644 index 0000000..39a7bb2 --- /dev/null +++ b/docbook-dtds/patches/docbook-dtd412-entities.patch @@ -0,0 +1,48 @@ +diff -urNp docbook-dtds-1.0-orig/4.1.2-xml/docbook.cat docbook-dtds-1.0/4.1.2-xml/docbook.cat +--- docbook-dtds-1.0-orig/4.1.2-xml/docbook.cat 2009-02-19 13:49:08.000000000 +0100 ++++ docbook-dtds-1.0/4.1.2-xml/docbook.cat 2009-02-19 13:50:59.000000000 +0100 +@@ -41,25 +41,25 @@ PUBLIC "-//OASIS//ENTITIES DocBook XML C + -- ...................................................................... -- + -- ISO entity sets ...................................................... -- + +-PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN" "ent/iso-dia.ent" +-PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN" "ent/iso-num.ent" +-PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN" "ent/iso-pub.ent" +-PUBLIC "ISO 8879:1986//ENTITIES General Technical//EN" "ent/iso-tech.ent" +-PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN" "ent/iso-lat1.ent" +-PUBLIC "ISO 8879:1986//ENTITIES Added Latin 2//EN" "ent/iso-lat2.ent" +-PUBLIC "ISO 8879:1986//ENTITIES Greek Letters//EN" "ent/iso-grk1.ent" +-PUBLIC "ISO 8879:1986//ENTITIES Monotoniko Greek//EN" "ent/iso-grk2.ent" +-PUBLIC "ISO 8879:1986//ENTITIES Greek Symbols//EN" "ent/iso-grk3.ent" +-PUBLIC "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN" "ent/iso-grk4.ent" +-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN" "ent/iso-amsa.ent" +-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN" "ent/iso-amsb.ent" +-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN" "ent/iso-amsc.ent" +-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN" "ent/iso-amsn.ent" +-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN" "ent/iso-amso.ent" +-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN" "ent/iso-amsr.ent" +-PUBLIC "ISO 8879:1986//ENTITIES Box and Line Drawing//EN" "ent/iso-box.ent" +-PUBLIC "ISO 8879:1986//ENTITIES Russian Cyrillic//EN" "ent/iso-cyr1.ent" +-PUBLIC "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN" "ent/iso-cyr2.ent" ++PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN//XML" "ent/iso-dia.ent" ++PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN//XML" "ent/iso-num.ent" ++PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN//XML" "ent/iso-pub.ent" ++PUBLIC "ISO 8879:1986//ENTITIES General Technical//EN//XML" "ent/iso-tech.ent" ++PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN//XML" "ent/iso-lat1.ent" ++PUBLIC "ISO 8879:1986//ENTITIES Added Latin 2//EN//XML" "ent/iso-lat2.ent" ++PUBLIC "ISO 8879:1986//ENTITIES Greek Letters//EN//XML" "ent/iso-grk1.ent" ++PUBLIC "ISO 8879:1986//ENTITIES Monotoniko Greek//EN//XML" "ent/iso-grk2.ent" ++PUBLIC "ISO 8879:1986//ENTITIES Greek Symbols//EN//XML" "ent/iso-grk3.ent" ++PUBLIC "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN//XML" "ent/iso-grk4.ent" ++PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN//XML" "ent/iso-amsa.ent" ++PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN//XML" "ent/iso-amsb.ent" ++PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN//XML" "ent/iso-amsc.ent" ++PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN//XML" "ent/iso-amsn.ent" ++PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN//XML" "ent/iso-amso.ent" ++PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN//XML" "ent/iso-amsr.ent" ++PUBLIC "ISO 8879:1986//ENTITIES Box and Line Drawing//EN//XML" "ent/iso-box.ent" ++PUBLIC "ISO 8879:1986//ENTITIES Russian Cyrillic//EN//XML" "ent/iso-cyr1.ent" ++PUBLIC "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN//XML" "ent/iso-cyr2.ent" + + -- End of catalog data for DocBook XML V4.1.2 ............................. -- + -- ...................................................................... -- diff --git a/docbook-dtds/patches/docbook-dtd42-sgml-1.0.catalog.patch b/docbook-dtds/patches/docbook-dtd42-sgml-1.0.catalog.patch new file mode 100644 index 0000000..d0b2cc3 --- /dev/null +++ b/docbook-dtds/patches/docbook-dtd42-sgml-1.0.catalog.patch @@ -0,0 +1,68 @@ +--- a/4.2-sgml/docbook.cat.orig 2002-07-17 17:14:28.000000000 +0100 ++++ b/4.2-sgml/docbook.cat 2002-07-17 21:58:24.000000000 +0100 +@@ -49,65 +49,5 @@ + PUBLIC "-//OASIS//ENTITIES DocBook Character Entities V4.2//EN" + "dbcentx.mod" + +- -- ...................................................................... -- +- -- ISO entity sets ...................................................... -- +- +-PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN" +- "iso-dia.gml" +- +-PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN" +- "iso-num.gml" +- +-PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN" +- "iso-pub.gml" +- +-PUBLIC "ISO 8879:1986//ENTITIES General Technical//EN" +- "iso-tech.gml" +- +-PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN" +- "iso-lat1.gml" +- +-PUBLIC "ISO 8879:1986//ENTITIES Added Latin 2//EN" +- "iso-lat2.gml" +- +-PUBLIC "ISO 8879:1986//ENTITIES Greek Letters//EN" +- "iso-grk1.gml" +- +-PUBLIC "ISO 8879:1986//ENTITIES Monotoniko Greek//EN" +- "iso-grk2.gml" +- +-PUBLIC "ISO 8879:1986//ENTITIES Greek Symbols//EN" +- "iso-grk3.gml" +- +-PUBLIC "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN" +- "iso-grk4.gml" +- +-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN" +- "iso-amsa.gml" +- +-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN" +- "iso-amsb.gml" +- +-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN" +- "iso-amsc.gml" +- +-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN" +- "iso-amsn.gml" +- +-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN" +- "iso-amso.gml" +- +-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN" +- "iso-amsr.gml" +- +-PUBLIC "ISO 8879:1986//ENTITIES Box and Line Drawing//EN" +- "iso-box.gml" +- +-PUBLIC "ISO 8879:1986//ENTITIES Russian Cyrillic//EN" +- "iso-cyr1.gml" +- +-PUBLIC "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN" +- "iso-cyr2.gml" +- + -- End of catalog data for DocBook V4.2 ................................. -- + -- ...................................................................... -- diff --git a/docbook-dtds/patches/docbook-dtds-ents.patch b/docbook-dtds/patches/docbook-dtds-ents.patch new file mode 100644 index 0000000..bc45628 --- /dev/null +++ b/docbook-dtds/patches/docbook-dtds-ents.patch @@ -0,0 +1,53 @@ +--- docbook-dtds-1.0/4.3-sgml/docbook.cat.ents 2005-12-13 13:14:24.000000000 +0000 ++++ docbook-dtds-1.0/4.3-sgml/docbook.cat 2005-12-13 13:14:38.000000000 +0000 +@@ -51,6 +51,7 @@ + + -- ...................................................................... -- + -- ISO entity sets ...................................................... -- ++-- + + PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN" + "iso-dia.gml" +@@ -109,5 +110,6 @@ + PUBLIC "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN" + "iso-cyr2.gml" + ++-- + -- End of catalog data for DocBook V4.3 ................................. -- + -- ...................................................................... -- +--- docbook-dtds-1.0/4.4-sgml/docbook.cat.ents 2005-12-13 13:14:51.000000000 +0000 ++++ docbook-dtds-1.0/4.4-sgml/docbook.cat 2005-12-13 13:14:59.000000000 +0000 +@@ -54,6 +54,7 @@ + + -- ...................................................................... -- + -- ISO entity sets ...................................................... -- ++-- + + PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN" + "iso-dia.gml" +@@ -112,5 +113,6 @@ + PUBLIC "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN" + "iso-cyr2.gml" + ++-- + -- End of catalog data for DocBook V4.4 ................................. -- + -- ...................................................................... -- +diff -urNp docbook-dtds-1.0-orig/4.5-sgml/docbook.cat docbook-dtds-1.0/4.5-sgml/docbook.cat +--- docbook-dtds-1.0-orig/4.5-sgml/docbook.cat 2009-02-19 13:45:22.000000000 +0100 ++++ docbook-dtds-1.0/4.5-sgml/docbook.cat 2009-02-19 13:47:31.000000000 +0100 +@@ -60,6 +60,7 @@ PUBLIC "-//OASIS//ENTITIES DocBook Chara + + -- ...................................................................... -- + -- ISO entity sets ...................................................... -- ++-- + + PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN" + "iso-dia.gml" +@@ -118,5 +119,7 @@ PUBLIC "ISO 8879:1986//ENTITIES Russian + PUBLIC "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN" + "iso-cyr2.gml" + ++-- ++ + -- End of catalog data for DocBook V4.5 ................................. -- + -- ...................................................................... -- diff --git a/docbook-dtds/patches/docbook-sgml-systemrewrite.patch b/docbook-dtds/patches/docbook-sgml-systemrewrite.patch new file mode 100644 index 0000000..4adbc50 --- /dev/null +++ b/docbook-dtds/patches/docbook-sgml-systemrewrite.patch @@ -0,0 +1,210 @@ +diff -urNp docbook-dtds-1.0-orig/3.0-sgml/docbook.cat docbook-dtds-1.0/3.0-sgml/docbook.cat +--- 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" + + -- ...................................................................... -- ++ -- SYSTEM rewrite of web URL .............. ............................. -- ++ ++SYSTEM "http://www.oasis-open.org/docbook/sgml/3.0/docbook.dtd" ++ "docbook.dtd" ++ ++ -- ...................................................................... -- + -- DocBook driver file .................................................. -- + + PUBLIC "-//Davenport//DTD DocBook V3.0//EN" "docbook.dtd" +diff -urNp docbook-dtds-1.0-orig/3.1-sgml/docbook.cat docbook-dtds-1.0/3.1-sgml/docbook.cat +--- 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" + + -- ...................................................................... -- ++ -- SYSTEM rewrite of web URL .............. ............................. -- ++ ++SYSTEM "http://www.oasis-open.org/docbook/sgml/3.0/docbook.dtd" ++ "docbook.dtd" ++ ++ -- ...................................................................... -- + -- DocBook driver file .................................................. -- + + PUBLIC "-//OASIS//DTD DocBook V3.1//EN" "docbook.dtd" +diff -urNp docbook-dtds-1.0-orig/4.0-sgml/docbook.cat docbook-dtds-1.0/4.0-sgml/docbook.cat +--- 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" + + -- ...................................................................... -- ++ -- SYSTEM rewrite of web URL .............. ............................. -- ++ ++SYSTEM "http://www.oasis-open.org/docbook/sgml/4.0/docbook.dtd" ++ "docbook.dtd" ++ ++ -- ...................................................................... -- + -- 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" + + -- ...................................................................... -- ++ -- SYSTEM rewrite of web URL .............. ............................. -- ++SYSTEM "http://www.oasis-open.org/docbook/sgml/4.1/docbook.dtd" ++ "docbook.dtd" ++ ++ ++ -- ...................................................................... -- + -- DocBook driver file .................................................. -- + + PUBLIC "-//OASIS//DTD DocBook V4.1//EN" "docbook.dtd" +diff -urNp docbook-dtds-1.0-orig/4.1.2-xml/docbook.cat docbook-dtds-1.0/4.1.2-xml/docbook.cat +--- docbook-dtds-1.0-orig/4.1.2-xml/docbook.cat 2000-08-27 17:19:42.000000000 +0200 ++++ docbook-dtds-1.0/4.1.2-xml/docbook.cat 2009-02-05 16:52:16.000000000 +0100 +@@ -17,6 +17,12 @@ + -- + + -- ...................................................................... -- ++ -- SYSTEM rewrite of web URL .............. ............................. -- ++ ++SYSTEM "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" ++ "docbookx.dtd" ++ ++ -- ...................................................................... -- + -- DocBook driver file .................................................. -- + + PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" "docbookx.dtd" +diff -urNp docbook-dtds-1.0-orig/4.2-sgml/docbook.cat docbook-dtds-1.0/4.2-sgml/docbook.cat +--- docbook-dtds-1.0-orig/4.2-sgml/docbook.cat 2009-02-05 16:44:17.000000000 +0100 ++++ docbook-dtds-1.0/4.2-sgml/docbook.cat 2009-02-05 16:50:10.000000000 +0100 +@@ -17,6 +17,12 @@ + -- + + -- ...................................................................... -- ++ -- SYSTEM rewrite of web URL .............. ............................. -- ++ ++SYSTEM "http://www.oasis-open.org/docbook/sgml/4.2/docbook.dtd" ++ "docbook.dtd" ++ ++ -- ...................................................................... -- + -- DocBook driver file .................................................. -- + + PUBLIC "-//OASIS//DTD DocBook V4.2//EN" +diff -urNp docbook-dtds-1.0-orig/4.2-xml/docbook.cat docbook-dtds-1.0/4.2-xml/docbook.cat +--- docbook-dtds-1.0-orig/4.2-xml/docbook.cat 2002-07-17 18:14:41.000000000 +0200 ++++ docbook-dtds-1.0/4.2-xml/docbook.cat 2009-02-05 16:52:53.000000000 +0100 +@@ -17,6 +17,12 @@ + -- + + -- ...................................................................... -- ++ -- SYSTEM rewrite of web URL .............. ............................. -- ++ ++SYSTEM "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" ++ "docbookx.dtd" ++ ++ -- ...................................................................... -- + -- DocBook driver file .................................................. -- + + PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" +diff -urNp docbook-dtds-1.0-orig/4.3-sgml/docbook.cat docbook-dtds-1.0/4.3-sgml/docbook.cat +--- docbook-dtds-1.0-orig/4.3-sgml/docbook.cat 2009-02-05 16:44:18.000000000 +0100 ++++ docbook-dtds-1.0/4.3-sgml/docbook.cat 2009-02-05 16:50:37.000000000 +0100 +@@ -17,6 +17,13 @@ + -- + + -- ...................................................................... -- ++ -- SYSTEM rewrite of web URL .............. ............................. -- ++ ++SYSTEM "http://www.oasis-open.org/docbook/sgml/4.3/docbook.dtd" ++ "docbook.dtd" ++ ++ ++ -- ...................................................................... -- + -- DocBook driver file .................................................. -- + + PUBLIC "-//OASIS//DTD DocBook V4.3//EN" +diff -urNp docbook-dtds-1.0-orig/4.3-xml/docbook.cat docbook-dtds-1.0/4.3-xml/docbook.cat +--- docbook-dtds-1.0-orig/4.3-xml/docbook.cat 2004-03-31 13:22:18.000000000 +0200 ++++ docbook-dtds-1.0/4.3-xml/docbook.cat 2009-02-05 16:53:12.000000000 +0100 +@@ -17,6 +17,12 @@ + -- + + -- ...................................................................... -- ++ -- SYSTEM rewrite of web URL .............. ............................. -- ++ ++SYSTEM "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" ++ "docbookx.dtd" ++ ++ -- ...................................................................... -- + -- DocBook driver file .................................................. -- + + PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" +diff -urNp docbook-dtds-1.0-orig/4.4-sgml/docbook.cat docbook-dtds-1.0/4.4-sgml/docbook.cat +--- docbook-dtds-1.0-orig/4.4-sgml/docbook.cat 2009-02-05 16:44:18.000000000 +0100 ++++ docbook-dtds-1.0/4.4-sgml/docbook.cat 2009-02-05 16:50:57.000000000 +0100 +@@ -17,6 +17,12 @@ + -- + + -- ...................................................................... -- ++ -- SYSTEM rewrite of web URL .............. ............................. -- ++ ++SYSTEM "http://www.oasis-open.org/docbook/sgml/4.4/docbook.dtd" ++ "docbook.dtd" ++ ++ -- ...................................................................... -- + -- DocBook driver file .................................................. -- + + PUBLIC "-//OASIS//DTD DocBook V4.4//EN" +diff -urNp docbook-dtds-1.0-orig/4.4-xml/docbook.cat docbook-dtds-1.0/4.4-xml/docbook.cat +--- docbook-dtds-1.0-orig/4.4-xml/docbook.cat 2005-01-27 14:57:19.000000000 +0100 ++++ docbook-dtds-1.0/4.4-xml/docbook.cat 2009-02-05 16:53:30.000000000 +0100 +@@ -17,6 +17,12 @@ + -- + + -- ...................................................................... -- ++ -- SYSTEM rewrite of web URL .............. ............................. -- ++ ++SYSTEM "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" ++ "docbookx.dtd" ++ ++ -- ...................................................................... -- + -- DocBook driver file .................................................. -- + + PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" +diff -urNp docbook-dtds-1.0-orig/4.5-sgml/docbook.cat docbook-dtds-1.0/4.5-sgml/docbook.cat +--- docbook-dtds-1.0-orig/4.5-sgml/docbook.cat 2006-10-03 15:27:50.000000000 +0200 ++++ docbook-dtds-1.0/4.5-sgml/docbook.cat 2009-02-05 16:51:22.000000000 +0100 +@@ -17,6 +17,12 @@ + -- + + -- ...................................................................... -- ++ -- SYSTEM rewrite of web URL .............. ............................. -- ++ ++SYSTEM "http://www.oasis-open.org/docbook/sgml/4.5/docbook.dtd" ++ "docbook.dtd" ++ ++ -- ...................................................................... -- + -- DocBook driver file .................................................. -- + + PUBLIC "-//OASIS//DTD DocBook V4.5//EN" +diff -urNp docbook-dtds-1.0-orig/4.5-xml/docbook.cat docbook-dtds-1.0/4.5-xml/docbook.cat +--- docbook-dtds-1.0-orig/4.5-xml/docbook.cat 2006-10-03 15:26:00.000000000 +0200 ++++ docbook-dtds-1.0/4.5-xml/docbook.cat 2009-02-05 16:55:45.000000000 +0100 +@@ -17,6 +17,12 @@ + -- + + -- ...................................................................... -- ++ -- SYSTEM rewrite of web URL .............. ............................. -- ++ ++SYSTEM "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" ++ "docbookx.dtd" ++ ++ -- ...................................................................... -- + -- DocBook driver file .................................................. -- + + PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" diff --git a/docbook-utils/docbook-utils.nm b/docbook-utils/docbook-utils.nm new file mode 100644 index 0000000..44a236c --- /dev/null +++ b/docbook-utils/docbook-utils.nm @@ -0,0 +1,53 @@ +############################################################################### +# IPFire.org - An Open Source Firewall Solution # +# Copyright (C) - IPFire Development Team info@ipfire.org # +############################################################################### + +name = docbook-utils +version = 0.6.14 +release = 1 + +groups = Applications/Text +url = http://sources.redhat.com/docbook-tools/ +license = GPLv2+ +summary = Shell scripts for managing DocBook documents. + +description + This package contains scripts are for easy conversion from DocBook + files to other formats, and for comparing SGML files. +end + +# Manual list patches because they need to be applied in specical order +patches = \ + %{name}-spaces.patch \ + %{name}-2ndspaces.patch \ + %{name}-w3mtxtconvert.patch \ + %{name}-grepnocolors.patch \ + %{name}-sgmlinclude.patch \ + %{name}-rtfmanpage.patch \ + %{name}-papersize.patch \ + %{name}-nofinalecho.patch \ + %{name}-newgrep.patch + +build + requires + docbook-dsssl + docbook-dtds + openjade + sgml-common + end + + configure_options += \ + --libdir=/usr/lib \ + --mandir=/usr/share/man +end + +packages + package %{name} + requires + docbook-dtds + docbook-dsssl + openjade + end + end +end diff --git a/docbook-utils/patches/docbook-utils-2ndspaces.patch b/docbook-utils/patches/docbook-utils-2ndspaces.patch new file mode 100644 index 0000000..eb4d6c6 --- /dev/null +++ b/docbook-utils/patches/docbook-utils-2ndspaces.patch @@ -0,0 +1,260 @@ +--- Original/backends/dvi 2003-01-13 18:14:10.000000000 +0100 ++++ Changes/backends/dvi 2007-05-21 14:10:42.000000000 +0200 +@@ -6,31 +6,31 @@ + export TEXINPUTS + + # Convert to TeX +-$SGML_JADE -t tex -o ${SGML_FILE_NAME}.tex $SGML_ARGUMENTS ++$SGML_JADE -t tex -o "${SGML_FILE_NAME}.tex" $SGML_ARGUMENTS "$SGML_FILE" + if [ $? -ne 0 ] + then exit 1 + fi + + # Convert from TeX to DVI +-jadetex ${SGML_FILE_NAME}.tex >${SGML_FILE_NAME}.tmp ++jadetex "${SGML_FILE_NAME}.tex" > "${SGML_FILE_NAME}.tmp" + if [ $? -ne 0 ] + then +- cat ${SGML_FILE_NAME}.tmp +- rm ${SGML_FILE_NAME}.tmp +- rm ${SGML_FILE_NAME}.tex ++ cat "${SGML_FILE_NAME}.tmp" ++ rm "${SGML_FILE_NAME}.tmp" ++ rm "${SGML_FILE_NAME}.tex" + exit 2 + fi +-rm ${SGML_FILE_NAME}.tmp ++rm "${SGML_FILE_NAME}.tmp" + + # If there are unresolved references, re-run jadetex, twice +-if egrep '^LaTeX Warning: There were undefined references.$' ${SGML_FILE_NAME}.log >/dev/null 2>&1 ++if egrep '^LaTeX Warning: There were undefined references.$' "${SGML_FILE_NAME}.log" >/dev/null 2>&1 + then +- jadetex ${SGML_FILE_NAME}.tex >/dev/null +- jadetex ${SGML_FILE_NAME}.tex >/dev/null ++ jadetex "${SGML_FILE_NAME}.tex" >/dev/null ++ jadetex "${SGML_FILE_NAME}.tex" >/dev/null + fi +-rm ${SGML_FILE_NAME}.log +-rm ${SGML_FILE_NAME}.aux +-rm ${SGML_FILE_NAME}.tex +-rm ${SGML_FILE_NAME}.out ++rm "${SGML_FILE_NAME}.log" ++rm "${SGML_FILE_NAME}.aux" ++rm "${SGML_FILE_NAME}.tex" ++rm "${SGML_FILE_NAME}.out" + + exit 0 +--- Original/backends/html 2000-07-21 20:15:22.000000000 +0200 ++++ Changes/backends/html 2007-05-21 14:11:32.000000000 +0200 +@@ -3,7 +3,7 @@ + # This program is under GPL license. See LICENSE file for details. + + # Convert to HTML +-$SGML_JADE -t sgml $SGML_ARGUMENTS ++$SGML_JADE -t sgml $SGML_ARGUMENTS "$SGML_FILE" + if [ $? -ne 0 ] + then exit 1 + fi +--- Original/backends/pdf 2003-03-17 18:47:11.000000000 +0100 ++++ Changes/backends/pdf 2007-05-21 14:13:58.000000000 +0200 +@@ -6,26 +6,26 @@ + export TEXINPUTS + + # Convert to TeX +-$SGML_JADE -t tex -o ${SGML_FILE_NAME}.tex $SGML_ARGUMENTS ++$SGML_JADE -t tex -o "${SGML_FILE_NAME}.tex" $SGML_ARGUMENTS "$SGML_FILE" + if [ $? -ne 0 ] + then exit 1 + fi + + # Convert from TeX to PDF +-pdfjadetex ${SGML_FILE_NAME}.tex >${SGML_FILE_NAME}.tmp ++pdfjadetex "${SGML_FILE_NAME}.tex" > "${SGML_FILE_NAME}.tmp" + if [ $? -ne 0 ] + then +- cat ${SGML_FILE_NAME}.tmp +- rm ${SGML_FILE_NAME}.tmp +- rm ${SGML_FILE_NAME}.tex ++ cat "${SGML_FILE_NAME}.tmp" ++ rm "${SGML_FILE_NAME}.tmp" ++ rm "${SGML_FILE_NAME}.tex" + exit 2 + fi +-rm ${SGML_FILE_NAME}.tmp ++rm "${SGML_FILE_NAME}.tmp" + + # Unconditionally re-run pdfjadetex, twice +-pdfjadetex ${SGML_FILE_NAME}.tex >/dev/null +-pdfjadetex ${SGML_FILE_NAME}.tex >/dev/null +-rm -f ${SGML_FILE_NAME}.log ${SGML_FILE_NAME}.aux \ +- ${SGML_FILE_NAME}.tex ${SGML_FILE_NAME}.out ++pdfjadetex "${SGML_FILE_NAME}.tex" >/dev/null ++pdfjadetex "${SGML_FILE_NAME}.tex" >/dev/null ++rm -f "${SGML_FILE_NAME}.log" "${SGML_FILE_NAME}.aux" \ ++ "${SGML_FILE_NAME}.tex" "${SGML_FILE_NAME}.out" + + exit 0 +--- Original/backends/ps 2003-03-17 18:51:48.000000000 +0100 ++++ Changes/backends/ps 2007-05-21 14:16:51.000000000 +0200 +@@ -6,30 +6,30 @@ + export TEXINPUTS + + # Convert to TeX +-$SGML_JADE -t tex -o ${SGML_FILE_NAME}.tex $SGML_ARGUMENTS ++$SGML_JADE -t tex -o "${SGML_FILE_NAME}.tex" $SGML_ARGUMENTS "$SGML_FILE" + if [ $? -ne 0 ] + then exit 1 + fi + + # Convert from TeX to DVI +-jadetex ${SGML_FILE_NAME}.tex >${SGML_FILE_NAME}.tmp ++jadetex "${SGML_FILE_NAME}.tex" > "${SGML_FILE_NAME}.tmp" + if [ $? -ne 0 ] + then +- cat ${SGML_FILE_NAME}.tmp +- rm ${SGML_FILE_NAME}.tmp +- rm ${SGML_FILE_NAME}.tex ++ cat "${SGML_FILE_NAME}.tmp" ++ rm "${SGML_FILE_NAME}.tmp" ++ rm "${SGML_FILE_NAME}.tex" + exit 2 + fi +-rm ${SGML_FILE_NAME}.tmp ++rm "${SGML_FILE_NAME}.tmp" + + # If there are unresolved references, re-run jadetex, twice +-if egrep '^LaTeX Warning: There were undefined references.$' ${SGML_FILE_NAME}.log >/dev/null 2>&1 ++if egrep '^LaTeX Warning: There were undefined references.$' "${SGML_FILE_NAME}.log" >/dev/null 2>&1 + then +- jadetex ${SGML_FILE_NAME}.tex >/dev/null +- jadetex ${SGML_FILE_NAME}.tex >/dev/null ++ jadetex "${SGML_FILE_NAME}.tex" >/dev/null ++ jadetex "${SGML_FILE_NAME}.tex" >/dev/null + fi +-rm -f ${SGML_FILE_NAME}.log ${SGML_FILE_NAME}.aux \ +- ${SGML_FILE_NAME}.tex ${SGML_FILE_NAME}.out ++rm -f "${SGML_FILE_NAME}.log" "${SGML_FILE_NAME}.aux" \ ++ "${SGML_FILE_NAME}.tex" "${SGML_FILE_NAME}.out" + + # Convert from DVI to PostScript + PAPERSIZE="-t letter" +@@ -38,12 +38,12 @@ + PAPERSIZE="-t a4" + fi + +-dvips -R -q $PAPERSIZE ${SGML_FILE_NAME}.dvi -o ${SGML_FILE_NAME}.ps ++dvips -R -q $PAPERSIZE "${SGML_FILE_NAME}.dvi" -o "${SGML_FILE_NAME}.ps" + if [ $? -ne 0 ] + then +- rm ${SGML_FILE_NAME}.dvi ++ rm "${SGML_FILE_NAME}.dvi" + exit 3 + fi +-rm ${SGML_FILE_NAME}.dvi ++rm "${SGML_FILE_NAME}.dvi" + + exit 0 +--- Original/backends/rtf 2000-07-21 20:15:22.000000000 +0200 ++++ Changes/backends/rtf 2007-05-21 14:18:37.000000000 +0200 +@@ -3,7 +3,7 @@ + # This program is under GPL license. See LICENSE file for details. + + # Convert to RTF +-$SGML_JADE -t rtf -o ${SGML_FILE_NAME}.rtf $SGML_ARGUMENTS ++$SGML_JADE -t rtf -o "${SGML_FILE_NAME}.rtf" $SGML_ARGUMENTS "$SGML_FILE" + if [ $? -ne 0 ] + then exit 1 + fi +--- Original/backends/tex 2000-07-21 20:15:22.000000000 +0200 ++++ Changes/backends/tex 2007-05-21 14:21:12.000000000 +0200 +@@ -3,7 +3,7 @@ + # This program is under GPL license. See LICENSE file for details. + + # Convert to TeX +-$SGML_JADE -t tex -o ${SGML_FILE_NAME}.tex $SGML_ARGUMENTS ++$SGML_JADE -t tex -o "${SGML_FILE_NAME}.tex" $SGML_ARGUMENTS "$SGML_FILE" + if [ $? -ne 0 ] + then exit 1 + fi +--- Original/backends/txt 2004-02-11 14:58:03.000000000 +0100 ++++ Changes/backends/txt 2007-05-21 14:22:33.000000000 +0200 +@@ -23,7 +23,7 @@ + trap 'rm -f "$HTML"; exit' 0 1 2 3 7 13 15 + + # Convert to HTML +-$SGML_JADE -V nochunks -t sgml ${SGML_ARGUMENTS} >${HTML} ++$SGML_JADE -V nochunks -t sgml ${SGML_ARGUMENTS} "$SGML_FILE" >${HTML} + if [ $? -ne 0 ] + then exit 1 + fi +--- Original/bin/jw.in 2003-04-30 18:21:49.000000000 +0200 ++++ Changes/bin/jw.in 2007-05-21 14:28:58.000000000 +0200 +@@ -246,7 +246,7 @@ then + echo -e $SGML_HELP_MESSAGE >&2 + exit 1 + fi +-if [ ! -s $SGML_FRONTEND ] ++if [ ! -s "$SGML_FRONTEND" ] + then + echo "`basename $0`: There is no frontend called "$SGML_FRONTEND"." >&2 + exit 2 +@@ -270,14 +270,14 @@ + echo -e $SGML_HELP_MESSAGE >&2 + exit 1 + fi +-if [ ! -s $SGML_FILE ] ++if [ ! -s "$SGML_FILE" ] + then + echo "`basename $0`: Cannot open "$SGML_FILE"." >&2 + exit 3 + fi + + # Separate the file name and the extension (if any) +-SGML_FILE_NAME=`basename $SGML_FILE` ++SGML_FILE_NAME=`basename "$SGML_FILE"` + SGML_FILE_NAME=${SGML_FILE_NAME%.*} + + # Determine if we are in an XML file +@@ -416,7 +416,7 @@ + fi + + # Prepare the parser's arguments +-SGML_ARGUMENTS="$SGML_INCLUDE -i $SGML_TYPE -d $SGML_STYLESHEET $SGML_OPTIONS $SGML_WARNINGS $SGML_DECL $SGML_FILE" ++SGML_ARGUMENTS="$SGML_INCLUDE -i $SGML_TYPE -d $SGML_STYLESHEET $SGML_OPTIONS $SGML_WARNINGS $SGML_DECL" + + # Call the backend + echo "Using catalogs: `echo $SGML_CATALOG_FILES | sed 's/:/, /g'`" +@@ -430,7 +430,7 @@ + then + sh $SGML_BACKEND + else +- sh $SGML_BACKEND >$SGML_FILE_NAME.html ++ sh $SGML_BACKEND >"$SGML_FILE_NAME.html" + fi + SGML_RETURN=$? + cd "$SGML_CURRENT_DIRECTORY" +diff -urNp docbook-utils-0.6.14-orig/backends/man.in docbook-utils-0.6.14/backends/man.in +--- docbook-utils-0.6.14-orig/backends/man.in 2003-02-11 13:56:23.000000000 +0100 ++++ docbook-utils-0.6.14/backends/man.in 2009-07-24 15:07:04.000000000 +0200 +@@ -7,7 +7,7 @@ HELPER=$SGML_BASE_DIR/docbook/utils-@VER + TMPDIR=`mktemp -d /tmp/man.XXXXXX` || \ + { echo >&2 "man backend: could not create secure temporary directory"; exit 1;} + trap 'rm -rf "${TMPDIR}"' EXIT +-nsgmls $SGML_FILE > "${TMPDIR}/nsgmls.tmp" ++nsgmls "$SGML_FILE" > "${TMPDIR}/nsgmls.tmp" + sgmlspl $HELPER <"${TMPDIR}/nsgmls.tmp" 2>"${TMPDIR}/errs" + if [ $? -ne 0 ] + then +diff -urNp docbook-utils-0.6.14-orig/backends/texi.in docbook-utils-0.6.14/backends/texi.in +--- docbook-utils-0.6.14-orig/backends/texi.in 2002-08-05 23:20:56.000000000 +0200 ++++ docbook-utils-0.6.14/backends/texi.in 2009-07-24 15:08:02.000000000 +0200 +@@ -3,7 +3,7 @@ + # This program is under GPL license. See LICENSE file for details. + + # Convert to texinfo +-nsgmls $SGML_FILE | sgmlspl $SGML_BASE_DIR/docbook/utils-@VERSION@/helpers/docbook2texi-spec.pl >$SGML_FILE_NAME.texi ++nsgmls "$SGML_FILE" | sgmlspl $SGML_BASE_DIR/docbook/utils-@VERSION@/helpers/docbook2texi-spec.pl >$SGML_FILE_NAME.texi + if [ $? -ne 0 ] + then exit 1 + fi diff --git a/docbook-utils/patches/docbook-utils-grepnocolors.patch b/docbook-utils/patches/docbook-utils-grepnocolors.patch new file mode 100644 index 0000000..3cce39e --- /dev/null +++ b/docbook-utils/patches/docbook-utils-grepnocolors.patch @@ -0,0 +1,15 @@ +diff -urNp docbook-utils-0.6.14-orig/bin/jw.in docbook-utils-0.6.14/bin/jw.in +--- docbook-utils-0.6.14-orig/bin/jw.in 2008-11-28 10:53:09.000000000 +0100 ++++ docbook-utils-0.6.14/bin/jw.in 2008-11-28 11:22:28.000000000 +0100 +@@ -81,9 +81,9 @@ SGML_CATALOGS_DIR="/etc/sgml" + if [ -f "$SGML_CONF" ] + then + RE='^[:space:]*SGML_BASE_DIR[:space:]*=[:space:]*' +- SGML_BASE_DIR=`grep $RE $SGML_CONF | sed "s/$RE//"` ++ SGML_BASE_DIR=`grep --color=never $RE $SGML_CONF | sed "s/$RE//"` + RE='^[:space:]*SGML_CATALOGS_DIR[:space:]*=[:space:]*' +- SGML_CATALOGS_DIR=`grep $RE $SGML_CONF | sed "s/$RE//"` ++ SGML_CATALOGS_DIR=`grep --color=never $RE $SGML_CONF | sed "s/$RE//"` + fi + + # Set frontend to use diff --git a/docbook-utils/patches/docbook-utils-newgrep.patch b/docbook-utils/patches/docbook-utils-newgrep.patch new file mode 100644 index 0000000..a2c3591 --- /dev/null +++ b/docbook-utils/patches/docbook-utils-newgrep.patch @@ -0,0 +1,24 @@ +diff -urNp docbook-utils-0.6.14-orig/bin/jw.in docbook-utils-0.6.14/bin/jw.in +--- docbook-utils-0.6.14-orig/bin/jw.in 2010-09-28 18:18:39.567895321 +0200 ++++ docbook-utils-0.6.14/bin/jw.in 2010-09-28 18:23:25.849756994 +0200 +@@ -80,9 +80,9 @@ SGML_BASE_DIR="@prefix@/share/sgml" + SGML_CATALOGS_DIR="/etc/sgml" + if [ -f "$SGML_CONF" ] + then +- RE='^[:space:]*SGML_BASE_DIR[:space:]*=[:space:]*' ++ RE='^[[:space:]]*SGML_BASE_DIR[[:space:]]*=[[:space:]]*' + SGML_BASE_DIR=`grep --color=never $RE $SGML_CONF | sed "s/$RE//"` +- RE='^[:space:]*SGML_CATALOGS_DIR[:space:]*=[:space:]*' ++ RE='^[[:space:]]*SGML_CATALOGS_DIR[[:space:]]*=[[:space:]]*' + SGML_CATALOGS_DIR=`grep --color=never $RE $SGML_CONF | sed "s/$RE//"` + fi + +@@ -312,7 +312,7 @@ case $SGML_STANDARD_CATALOGS in + SGML_CATALOG_FILES=$SGML_CENTRALIZED_CATALOG + else + SGML_CATALOG_FILES=`find $SGML_BASE_DIR -name catalog` +- SGML_CATALOG_FILES=`echo "$SGML_CATALOG_FILES" | tr [:space:] :` ++ SGML_CATALOG_FILES=`echo "$SGML_CATALOG_FILES" | tr [[:space:]] :` + fi + ;; + no) SGML_CATALOG_FILES="" diff --git a/docbook-utils/patches/docbook-utils-nofinalecho.patch b/docbook-utils/patches/docbook-utils-nofinalecho.patch new file mode 100644 index 0000000..5787b97 --- /dev/null +++ b/docbook-utils/patches/docbook-utils-nofinalecho.patch @@ -0,0 +1,12 @@ +diff -urNp docbook-utils-0.6.14-orig/bin/jw.in docbook-utils-0.6.14/bin/jw.in +--- docbook-utils-0.6.14-orig/bin/jw.in 2010-05-31 16:21:46.379401250 +0200 ++++ docbook-utils-0.6.14/bin/jw.in 2010-05-31 16:23:55.348413466 +0200 +@@ -438,5 +438,7 @@ cd "$SGML_CURRENT_DIRECTORY" + if [ $SGML_RETURN -gt 0 ] + then exit `expr 7 + $SGML_RETURN` + fi +-echo "Done." ++#Final echo commented out, it causes manpage noise when generating some ++#manpages with new perl(#513271, #587012) ++#echo "Done." + exit 0 diff --git a/docbook-utils/patches/docbook-utils-papersize.patch b/docbook-utils/patches/docbook-utils-papersize.patch new file mode 100644 index 0000000..74e5007 --- /dev/null +++ b/docbook-utils/patches/docbook-utils-papersize.patch @@ -0,0 +1,12 @@ +diff -urNp docbook-utils-0.6.14-orig/bin/jw.in docbook-utils-0.6.14/bin/jw.in +--- docbook-utils-0.6.14-orig/bin/jw.in 2009-10-07 14:41:19.000000000 +0200 ++++ docbook-utils-0.6.14/bin/jw.in 2009-10-07 14:45:22.000000000 +0200 +@@ -368,7 +368,7 @@ case "$SGML_OPTIONS" in + fi + if [ -n "$papersize" ] + then +- SGML_OPTIONS="-V paper-type=$papersize $SGML_OPTIONS" ++ SGML_OPTIONS="-V %paper-type%=$papersize $SGML_OPTIONS" + fi + ;; + esac diff --git a/docbook-utils/patches/docbook-utils-rtfmanpage.patch b/docbook-utils/patches/docbook-utils-rtfmanpage.patch new file mode 100644 index 0000000..f37873b --- /dev/null +++ b/docbook-utils/patches/docbook-utils-rtfmanpage.patch @@ -0,0 +1,15 @@ +diff -urNp docbook-utils-0.6.14-orig/doc/man/jw.1 docbook-utils-0.6.14/doc/man/jw.1 +--- docbook-utils-0.6.14-orig/doc/man/jw.1 2004-02-11 15:16:21.000000000 +0100 ++++ docbook-utils-0.6.14/doc/man/jw.1 2009-08-13 10:44:03.000000000 +0200 +@@ -192,6 +192,11 @@ by calling \fBJade\fR or + \fBOpenJade\fR&. The resulting file can + then be inported into \fBMS Word\fR + or one of its Linux replacement programs. ++ ++\fBNote\fR - The original picture must be ++present when RTF document is viewed, because ++the RTF documents created by \fBOpenJade\fR ++includes pictures by reference. + .TP + \fB\fItex\fB\fR + Converts to TeX by calling \fBJade\fR or diff --git a/docbook-utils/patches/docbook-utils-sgmlinclude.patch b/docbook-utils/patches/docbook-utils-sgmlinclude.patch new file mode 100644 index 0000000..a4958e0 --- /dev/null +++ b/docbook-utils/patches/docbook-utils-sgmlinclude.patch @@ -0,0 +1,24 @@ +diff -urNp docbook-utils-0.6.14-orig/backends/man.in docbook-utils-0.6.14/backends/man.in +--- docbook-utils-0.6.14-orig/backends/man.in 2009-07-24 15:17:42.000000000 +0200 ++++ docbook-utils-0.6.14/backends/man.in 2009-07-24 15:20:57.000000000 +0200 +@@ -7,7 +7,7 @@ HELPER=$SGML_BASE_DIR/docbook/utils-@VER + TMPDIR=`mktemp -d /tmp/man.XXXXXX` || \ + { echo >&2 "man backend: could not create secure temporary directory"; exit 1;} + trap 'rm -rf "${TMPDIR}"' EXIT +-nsgmls "$SGML_FILE" > "${TMPDIR}/nsgmls.tmp" ++nsgmls "$SGML_INCLUDE" "$SGML_FILE" > "${TMPDIR}/nsgmls.tmp" + sgmlspl $HELPER <"${TMPDIR}/nsgmls.tmp" 2>"${TMPDIR}/errs" + if [ $? -ne 0 ] + then +diff -urNp docbook-utils-0.6.14-orig/bin/jw.in docbook-utils-0.6.14/bin/jw.in +--- docbook-utils-0.6.14-orig/bin/jw.in 2009-07-24 15:17:42.000000000 +0200 ++++ docbook-utils-0.6.14/bin/jw.in 2009-07-24 15:18:51.000000000 +0200 +@@ -423,7 +423,7 @@ echo "Using catalogs: `echo $SGML_CATALO + echo "Using stylesheet: $SGML_STYLESHEET" + echo "Working on: $SGML_FILE" + cd "$SGML_OUTPUT_DIRECTORY" +-export SGML_JADE SGML_FILE_NAME SGML_ARGUMENTS ++export SGML_JADE SGML_FILE_NAME SGML_ARGUMENTS SGML_INCLUDE + export SGML_CATALOG_FILES SGML_BASE_DIR SGML_FILE SGML_STYLESHEET + NOCHUNKS=`echo $SGML_OPTIONS | grep nochunks` + if [ -z "$NOCHUNKS" ] diff --git a/docbook-utils/patches/docbook-utils-spaces.patch b/docbook-utils/patches/docbook-utils-spaces.patch new file mode 100644 index 0000000..4c18b1d --- /dev/null +++ b/docbook-utils/patches/docbook-utils-spaces.patch @@ -0,0 +1,32 @@ +--- docbook-utils-0.6.14/bin/jw.in.spaces 2003-04-30 17:21:49.000000000 +0100 ++++ docbook-utils-0.6.14/bin/jw.in 2004-08-19 09:33:34.989426640 +0100 +@@ -405,9 +405,9 @@ + echo -e $SGML_HELP_MESSAGE >&2 + exit 1 + fi +-if [ ! -d $SGML_OUTPUT_DIRECTORY ] ++if [ ! -d "$SGML_OUTPUT_DIRECTORY" ] + then +- mkdir $SGML_OUTPUT_DIRECTORY 2>/dev/null ++ mkdir "$SGML_OUTPUT_DIRECTORY" 2>/dev/null + if [ $? -ne 0 ] + then + echo "`basename $0`: Could not create "$SGML_OUTPUT_DIRECTORY" output directory" >&2 +@@ -422,7 +422,7 @@ + echo "Using catalogs: `echo $SGML_CATALOG_FILES | sed 's/:/, /g'`" + echo "Using stylesheet: $SGML_STYLESHEET" + echo "Working on: $SGML_FILE" +-cd $SGML_OUTPUT_DIRECTORY ++cd "$SGML_OUTPUT_DIRECTORY" + export SGML_JADE SGML_FILE_NAME SGML_ARGUMENTS + export SGML_CATALOG_FILES SGML_BASE_DIR SGML_FILE SGML_STYLESHEET + NOCHUNKS=`echo $SGML_OPTIONS | grep nochunks` +@@ -433,7 +433,7 @@ + sh $SGML_BACKEND >$SGML_FILE_NAME.html + fi + SGML_RETURN=$? +-cd $SGML_CURRENT_DIRECTORY ++cd "$SGML_CURRENT_DIRECTORY" + + if [ $SGML_RETURN -gt 0 ] + then exit `expr 7 + $SGML_RETURN` diff --git a/docbook-utils/patches/docbook-utils-w3mtxtconvert.patch b/docbook-utils/patches/docbook-utils-w3mtxtconvert.patch new file mode 100644 index 0000000..249af8e --- /dev/null +++ b/docbook-utils/patches/docbook-utils-w3mtxtconvert.patch @@ -0,0 +1,12 @@ +diff -urNp original/txt new/txt +--- original/backends/txt 2007-11-05 18:44:52.000000000 +0100 ++++ new/backends/txt 2007-11-22 15:21:36.000000000 +0100 +@@ -13,7 +13,7 @@ then + elif [ -x /usr/bin/w3m ] + then + CONVERT=/usr/bin/w3m +- ARGS="-dump" ++ ARGS="-T text/html -dump" + else + echo >&2 "No way to convert HTML to text found." + exit 1 diff --git a/docbook-xsl/Makefile b/docbook-xsl/Makefile new file mode 100644 index 0000000..281656d --- /dev/null +++ b/docbook-xsl/Makefile @@ -0,0 +1,52 @@ +BINDIR = /usr/bin +DESTDIR = ..overridden in spec file.. + +all: install + +install: install-xsl install-img install-extensions install-misc install-epub + +install-xsl: + mkdir -p $(DESTDIR)/{common,eclipse,fo,html,htmlhelp/doc,javahelp,lib,template,xhtml,xhtml-1_1,manpages,profiling,highlighting,roundtrip,website} + cp common/*.dtd $(DESTDIR)/common + cp common/*.ent $(DESTDIR)/common + cp common/*.xml $(DESTDIR)/common + cp common/*.xsl $(DESTDIR)/common + cp eclipse/*.xsl $(DESTDIR)/eclipse + cp fo/*.xml $(DESTDIR)/fo + cp fo/*.xsl $(DESTDIR)/fo + cp html/*.xml $(DESTDIR)/html + cp html/*.xsl $(DESTDIR)/html + cp htmlhelp/*.xsl $(DESTDIR)/htmlhelp + cp javahelp/*.xsl $(DESTDIR)/javahelp + cp lib/*.xsl $(DESTDIR)/lib + cp template/*.xsl $(DESTDIR)/template + cp xhtml/*.xsl $(DESTDIR)/xhtml + cp xhtml-1_1/*.xsl $(DESTDIR)/xhtml-1_1 + cp manpages/*.xsl $(DESTDIR)/manpages + cp profiling/*.xsl $(DESTDIR)/profiling + cp highlighting/*.xml $(DESTDIR)/highlighting + cp highlighting/*.xsl $(DESTDIR)/highlighting + cp roundtrip/*.xml $(DESTDIR)/roundtrip + cp roundtrip/*.xsl $(DESTDIR)/roundtrip + cp roundtrip/*.dtd $(DESTDIR)/roundtrip + cp website/*.xsl $(DESTDIR)/website + +install-img: + mkdir -p $(DESTDIR)/images/callouts + cp images/*.gif $(DESTDIR)/images + cp images/*.png $(DESTDIR)/images + cp images/*.svg $(DESTDIR)/images + cp images/callouts/*.png $(DESTDIR)/images/callouts + cp images/callouts/*.gif $(DESTDIR)/images/callouts + cp images/callouts/*.svg $(DESTDIR)/images/callouts + +install-extensions: + mkdir -p $(DESTDIR)/extensions + cp -r extensions/* $(DESTDIR)/extensions + +install-epub: + mkdir -p $(DESTDIR)/epub + cp -r epub/* ${DESTDIR}/epub + +install-misc: + cp VERSION $(DESTDIR) diff --git a/docbook-xsl/docbook-xsl.nm b/docbook-xsl/docbook-xsl.nm new file mode 100644 index 0000000..797789f --- /dev/null +++ b/docbook-xsl/docbook-xsl.nm @@ -0,0 +1,85 @@ +############################################################################### +# IPFire.org - An Open Source Firewall Solution # +# Copyright (C) - IPFire Development Team info@ipfire.org # +############################################################################### + +name = docbook-xsl +version = 1.76.1 +release = 2 +arch = noarch + +groups = Applications/Text +url = http://docbook.sourceforge.net/projects/xsl/ +license = GPLv2+ +summary = Norman Walsh's XSL stylesheets for DocBook XML. + +description + hese XSL stylesheets allow you to transform any DocBook XML document to + other formats, such as HTML, FO, and XHMTL. They are highly customizable. +end + +source_dl = http://prdownloads.sourceforge.net/docbook/ + +sources =\ + %{thisapp}.tar.bz2 \ + %{name}-doc-%{version}.tar.bz2 + +build + prepare_cmds + cp -av %{DIR_SOURCE}/Makefile %{DIR_APP}/Makefile + end + + build = # empty + + make_install_targets +=\ + BINDIR=%{BUILDROOT}/usr/bin \ + DESTDIR=%{BUILDROOT}/usr/share/sgml/docbook/xsl-stylesheets-%{version} + + install_cmds + # Remove buggy extensions. + rm -rfv %{BUILDROOT}/usr/share/sgml/docbook/xsl-stylesheets-%{version}/extensions/* + + # Remove unneeded tool for .epub formats. + rm -rvf %{BUILDROOT}/usr/share/sgml/docbook/xsl-stylesheets-%{version}/epub + end +end + +packages + package %{name} + requires + libxslt + docbook-dtds + sgml-common + end + + prerequires +=\ + docbook-dtds \ + libxml2 \ + sgml-common + + script postin + # Install catalog files. + /usr/bin/xmlcatalog --noout --add "rewriteSystem" \ + "http://docbook.sourceforge.net/release/xsl/%%7Bversion%7D" \ + "file:///usr/share/sgml/docbook/xsl-stylesheets-%{version}" /etc/xml/catalog + + /usr/bin/xmlcatalog --noout --add "rewriteURI" \ + "http://docbook.sourceforge.net/release/xsl/%%7Bversion%7D" \ + "file:///usr/share/sgml/docbook/xsl-stylesheets-%{version}" /etc/xml/catalog + + /usr/bin/xmlcatalog --noout --add "rewriteSystem" \ + "http://docbook.sourceforge.net/release/xsl/current" \ + "file:///usr/share/sgml/docbook/xsl-stylesheets-%{version}" /etc/xml/catalog + + /usr/bin/xmlcatalog --noout --add "rewriteURI" \ + "http://docbook.sourceforge.net/release/xsl/current" \ + "file:///usr/share/sgml/docbook/xsl-stylesheets-%{version}" /etc/xml/catalog + end + + script preun + # Uninstall catalog files. + /usr/bin/xmlcatalog --noout --del \ + "file:///usr/share/sgml/docbook/xsl-stylesheets-%{version}" /etc/xml/catalog + end + end +end diff --git a/docbook-xsl/patches/docbook-xsl-list-item-body.patch b/docbook-xsl/patches/docbook-xsl-list-item-body.patch new file mode 100644 index 0000000..a3d3819 --- /dev/null +++ b/docbook-xsl/patches/docbook-xsl-list-item-body.patch @@ -0,0 +1,110 @@ +diff -ruNp docbook-xsl-1.74.0.orig/fo/lists.xsl docbook-xsl-1.74.0/fo/lists.xsl +--- docbook-xsl-1.74.0.orig/fo/lists.xsl 2008-08-06 13:32:46.000000000 +0200 ++++ docbook-xsl-1.74.0/fo/lists.xsl 2008-08-06 13:41:27.000000000 +0200 +@@ -248,9 +248,17 @@ + </fo:block> + </fo:list-item-label> + <fo:list-item-body start-indent="body-start()"> +- fo:block +- xsl:apply-templates/ +- </fo:block> ++ xsl:choose ++ <!-- * work around broken passivetex list-item-body rendering --> ++ <xsl:when test="$passivetex.extensions = '1'"> ++ xsl:apply-templates/ ++ </xsl:when> ++ xsl:otherwise ++ fo:block ++ xsl:apply-templates/ ++ </fo:block> ++ </xsl:otherwise> ++ </xsl:choose> + </fo:list-item-body> + </xsl:variable> + +@@ -446,10 +454,18 @@ + </fo:block> + </fo:list-item-label> + <fo:list-item-body start-indent="body-start()"> +- fo:block +- <xsl:apply-templates select="listitem"/> +- </fo:block> +- </fo:list-item-body> ++ xsl:choose ++ <!-- * work around broken passivetex list-item-body rendering --> ++ <xsl:when test="$passivetex.extensions = '1'"> ++ <xsl:apply-templates select="listitem"/> ++ </xsl:when> ++ xsl:otherwise ++ fo:block ++ <xsl:apply-templates select="listitem"/> ++ </fo:block> ++ </xsl:otherwise> ++ </xsl:choose> ++ </fo:list-item-body> + </xsl:variable> + + xsl:choose +@@ -925,9 +941,17 @@ + </fo:block> + </fo:list-item-label> + <fo:list-item-body start-indent="body-start()"> +- fo:block +- xsl:apply-templates/ +- </fo:block> ++ xsl:choose ++ <!-- * work around broken passivetex list-item-body rendering --> ++ <xsl:when test="$passivetex.extensions = '1'"> ++ xsl:apply-templates/ ++ </xsl:when> ++ xsl:otherwise ++ fo:block ++ xsl:apply-templates/ ++ </fo:block> ++ </xsl:otherwise> ++ </xsl:choose> + </fo:list-item-body> + </fo:list-item> + </xsl:template> +@@ -951,9 +975,17 @@ + </fo:block> + </fo:list-item-label> + <fo:list-item-body start-indent="body-start()"> +- fo:block +- xsl:apply-templates/ +- </fo:block> ++ xsl:choose ++ <!-- * work around broken passivetex list-item-body rendering --> ++ <xsl:when test="$passivetex.extensions = '1'"> ++ xsl:apply-templates/ ++ </xsl:when> ++ xsl:otherwise ++ fo:block ++ xsl:apply-templates/ ++ </fo:block> ++ </xsl:otherwise> ++ </xsl:choose> + </fo:list-item-body> + </fo:list-item> + </xsl:template> +@@ -1141,9 +1173,17 @@ + </fo:block> + </fo:list-item-label> + <fo:list-item-body start-indent="body-start()"> +- fo:block +- xsl:apply-templates/ +- </fo:block> ++ xsl:choose ++ <!-- * work around broken passivetex list-item-body rendering --> ++ <xsl:when test="$passivetex.extensions = '1'"> ++ xsl:apply-templates/ ++ </xsl:when> ++ xsl:otherwise ++ fo:block ++ xsl:apply-templates/ ++ </fo:block> ++ </xsl:otherwise> ++ </xsl:choose> + </fo:list-item-body> + </fo:list-item> + </xsl:template> diff --git a/docbook-xsl/patches/docbook-xsl-mandir.patch b/docbook-xsl/patches/docbook-xsl-mandir.patch new file mode 100644 index 0000000..d2c5a7e --- /dev/null +++ b/docbook-xsl/patches/docbook-xsl-mandir.patch @@ -0,0 +1,19 @@ +diff -urNp docbook-xsl-1.76.1-orig/manpages/other.xsl docbook-xsl-1.76.1/manpages/other.xsl +--- docbook-xsl-1.76.1-orig/manpages/other.xsl 2010-08-27 05:14:52.000000000 +0200 ++++ docbook-xsl-1.76.1/manpages/other.xsl 2011-09-06 17:17:07.973737258 +0200 +@@ -595,7 +595,14 @@ manvolnum + <xsl:with-param name="message-prolog">Note: </xsl:with-param> + <xsl:with-param name="message-epilog"> (soelim stub)</xsl:with-param> + <xsl:with-param name="content"> +- <xsl:value-of select="'.so '"/> ++ xsl:choose ++ <xsl:when test="$man.output.in.separate.dir = 0"> ++ <xsl:value-of select="concat('.so man', $section, '/')"/> ++ </xsl:when> ++ xsl:otherwise ++ <xsl:value-of select="'.so '"/> <!-- added case --> ++ </xsl:otherwise> ++ </xsl:choose> + <xsl:call-template name="make.adjusted.man.filename"> + <xsl:with-param name="name" select="$first.refname"/> + <xsl:with-param name="section" select="$section"/> diff --git a/docbook-xsl/patches/docbook-xsl-marginleft.patch b/docbook-xsl/patches/docbook-xsl-marginleft.patch new file mode 100644 index 0000000..31c1b84 --- /dev/null +++ b/docbook-xsl/patches/docbook-xsl-marginleft.patch @@ -0,0 +1,100 @@ +diff -ruNp docbook-xsl-1.74.0.orig/fo/lists.xsl docbook-xsl-1.74.0/fo/lists.xsl +--- docbook-xsl-1.74.0.orig/fo/lists.xsl 2008-06-01 23:36:39.000000000 +0200 ++++ docbook-xsl-1.74.0/fo/lists.xsl 2008-08-06 13:32:46.000000000 +0200 +@@ -324,7 +324,7 @@ + </xsl:when> + <xsl:when test="@termlength"> + <xsl:variable name="termlength.is.number"> +- <xsl:value-of select="@termlength + 0"/> ++ <xsl:value-of select="@termlength"/> + </xsl:variable> + xsl:choose + <xsl:when test="string($termlength.is.number) = 'NaN'"> +@@ -333,15 +333,7 @@ + </xsl:when> + xsl:otherwise + <xsl:value-of select="@termlength"/> +- xsl:choose +- <!-- workaround for passivetex lack of support for non-constant expressions --> +- <xsl:when test="$passivetex.extensions != 0"> +- xsl:textem</xsl:text> +- </xsl:when> +- xsl:otherwise +- xsl:textem * 0.60</xsl:text> +- </xsl:otherwise> +- </xsl:choose> ++ xsl:textem</xsl:text> + </xsl:otherwise> + </xsl:choose> + </xsl:when> +@@ -350,15 +342,7 @@ + <xsl:with-param name="terms" select="varlistentry/term"/> + <xsl:with-param name="maxlength" select="$variablelist.max.termlength"/> + </xsl:call-template> +- xsl:choose +- <!-- workaround for passivetex lack of support for non-constant expressions --> +- <xsl:when test="$passivetex.extensions != 0"> +- xsl:textem</xsl:text> +- </xsl:when> +- xsl:otherwise +- xsl:textem * 0.60</xsl:text> +- </xsl:otherwise> +- </xsl:choose> ++ xsl:textem</xsl:text> + </xsl:otherwise> + </xsl:choose> + </xsl:variable> +@@ -372,17 +356,7 @@ + + <xsl:variable name="label-separation">1em</xsl:variable> + <xsl:variable name="distance-between-starts"> +- xsl:choose +- <!-- workaround for passivetex lack of support for non-constant expressions --> +- <xsl:when test="$passivetex.extensions != 0"> +- <xsl:value-of select="$termlength"/> +- </xsl:when> +- xsl:otherwise +- <xsl:value-of select="$termlength"/> +- xsl:text+</xsl:text> +- <xsl:value-of select="$label-separation"/> +- </xsl:otherwise> +- </xsl:choose> ++ <xsl:value-of select="$termlength"/> + </xsl:variable> + + <xsl:if test="title"> +diff -ruNp docbook-xsl-1.74.0.orig/fo/param.xsl docbook-xsl-1.74.0/fo/param.xsl +--- docbook-xsl-1.74.0.orig/fo/param.xsl 2008-06-02 01:06:18.000000000 +0200 ++++ docbook-xsl-1.74.0/fo/param.xsl 2008-08-06 13:32:46.000000000 +0200 +@@ -133,8 +133,8 @@ + <xsl:attribute-set name="component.title.properties"> + <xsl:attribute name="keep-with-next.within-column">always</xsl:attribute> + <xsl:attribute name="space-before.optimum"><xsl:value-of select="concat($body.font.master, 'pt')"/></xsl:attribute> +- <xsl:attribute name="space-before.minimum"><xsl:value-of select="concat($body.font.master, 'pt * 0.8')"/></xsl:attribute> +- <xsl:attribute name="space-before.maximum"><xsl:value-of select="concat($body.font.master, 'pt * 1.2')"/></xsl:attribute> ++ <xsl:attribute name="space-before.minimum"><xsl:value-of select="concat($body.font.master*0.8, 'pt')"/></xsl:attribute> ++ <xsl:attribute name="space-before.maximum"><xsl:value-of select="concat($body.font.master*1.2, 'pt')"/></xsl:attribute> + <xsl:attribute name="hyphenate">false</xsl:attribute> + <xsl:attribute name="text-align"> + xsl:choose +diff -urNp docbook-xsl-1.75.0-orig/fo/pagesetup.xsl docbook-xsl-1.75.0/fo/pagesetup.xsl +--- docbook-xsl-1.75.0-orig/fo/pagesetup.xsl 2009-05-11 11:40:49.000000000 +0200 ++++ docbook-xsl-1.75.0/fo/pagesetup.xsl 2009-05-11 11:42:29.000000000 +0200 +@@ -30,16 +30,7 @@ + </xsl:param> + + <xsl:param name="margin.left.inner"> +- xsl:choose +- <xsl:when test="$passivetex.extensions != 0"> +- <xsl:value-of select="$page.margin.inner"/> +- </xsl:when> +- xsl:otherwise +- <xsl:value-of select="$page.margin.inner"/> +- xsl:text - </xsl:text> +- <xsl:value-of select="$title.margin.left"/> +- </xsl:otherwise> +- </xsl:choose> ++ <xsl:value-of select="$page.margin.inner"/> + </xsl:param> + + <xsl:template name="setup.pagemasters"> diff --git a/docbook-xsl/patches/docbook-xsl-newmethods.patch b/docbook-xsl/patches/docbook-xsl-newmethods.patch new file mode 100644 index 0000000..debc51b --- /dev/null +++ b/docbook-xsl/patches/docbook-xsl-newmethods.patch @@ -0,0 +1,394 @@ +diff -ruNp docbook-xsl-1.74.0.orig/html/docbook.xsl docbook-xsl-1.74.0/html/docbook.xsl +--- docbook-xsl-1.74.0.orig/html/docbook.xsl 2008-06-01 23:36:39.000000000 +0200 ++++ docbook-xsl-1.74.0/html/docbook.xsl 2008-08-06 13:37:35.000000000 +0200 +@@ -26,6 +26,7 @@ + <xsl:include href="../VERSION"/> + <xsl:include href="param.xsl"/> + <xsl:include href="../lib/lib.xsl"/> ++<xsl:include href="../lib/dumpfragment.xsl"/> + <xsl:include href="../common/l10n.xsl"/> + <xsl:include href="../common/common.xsl"/> + <xsl:include href="../common/utility.xsl"/> +@@ -44,6 +45,7 @@ + <xsl:include href="graphics.xsl"/> + <xsl:include href="xref.xsl"/> + <xsl:include href="formal.xsl"/> ++<xsl:include href="dtbl.xsl"/> + <xsl:include href="table.xsl"/> + <xsl:include href="htmltbl.xsl"/> + <xsl:include href="sections.xsl"/> +diff -ruNp docbook-xsl-1.74.0.orig/html/dtbl.xsl docbook-xsl-1.74.0/html/dtbl.xsl +--- docbook-xsl-1.74.0.orig/html/dtbl.xsl 1970-01-01 01:00:00.000000000 +0100 ++++ docbook-xsl-1.74.0/html/dtbl.xsl 2008-08-06 13:37:35.000000000 +0200 +@@ -0,0 +1,293 @@ ++<?xml version="1.0" encoding="US-ASCII"?> ++<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" ++ xmlns:exsl="http://exslt.org/common" ++ xmlns:func="http://exslt.org/functions" ++ xmlns:dtbl="http://docbook.sourceforge.net/dtbl" ++ extension-element-prefixes="func" ++ exclude-result-prefixes="exsl func dtbl" ++ version="1.0"> ++ ++<func:function name="dtbl:convertLength"> ++ <xsl:param name="arbitrary.length"/> ++ ++ <xsl:variable name="pixels.per.inch" select="96"/> ++ ++ <xsl:variable name="unscaled.length" ++ select="translate($arbitrary.length, 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz ', '')"/> ++ ++ <xsl:variable name="units" ++ select="translate($arbitrary.length,'+-0123456789. ', '')"/> ++ ++ <xsl:variable name="scaled.length"> ++ xsl:choose ++ <xsl:when test="$units='in'"> ++ <xsl:value-of select="$unscaled.length * $pixels.per.inch"/> ++ </xsl:when> ++ <xsl:when test="$units='cm'"> ++ <xsl:value-of select="$unscaled.length * ($pixels.per.inch div 2.54)"/> ++ </xsl:when> ++ <xsl:when test="$units='mm'"> ++ <xsl:value-of select="$unscaled.length * ($pixels.per.inch div 25.4)"/> ++ </xsl:when> ++ <xsl:when test="$units='pc'"> ++ <xsl:value-of select="$unscaled.length * (($pixels.per.inch div 72) * 12)"/> ++ </xsl:when> ++ <xsl:when test="$units='pt'"> ++ <xsl:value-of select="$unscaled.length * ($pixels.per.inch div 72)"/> ++ </xsl:when> ++ <xsl:when test="$units='px' or $units=''"> ++ <xsl:value-of select="$unscaled.length"/> ++ </xsl:when> ++ xsl:otherwise ++ <xsl:message terminate="no"> ++ xsl:text"</xsl:text> ++ <xsl:value-of select="$units"/> ++ xsl:text" is not a known unit. Applying scaling factor of 1 instead.</xsl:text> ++ </xsl:message> ++ <xsl:value-of select="$unscaled.length"/> ++ </xsl:otherwise> ++ </xsl:choose> ++ </xsl:variable> ++ ++ <func:result select="round($scaled.length)"/> ++</func:function> ++ ++<func:function name="dtbl:adjustColumnWidths"> ++ <xsl:param name="colgroup"/> ++ ++ <xsl:if test="$adjustColumnWidths.debug"> ++ xsl:message ++ xsl:textentering adjustColumnWidths(</xsl:text> ++ <xsl:call-template name="dump-fragment"> ++ <xsl:with-param name="fragment" select="$colgroup"/> ++ </xsl:call-template> ++ xsl:text)</xsl:text> ++ </xsl:message> ++ </xsl:if> ++ ++ <xsl:variable name="expanded.colgroup"> ++ <xsl:apply-templates select="exsl:node-set($colgroup)/*" mode="dtbl-split-widths"/> ++ </xsl:variable> ++ ++ <xsl:variable name="absolute.widths.total"> ++ <xsl:value-of select="sum(exsl:node-set($expanded.colgroup)//col/@abswidth)"/> ++ </xsl:variable> ++ ++ <xsl:variable name="relative.widths.total"> ++ <xsl:value-of select="sum(exsl:node-set($expanded.colgroup)//col/@relwidth)"/> ++ </xsl:variable> ++ ++ <xsl:if test="$adjustColumnWidths.debug"> ++ xsl:message ++ xsl:texttotal relative widths = (</xsl:text> ++ <xsl:value-of select="$relative.widths.total"/> ++ xsl:text)</xsl:text> ++ </xsl:message> ++ xsl:message ++ xsl:texttotal absolute widths = (</xsl:text> ++ <xsl:value-of select="$absolute.widths.total"/> ++ xsl:text)</xsl:text> ++ </xsl:message> ++ </xsl:if> ++ ++ <xsl:variable name="adjusted.colgroup"> ++ xsl:choose ++ <xsl:when test="$relative.widths.total = 0"> ++ <xsl:if test="$adjustColumnWidths.debug"> ++ xsl:messageall widths are absolute</xsl:message> ++ </xsl:if> ++ <xsl:apply-templates select="exsl:node-set($expanded.colgroup)/*" ++ mode="dtbl-use-absolute-widths"/> ++ </xsl:when> ++ <xsl:when test="$absolute.widths.total = 0"> ++ <xsl:if test="$adjustColumnWidths.debug"> ++ xsl:messageall widths are relative</xsl:message> ++ </xsl:if> ++ <xsl:apply-templates select="exsl:node-set($expanded.colgroup)/*" ++ mode="dtbl-use-relative-widths"> ++ <xsl:with-param name="relative.widths.total" ++ select="$relative.widths.total"/> ++ </xsl:apply-templates> ++ </xsl:when> ++ </xsl:choose> ++ </xsl:variable> ++ ++ <xsl:variable name="corrected.adjusted.colgroup"> ++ xsl:choose ++ <xsl:when test="$relative.widths.total = 0"> ++ <xsl:copy-of select="$adjusted.colgroup"/> ++ </xsl:when> ++ xsl:otherwise ++ <xsl:variable name="widths.total" ++ select="sum(exsl:node-set($adjusted.colgroup)//col/@width)"/> ++ <xsl:variable name="n.columns" ++ select="count(exsl:node-set($adjusted.colgroup)//col)"/> ++ <xsl:variable name="error" ++ select="100 - $widths.total"/> ++ <xsl:variable name="first.bad.column" ++ select="($n.columns - $error) + 1"/> ++ <xsl:apply-templates select="exsl:node-set($adjusted.colgroup)/*" ++ mode="dtbl-correct-rounding-error"> ++ <xsl:with-param name="first.bad.column" ++ select="$first.bad.column"/> ++ </xsl:apply-templates> ++ </xsl:otherwise> ++ </xsl:choose> ++ </xsl:variable> ++ ++ <xsl:if test="$adjustColumnWidths.debug"> ++ xsl:message ++ xsl:textresult = (</xsl:text> ++ <xsl:call-template name="dump-fragment"> ++ <xsl:with-param name="fragment" select="$corrected.adjusted.colgroup"/> ++ </xsl:call-template> ++ xsl:text)</xsl:text> ++ </xsl:message> ++ </xsl:if> ++ ++ <func:result select="$corrected.adjusted.colgroup"/> ++</func:function> ++ ++<xsl:template match="colgroup" mode="dtbl-correct-rounding-error"> ++ <xsl:param name="first.bad.column"/> ++ ++ <xsl:if test="$adjustColumnWidths.debug"> ++ xsl:message ++ xsl:textfirst.bad.column = (</xsl:text> ++ <xsl:value-of select="$first.bad.column"/> ++ xsl:text)</xsl:text> ++ </xsl:message> ++ </xsl:if> ++ ++ <colgroup> ++ <xsl:for-each select="col[position() < $first.bad.column]"> ++ <xsl:element name="col"> ++ <xsl:attribute name="width"> ++ <xsl:value-of select="concat(@width, '%')"/> ++ </xsl:attribute> ++ </xsl:element> ++ </xsl:for-each> ++ <xsl:for-each select="col[position() >= $first.bad.column]"> ++ <xsl:element name="col"> ++ <xsl:attribute name="width"> ++ <xsl:value-of select="concat(@width + 1, '%')"/> ++ </xsl:attribute> ++ </xsl:element> ++ </xsl:for-each> ++ </colgroup> ++</xsl:template> ++ ++<xsl:template match="col" mode="dtbl-correct-rounding-error"> ++ <xsl:param name="relative.widths.total"/> ++ <xsl:param name="error"/> ++ ++ <xsl:element name="col"> ++ <xsl:attribute name="width"> ++ <xsl:value-of select="concat('', round((@relwidth div $relative.widths.total) * 100))"/> ++ </xsl:attribute> ++ <xsl:apply-templates mode="dtbl-use-absolute-widths"/> ++ </xsl:element> ++</xsl:template> ++ ++<xsl:template match="colgroup" mode="dtbl-use-relative-widths"> ++ <xsl:param name="relative.widths.total"/> ++ ++ <colgroup> ++ <xsl:apply-templates mode="dtbl-use-relative-widths"> ++ <xsl:with-param name="relative.widths.total" ++ select="$relative.widths.total"/> ++ </xsl:apply-templates> ++ </colgroup> ++</xsl:template> ++ ++<xsl:template match="col" mode="dtbl-use-relative-widths"> ++ <xsl:param name="relative.widths.total"/> ++ ++ <xsl:element name="col"> ++ <xsl:attribute name="width"> ++ <xsl:value-of select="round((@relwidth div $relative.widths.total) * 100)"/> ++ </xsl:attribute> ++ <xsl:apply-templates mode="dtbl-use-absolute-widths"/> ++ </xsl:element> ++</xsl:template> ++ ++<xsl:template match="colgroup" mode="dtbl-use-absolute-widths"> ++ <colgroup> ++ <xsl:apply-templates mode="dtbl-use-absolute-widths"/> ++ </colgroup> ++</xsl:template> ++ ++<xsl:template match="col" mode="dtbl-use-absolute-widths"> ++ <xsl:element name="col"> ++ <xsl:attribute name="width"> ++ <xsl:value-of select="@abswidth"/> ++ </xsl:attribute> ++ <xsl:apply-templates mode="dtbl-use-absolute-widths"/> ++ </xsl:element> ++</xsl:template> ++ ++<xsl:template match="colgroup" mode="dtbl-split-widths"> ++ <colgroup> ++ <xsl:apply-templates mode="dtbl-split-widths"/> ++ </colgroup> ++</xsl:template> ++ ++<xsl:template match="col" mode="dtbl-split-widths"> ++ ++ <!-- width = @width ? @width : '1*' --> ++ <xsl:variable name="width"> ++ xsl:choose ++ <xsl:when test="@width != ''"> ++ <xsl:value-of select="@width"/> ++ </xsl:when> ++ xsl:otherwise ++ xsl:text1*</xsl:text> ++ </xsl:otherwise> ++ </xsl:choose> ++ </xsl:variable> ++ ++ <!-- absolute.width = contains($width,'*') ? substring-after($width, '*') : $width --> ++ <xsl:variable name="absolute.width"> ++ xsl:choose ++ <xsl:when test="contains($width, '*')"> ++ <xsl:value-of select="substring-after($width, '*')"/> ++ </xsl:when> ++ xsl:otherwise ++ <xsl:value-of select="$width"/> ++ </xsl:otherwise> ++ </xsl:choose> ++ </xsl:variable> ++ ++ <xsl:variable name="converted.absolute.width"> ++ xsl:choose ++ <xsl:when test="$absolute.width != ''"> ++ <xsl:value-of select="dtbl:convertLength($absolute.width)"/> ++ </xsl:when> ++ xsl:otherwise0</xsl:otherwise> ++ </xsl:choose> ++ </xsl:variable> ++ ++ <xsl:variable name="relative.width"> ++ xsl:choose ++ <xsl:when test="substring-before($width, '*') != ''"> ++ <xsl:value-of select="substring-before($width, '*')"/> ++ </xsl:when> ++ xsl:otherwise0</xsl:otherwise> ++ </xsl:choose> ++ </xsl:variable> ++ ++ <xsl:element name="col"> ++ <xsl:attribute name="width"> ++ <xsl:value-of select="$width"/> ++ </xsl:attribute> ++ <xsl:attribute name="relwidth"> ++ <xsl:value-of select="$relative.width"/> ++ </xsl:attribute> ++ <xsl:attribute name="abswidth"> ++ <xsl:value-of select="$converted.absolute.width"/> ++ </xsl:attribute> ++ <xsl:apply-templates mode="dtbl-split-widths"/> ++ </xsl:element> ++</xsl:template> ++ ++</xsl:stylesheet> +diff -ruNp docbook-xsl-1.74.0.orig/html/table.xsl docbook-xsl-1.74.0/html/table.xsl +--- docbook-xsl-1.74.0.orig/html/table.xsl 2008-06-01 23:36:39.000000000 +0200 ++++ docbook-xsl-1.74.0/html/table.xsl 2008-08-06 13:37:35.000000000 +0200 +@@ -5,7 +5,8 @@ + xmlns:xtbl="xalan://com.nwalsh.xalan.Table" + xmlns:lxslt="http://xml.apache.org/xslt" + xmlns:ptbl="http://nwalsh.com/xslt/ext/xsltproc/python/Table" +- exclude-result-prefixes="doc stbl xtbl lxslt ptbl" ++ xmlns:dtbl="http://docbook.sourceforge.net/dtbl" ++ exclude-result-prefixes="doc stbl xtbl lxslt ptbl dtbl" + version='1.0'> + + <xsl:include href="../common/table.xsl"/> +@@ -365,6 +366,9 @@ + <xsl:when test="$use.extensions != 0 + and $tablecolumns.extension != 0"> + xsl:choose ++ <xsl:when test="function-available('dtbl:convertLength')"> ++ <xsl:value-of select="dtbl:convertLength($table.width)"/> ++ </xsl:when> + <xsl:when test="function-available('stbl:convertLength')"> + <xsl:value-of select="stbl:convertLength($table.width)"/> + </xsl:when> +@@ -389,6 +393,9 @@ + <xsl:when test="$use.extensions != 0 + and $tablecolumns.extension != 0"> + xsl:choose ++ <xsl:when test="function-available('dtbl:adjustColumnWidths')"> ++ <xsl:copy-of select="dtbl:adjustColumnWidths($colgroup)"/> ++ </xsl:when> + <xsl:when test="function-available('stbl:adjustColumnWidths')"> + <xsl:copy-of select="stbl:adjustColumnWidths($colgroup)"/> + </xsl:when> +diff -ruNp docbook-xsl-1.74.0.orig/lib/dumpfragment.xsl docbook-xsl-1.74.0/lib/dumpfragment.xsl +--- docbook-xsl-1.74.0.orig/lib/dumpfragment.xsl 1970-01-01 01:00:00.000000000 +0100 ++++ docbook-xsl-1.74.0/lib/dumpfragment.xsl 2008-08-06 13:37:35.000000000 +0200 +@@ -0,0 +1,30 @@ ++<?xml version="1.0" encoding="US-ASCII"?> ++<xsl:stylesheet version="1.0" ++ xmlns:exsl="http://exslt.org/common" ++ xmlns:xsl="http://www.w3.org/1999/XSL/Transform" ++ xmlns="http://www.w3.org/1999/xhtml" ++ exclude-result-prefixes="exsl"> ++ ++<xsl:template name="dump-fragment"> ++ <xsl:param name="fragment"/> ++ <xsl:apply-templates select="exsl:node-set($fragment)/*" mode="dump-fragment"/> ++</xsl:template> ++ ++<xsl:template match="@*" mode="dump-fragment"> ++ xsl:text </xsl:text> ++ <xsl:value-of select="local-name(.)"/> ++ xsl:text="</xsl:text> ++ <xsl:value-of select="."/> ++ xsl:text"</xsl:text> ++</xsl:template> ++ ++<xsl:template match="*" mode="dump-fragment"> ++ xsl:text<</xsl:text><xsl:value-of select="local-name(.)"/> ++ <xsl:apply-templates select="@*" mode="dump-fragment"/> ++ xsl:text></xsl:text> ++ <xsl:apply-templates mode="dump-fragment"/> ++ xsl:text</</xsl:text><xsl:value-of select="local-name(.)"/> ++ xsl:text></xsl:text> ++</xsl:template> ++ ++</xsl:stylesheet> +diff -urNp docbook-xsl-1.76.0-orig/html/param.xsl docbook-xsl-1.76.0/html/param.xsl +--- docbook-xsl-1.76.0-orig/html/param.xsl 2010-08-31 09:27:22.000000000 +0200 ++++ docbook-xsl-1.76.0/html/param.xsl 2010-09-06 11:01:07.916914161 +0200 +@@ -68,6 +68,7 @@ div.annotation-close { position: absolut + http://docbook.sourceforge.net/release/images/annot-close.png</xsl:param> + <xsl:param name="annotation.graphic.open">http://docbook.sourceforge.net/release/images/annot-open.png</xsl:param> + ++<xsl:param name="adjustColumnWidths.debug" select="false()"/> + <xsl:param name="annotation.js"> + xsl:texthttp://docbook.sourceforge.net/release/script/AnchorPosition.js http://docbook.sourceforge.net/release/script/PopupWindow.js</xsl:text></xsl:param> + diff --git a/docbook-xsl/patches/docbook-xsl-non-constant-expressions.patch b/docbook-xsl/patches/docbook-xsl-non-constant-expressions.patch new file mode 100644 index 0000000..0c3f6be --- /dev/null +++ b/docbook-xsl/patches/docbook-xsl-non-constant-expressions.patch @@ -0,0 +1,25 @@ +diff -ruNp docbook-xsl-1.74.0.orig/fo/param.xsl docbook-xsl-1.74.0/fo/param.xsl +--- docbook-xsl-1.74.0.orig/fo/param.xsl 2008-08-06 13:32:46.000000000 +0200 ++++ docbook-xsl-1.74.0/fo/param.xsl 2008-08-06 13:38:36.000000000 +0200 +@@ -23,8 +23,8 @@ + <xsl:attribute name="keep-with-next.within-column">always</xsl:attribute> + <xsl:attribute name="keep-with-next.within-column">always</xsl:attribute> + <xsl:attribute name="space-before.optimum"><xsl:value-of select="concat($body.font.master, 'pt')"/></xsl:attribute> +- <xsl:attribute name="space-before.minimum"><xsl:value-of select="concat($body.font.master, 'pt * 0.8')"/></xsl:attribute> +- <xsl:attribute name="space-before.maximum"><xsl:value-of select="concat($body.font.master, 'pt * 1.2')"/></xsl:attribute> ++ <xsl:attribute name="space-before.minimum"><xsl:value-of select="concat(($body.font.master * 0.8), 'pt')"/></xsl:attribute> ++ <xsl:attribute name="space-before.maximum"><xsl:value-of select="concat(($body.font.master * 1.2), 'pt')"/></xsl:attribute> + <xsl:attribute name="hyphenate">false</xsl:attribute> + <xsl:attribute name="text-align">center</xsl:attribute> + </xsl:attribute-set> +@@ -334,8 +334,8 @@ set toc,title + <xsl:attribute name="font-weight">bold</xsl:attribute> + <xsl:attribute name="keep-with-next.within-column">always</xsl:attribute> + <xsl:attribute name="space-before.optimum"><xsl:value-of select="concat($body.font.master,'pt')"/></xsl:attribute> +- <xsl:attribute name="space-before.minimum"><xsl:value-of select="concat($body.font.master,'pt * 0.8')"/></xsl:attribute> +- <xsl:attribute name="space-before.maximum"><xsl:value-of select="concat($body.font.master,'pt * 1.2')"/></xsl:attribute> ++ <xsl:attribute name="space-before.minimum"><xsl:value-of select="concat(($body.font.master * 0.8),'pt')"/></xsl:attribute> ++ <xsl:attribute name="space-before.maximum"><xsl:value-of select="concat(($body.font.master * 1.2),'pt')"/></xsl:attribute> + <xsl:attribute name="start-indent">0pt</xsl:attribute> + </xsl:attribute-set> + <xsl:attribute-set name="index.entry.properties"> diff --git a/docbook-xsl/patches/docbook-xsl-pagesetup.patch b/docbook-xsl/patches/docbook-xsl-pagesetup.patch new file mode 100644 index 0000000..e4d77ff --- /dev/null +++ b/docbook-xsl/patches/docbook-xsl-pagesetup.patch @@ -0,0 +1,227 @@ +diff -ruNp docbook-xsl-1.74.0.orig/fo/pagesetup.xsl docbook-xsl-1.74.0/fo/pagesetup.xsl +--- docbook-xsl-1.74.0.orig/fo/pagesetup.xsl 2008-06-01 23:36:39.000000000 +0200 ++++ docbook-xsl-1.74.0/fo/pagesetup.xsl 2008-08-06 13:31:11.000000000 +0200 +@@ -1697,36 +1697,81 @@ + <xsl:with-param name="gentext-key" select="$gentext-key"/> + </xsl:call-template> + +- <fo:table-column column-number="1"> +- <xsl:attribute name="column-width"> +- xsl:textproportional-column-width(</xsl:text> +- <xsl:call-template name="header.footer.width"> +- <xsl:with-param name="location">header</xsl:with-param> +- <xsl:with-param name="position" select="$column1"/> +- </xsl:call-template> +- xsl:text)</xsl:text> +- </xsl:attribute> +- </fo:table-column> +- <fo:table-column column-number="2"> +- <xsl:attribute name="column-width"> +- xsl:textproportional-column-width(</xsl:text> +- <xsl:call-template name="header.footer.width"> +- <xsl:with-param name="location">header</xsl:with-param> +- <xsl:with-param name="position" select="2"/> +- </xsl:call-template> +- xsl:text)</xsl:text> +- </xsl:attribute> +- </fo:table-column> +- <fo:table-column column-number="3"> +- <xsl:attribute name="column-width"> +- xsl:textproportional-column-width(</xsl:text> +- <xsl:call-template name="header.footer.width"> +- <xsl:with-param name="location">header</xsl:with-param> +- <xsl:with-param name="position" select="$column3"/> +- </xsl:call-template> +- xsl:text)</xsl:text> +- </xsl:attribute> +- </fo:table-column> ++ xsl:choose ++ <xsl:when test="$passivetex.extensions != 0"> ++ <fo:table-column column-number="1"> ++ <xsl:attribute name="column-width"> ++ <xsl:call-template name="header.footer.width"> ++ <xsl:with-param name="location">header</xsl:with-param> ++ <xsl:with-param name="position" select="$column1"/> ++ </xsl:call-template> ++ xsl:text%</xsl:text> ++ </xsl:attribute> ++ </fo:table-column> ++ </xsl:when> ++ xsl:otherwise ++ <fo:table-column column-number="1"> ++ <xsl:attribute name="column-width"> ++ xsl:textproportional-column-width(</xsl:text> ++ <xsl:call-template name="header.footer.width"> ++ <xsl:with-param name="location">header</xsl:with-param> ++ <xsl:with-param name="position" select="$column1"/> ++ </xsl:call-template> ++ xsl:text)</xsl:text> ++ </xsl:attribute> ++ </fo:table-column> ++ </xsl:otherwise> ++ </xsl:choose> ++ xsl:choose ++ <xsl:when test="$passivetex.extensions != 0"> ++ <fo:table-column column-number="2"> ++ <xsl:attribute name="column-width"> ++ <xsl:call-template name="header.footer.width"> ++ <xsl:with-param name="location">header</xsl:with-param> ++ <xsl:with-param name="position" select="2"/> ++ </xsl:call-template> ++ xsl:text%</xsl:text> ++ </xsl:attribute> ++ </fo:table-column> ++ </xsl:when> ++ xsl:otherwise ++ <fo:table-column column-number="2"> ++ <xsl:attribute name="column-width"> ++ xsl:textproportional-column-width(</xsl:text> ++ <xsl:call-template name="header.footer.width"> ++ <xsl:with-param name="location">header</xsl:with-param> ++ <xsl:with-param name="position" select="2"/> ++ </xsl:call-template> ++ xsl:text)</xsl:text> ++ </xsl:attribute> ++ </fo:table-column> ++ </xsl:otherwise> ++ </xsl:choose> ++ xsl:choose ++ <xsl:when test="$passivetex.extensions != 0"> ++ <fo:table-column column-number="3"> ++ <xsl:attribute name="column-width"> ++ <xsl:call-template name="header.footer.width"> ++ <xsl:with-param name="location">header</xsl:with-param> ++ <xsl:with-param name="position" select="$column3"/> ++ </xsl:call-template> ++ xsl:text%</xsl:text> ++ </xsl:attribute> ++ </fo:table-column> ++ </xsl:when> ++ xsl:otherwise ++ <fo:table-column column-number="3"> ++ <xsl:attribute name="column-width"> ++ xsl:textproportional-column-width(</xsl:text> ++ <xsl:call-template name="header.footer.width"> ++ <xsl:with-param name="location">header</xsl:with-param> ++ <xsl:with-param name="position" select="$column3"/> ++ </xsl:call-template> ++ xsl:text)</xsl:text> ++ </xsl:attribute> ++ </fo:table-column> ++ </xsl:otherwise> ++ </xsl:choose> + + fo:table-body + fo:table-row +@@ -2021,36 +2066,81 @@ + <xsl:with-param name="sequence" select="$sequence"/> + <xsl:with-param name="gentext-key" select="$gentext-key"/> + </xsl:call-template> +- <fo:table-column column-number="1"> +- <xsl:attribute name="column-width"> +- xsl:textproportional-column-width(</xsl:text> +- <xsl:call-template name="header.footer.width"> +- <xsl:with-param name="location">footer</xsl:with-param> +- <xsl:with-param name="position" select="$column1"/> +- </xsl:call-template> +- xsl:text)</xsl:text> +- </xsl:attribute> +- </fo:table-column> +- <fo:table-column column-number="2"> +- <xsl:attribute name="column-width"> +- xsl:textproportional-column-width(</xsl:text> +- <xsl:call-template name="header.footer.width"> +- <xsl:with-param name="location">footer</xsl:with-param> +- <xsl:with-param name="position" select="2"/> +- </xsl:call-template> +- xsl:text)</xsl:text> +- </xsl:attribute> +- </fo:table-column> +- <fo:table-column column-number="3"> +- <xsl:attribute name="column-width"> +- xsl:textproportional-column-width(</xsl:text> +- <xsl:call-template name="header.footer.width"> +- <xsl:with-param name="location">footer</xsl:with-param> +- <xsl:with-param name="position" select="$column3"/> +- </xsl:call-template> +- xsl:text)</xsl:text> +- </xsl:attribute> +- </fo:table-column> ++ xsl:choose ++ <xsl:when test="$passivetex.extensions != 0"> ++ <fo:table-column column-number="1"> ++ <xsl:attribute name="column-width"> ++ <xsl:call-template name="header.footer.width"> ++ <xsl:with-param name="location">footer</xsl:with-param> ++ <xsl:with-param name="position" select="$column1"/> ++ </xsl:call-template> ++ xsl:text%</xsl:text> ++ </xsl:attribute> ++ </fo:table-column> ++ </xsl:when> ++ xsl:otherwise ++ <fo:table-column column-number="1"> ++ <xsl:attribute name="column-width"> ++ xsl:textproportional-column-width(</xsl:text> ++ <xsl:call-template name="header.footer.width"> ++ <xsl:with-param name="location">footer</xsl:with-param> ++ <xsl:with-param name="position" select="$column1"/> ++ </xsl:call-template> ++ xsl:text)</xsl:text> ++ </xsl:attribute> ++ </fo:table-column> ++ </xsl:otherwise> ++ </xsl:choose> ++ xsl:choose ++ <xsl:when test="$passivetex.extensions != 0"> ++ <fo:table-column column-number="2"> ++ <xsl:attribute name="column-width"> ++ <xsl:call-template name="header.footer.width"> ++ <xsl:with-param name="location">footer</xsl:with-param> ++ <xsl:with-param name="position" select="2"/> ++ </xsl:call-template> ++ xsl:text%</xsl:text> ++ </xsl:attribute> ++ </fo:table-column> ++ </xsl:when> ++ xsl:otherwise ++ <fo:table-column column-number="2"> ++ <xsl:attribute name="column-width"> ++ xsl:textproportional-column-width(</xsl:text> ++ <xsl:call-template name="header.footer.width"> ++ <xsl:with-param name="location">footer</xsl:with-param> ++ <xsl:with-param name="position" select="2"/> ++ </xsl:call-template> ++ xsl:text)</xsl:text> ++ </xsl:attribute> ++ </fo:table-column> ++ </xsl:otherwise> ++ </xsl:choose> ++ xsl:choose ++ <xsl:when test="$passivetex.extensions != 0"> ++ <fo:table-column column-number="3"> ++ <xsl:attribute name="column-width"> ++ <xsl:call-template name="header.footer.width"> ++ <xsl:with-param name="location">footer</xsl:with-param> ++ <xsl:with-param name="position" select="$column3"/> ++ </xsl:call-template> ++ xsl:text%</xsl:text> ++ </xsl:attribute> ++ </fo:table-column> ++ </xsl:when> ++ xsl:otherwise ++ <fo:table-column column-number="3"> ++ <xsl:attribute name="column-width"> ++ xsl:textproportional-column-width(</xsl:text> ++ <xsl:call-template name="header.footer.width"> ++ <xsl:with-param name="location">footer</xsl:with-param> ++ <xsl:with-param name="position" select="$column3"/> ++ </xsl:call-template> ++ xsl:text)</xsl:text> ++ </xsl:attribute> ++ </fo:table-column> ++ </xsl:otherwise> ++ </xsl:choose> + + fo:table-body + fo:table-row diff --git a/dracut/dracut.nm b/dracut/dracut.nm index 2638db4..8f2e5ce 100644 --- a/dracut/dracut.nm +++ b/dracut/dracut.nm @@ -5,7 +5,7 @@
name = dracut version = 010 -release = 3 +release = 4 arch = noarch
groups = System/Boot @@ -21,12 +21,9 @@ source_dl = sources = %{thisapp}.tar.bz2
build - prepare_cmds - # Remove all man pages. - # XXX requires docbook - cd %{DIR_APP} && sed -i Makefile \ - -e "s/^all:.*/all: $%{targets}/" \ - -e "/.*man.*/d" + requires + docbook-utils + docbook-xsl end
install diff --git a/iputils/iputils.nm b/iputils/iputils.nm index 27b5fde..4616ba2 100644 --- a/iputils/iputils.nm +++ b/iputils/iputils.nm @@ -5,7 +5,7 @@
name = iputils version = s20071127 -release = 1 +release = 2
groups = Base Networking/Tools url = http://www.skbuff.net/iputils @@ -13,13 +13,13 @@ license = BSD summary = Network monitoring tools including ping.
description - The iputils package contains basic utilities for monitoring a network, \ - including ping. The ping command sends a series of ICMP protocol \ - ECHO_REQUEST packets to a specified network host to discover whether \ + The iputils package contains basic utilities for monitoring a network, + including ping. The ping command sends a series of ICMP protocol + ECHO_REQUEST packets to a specified network host to discover whether the target machine is alive and receiving network traffic. end
-source_dl = +source_dl = http://www.skbuff.net/iputils/ sources = %{thisapp}.tar.bz2
patches = %{thisapp}-addrcache.patch @@ -37,12 +37,19 @@ patches += %{thisapp}-output.patch
build requires + docbook-utils libcap-devel libidn-devel end
+ # Generate manpages with docbook. + build_cmds + make -C doc man + end + install mkdir -pv %{BUILDROOT}/{bin,sbin} %{BUILDROOT}/usr/sbin + mkdir -pv %{BUILDROOT}/usr/share/man/man8
install -cp clockdiff %{BUILDROOT}/usr/sbin/ install -cp arping %{BUILDROOT}/sbin/ @@ -52,11 +59,20 @@ build install -cp tracepath %{BUILDROOT}/bin/ install -cp tracepath6 %{BUILDROOT}/bin/
+ install -cp doc/clockdiff.8 %{BUILDROOT}/usr/share/man/man8/ + install -cp doc/arping.8 %{BUILDROOT}/usr/share/man/man8/ + install -cp doc/ping.8 %{BUILDROOT}/usr/share/man/man8/ + install -cp doc/rdisc.8 %{BUILDROOT}/usr/share/man/man8/ + install -cp doc/tracepath.8 %{BUILDROOT}/usr/share/man/man8/ + ln -svf ../../sbin/arping %{BUILDROOT}/usr/sbin/arping ln -svf ../../bin/ping6 %{BUILDROOT}/usr/sbin/ ln -svf ../../bin/tracepath %{BUILDROOT}/usr/sbin/ ln -svf ../../bin/tracepath6 %{BUILDROOT}/usr/sbin/
+ ln -s ping.8 %{BUILDROOT}/usr/share/man/man8/ping6.8 + ln -s tracepath.8 %{BUILDROOT}/usr/share/man/man8/tracepath6.8 + setcap cap_net_admin=ep %{BUILDROOT}/bin/ping setcap cap_net_admin=ep %{BUILDROOT}/bin/ping6 end diff --git a/openjade/openjade.nm b/openjade/openjade.nm new file mode 100644 index 0000000..fe2ca1a --- /dev/null +++ b/openjade/openjade.nm @@ -0,0 +1,96 @@ +############################################################################### +# IPFire.org - An Open Source Firewall Solution # +# Copyright (C) - IPFire Development Team info@ipfire.org # +############################################################################### + +name = openjade +version = 1.3.2 +release = 2 + +groups = Application/Text +url = http://openjade.sourceforge.net/ +license = MIT +summary = A DSSSL implementation. + +description + OpenJade is an implementation of the ISO/IEC 10179:1996 standard DSSSL + (Document Style Semantics and Specification Language). +end + +source_dl = http://downloads.sourceforge.net/project/%%7Bname%7D/%%7Bname%7D/%%7Bthisapp... + +build + requires + gcc-c++ + opensp-devel + perl + end + + configure_options += \ + --disable-static \ + --disable-rpath \ + --datadir=/usr/share/sgml/openjade-%{version} \ + --enable-splibdir=/usr/lib + + install_cmds + # Create symlink for jade + ln -s openjade %{BUILDROOT}/usr/bin/jade + + # Install jade catalog + cp %{DIR_APP}/dsssl/catalog %{BUILDROOT}/usr/share/sgml/openjade-%{version}/ + cp %{DIR_APP}/dsssl/{dsssl,style-sheet,fot}.dtd %{BUILDROOT}/usr/share/sgml/openjade-%{version}/ + + # Add unversioned/versioned catalog and symlink + mkdir -p %{BUILDROOT}/etc/sgml + touch %{BUILDROOT}/etc/sgml/openjade-%{version}.soc + ln -s openjade-%{version}.soc openjade.soc + end +end + +packages + package %{name} + provides + jade + end + + requires + docbook-dtds>=1.0-3 + libxml2 + opensp>=1.5.2-2 + sgml-common + end + + prerequires +=\ + docbook-dtds>=1.0-3 \ + libxml2 \ + sgml-common + + script postin + # Install catalog files on system. + /usr/bin/install-catalog --add /etc/sgml/openjade-%{version}.soc \ + /usr/share/sgml/%{name}-%{version}/catalog >/dev/null 2>/dev/null + + # Add openjade catalog to docbook catalogs. + for catalog in /etc/sgml/*-docbook-*.cat; do + /usr/bin/xmlcatalog --sgml --noout --add ${catalog} \ + /usr/share/sgml/openjade-%{version}/catalog /dev/null 2>/dev/null + done + end + + script preun + # Uninstall the catalog files. + /usr/bin/install-catalog --remove /etc/sgml/%{name}-%{version}.soc \ + /usr/share/sgml/%{name}-%{version}/catalog >/dev/null 2>/dev/null + + # Remove openjade catalog from docbook catalogs. + for catalog in /etc/sgml/*-docbook-*.cat; do + /usr/bin/xmlcatalog --sgml --noout --remove ${catalog} \ + /usr/share/sgml/openjade-%{version}/catalog > /dev/null 2>/dev/null + done + end + end + + package %{name}-devel + template DEVEL + end +end diff --git a/openjade/patches/openjade-1.3.1-manpage.patch b/openjade/patches/openjade-1.3.1-manpage.patch new file mode 100644 index 0000000..935ad2d --- /dev/null +++ b/openjade/patches/openjade-1.3.1-manpage.patch @@ -0,0 +1,5 @@ +--- openjade-1.3.1/docsrc/sgmlnorm.1.manpage 2002-06-13 17:45:48.000000000 +0100 ++++ openjade-1.3.1/docsrc/sgmlnorm.1 2002-06-13 17:45:58.000000000 +0100 +@@ -1 +1 @@ +-.so man1/sgmlnorm.1 ++.so man1/osgmlnorm.1 diff --git a/openjade/patches/openjade-1.3.1-nsl.patch b/openjade/patches/openjade-1.3.1-nsl.patch new file mode 100644 index 0000000..48d1302 --- /dev/null +++ b/openjade/patches/openjade-1.3.1-nsl.patch @@ -0,0 +1,21 @@ +--- openjade-1.3.1/config/configure.in.lr 2003-09-12 08:03:22.000000000 -0600 ++++ openjade-1.3.1/config/configure.in 2003-09-12 08:03:44.000000000 -0600 +@@ -156,7 +156,6 @@ + then + AC_MSG_RESULT(yes) + AC_DEFINE(SP_HAVE_SOCKET) +- AC_CHECK_LIB(nsl,main,LIBS="$LIBS -lnsl") + AC_CHECK_LIB(socket,main,LIBS="$LIBS -lsocket") + AC_MSG_CHECKING(h_errno in netdb.h) + AC_EGREP_HEADER(h_errno,netdb.h, +--- openjade-1.3.1/configure.lr 2003-09-12 08:35:55.000000000 -0600 ++++ openjade-1.3.1/configure 2003-09-12 08:36:07.000000000 -0600 +@@ -5530,7 +5530,7 @@ + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-lnsl $LIBS" ++LIBS="-lXXXnsl $LIBS" + cat >conftest.$ac_ext <<_ACEOF + #line $LINENO "configure" + #include "confdefs.h" diff --git a/openjade/patches/openjade-1.3.2-gcc46.patch b/openjade/patches/openjade-1.3.2-gcc46.patch new file mode 100644 index 0000000..962ac19 --- /dev/null +++ b/openjade/patches/openjade-1.3.2-gcc46.patch @@ -0,0 +1,82 @@ +If a class or struct has no user-defined default constructor, C++ doesn't +allow you to default construct a const instance of it. + +https://bugs.gentoo.org/358021 +http://clang.llvm.org/compatibility.html#default_init_const +http://gcc.gnu.org/PR44499 + + +--- a/jade/TeXFOTBuilder.cxx ++++ b/jade/TeXFOTBuilder.cxx +@@ -88,6 +88,8 @@ public: + value.convertString(nic_.placement); + } + ExtensionFlowObj *copy() const { return new PageFloatFlowObj(*this); } ++ public: ++ PageFloatFlowObj() {} + private: + PageFloatNIC nic_; + StringC name_; +@@ -101,6 +103,8 @@ public: + fotb.endPageFootnote(); + } + ExtensionFlowObj *copy() const { return new PageFootnoteFlowObj(*this); } ++ public: ++ PageFootnoteFlowObj() {} + private: + }; + ////////////////////////////////////////////////////////////////////// +--- a/jade/TransformFOTBuilder.cxx ++++ b/jade/TransformFOTBuilder.cxx +@@ -41,6 +41,7 @@ public: + }; + class EntityRefFlowObj : public TransformExtensionFlowObj { + public: ++ EntityRefFlowObj() {} + void atomic(TransformFOTBuilder &fotb, const NodePtr &) const { + fotb.entityRef(name_); + } +@@ -56,6 +57,7 @@ public: + }; + class ProcessingInstructionFlowObj : public TransformExtensionFlowObj { + public: ++ ProcessingInstructionFlowObj() {} + void atomic(TransformFOTBuilder &fotb, const NodePtr &) const { + fotb.processingInstruction(data_); + } +@@ -98,6 +100,8 @@ public: + } + } + ExtensionFlowObj *copy() const { return new EmptyElementFlowObj(*this); } ++ public: ++ EmptyElementFlowObj() {} + private: + ElementNIC nic_; + }; +@@ -133,6 +137,8 @@ public: + } + } + ExtensionFlowObj *copy() const { return new ElementFlowObj(*this); } ++ public: ++ ElementFlowObj() {} + private: + ElementNIC nic_; + }; +@@ -150,6 +156,8 @@ public: + value.convertString(systemId_); + } + ExtensionFlowObj *copy() const { return new EntityFlowObj(*this); } ++ public: ++ EntityFlowObj() {} + private: + StringC systemId_; + }; +@@ -174,6 +182,8 @@ public: + } + } + ExtensionFlowObj *copy() const { return new DocumentTypeFlowObj(*this); } ++ public: ++ DocumentTypeFlowObj() {} + private: + DocumentTypeNIC nic_; + }; diff --git a/openjade/patches/openjade-deplibs.patch b/openjade/patches/openjade-deplibs.patch new file mode 100644 index 0000000..3466ad7 --- /dev/null +++ b/openjade/patches/openjade-deplibs.patch @@ -0,0 +1,40 @@ +diff -urNp openjade-1.3.2/grove/Makefile.sub devel/grove/Makefile.sub +--- openjade-1.3.2/grove/Makefile.sub 2002-10-20 23:47:24.000000000 +0200 ++++ devel/grove/Makefile.sub 2007-07-23 15:39:23.000000000 +0200 +@@ -1,4 +1,4 @@ + LTVERSION=0:1:0 + LIB=ogrove +-DEPLIBS=-lm ++DEPLIBS=-lm -lstdc++ + OBJS=Node.o LocNode.o +diff -urNp openjade-1.3.2/spgrove/Makefile.sub devel/spgrove/Makefile.sub +--- openjade-1.3.2/spgrove/Makefile.sub 2002-11-15 23:46:50.000000000 +0100 ++++ devel/spgrove/Makefile.sub 2007-07-23 16:06:13.000000000 +0200 +@@ -1,9 +1,10 @@ + LTVERSION=0:1:0 + LIB=ospgrove + INCLUDE=-I$(srcdir)/../grove +-DEPLIBS=-lm -L$(TOP)/grove -L$(TOP)/grove/.libs \ ++DEPLIBS=$(TOP)/grove/libogrove.la \ ++ -lm -losp -L$(TOP)/grove/.libs \ + -L$(TOP)/lib -L$(TOP)/lib/.libs \ +- $(LIB_THREADS) ++ $(LIB_THREADS) -lstdc++ + OBJS=GroveApp.o GroveBuilder.o SdNode.o + GENSRCS=grove_inst.cxx + +diff -urNp openjade-1.3.2/style/Makefile.sub devel/style/Makefile.sub +--- openjade-1.3.2/style/Makefile.sub 2003-04-18 19:18:10.000000000 +0200 ++++ devel/style/Makefile.sub 2007-07-23 16:08:26.000000000 +0200 +@@ -1,8 +1,8 @@ + LTVERSION=0:1:0 + LIB=ostyle +-DEPLIBS=-lm -L$(TOP)/grove -L$(TOP)/grove/.libs \ +- -L$(TOP)/lib -L$(TOP)/lib/.libs \ +- -L$(TOP)/spgrove -L$(TOP)/spgrove/.libs ++DEPLIBS=$(TOP)/grove/libogrove.la $(TOP)/spgrove/libospgrove.la \ ++ -lm -losp -L$(TOP)/lib -L$(TOP)/lib/.libs -L$(TOP)/grove/.libs \ ++ -L$(TOP)/spgrove -L$(TOP)/spgrove/.libs -lstdc++ + OBJS=LangObj.o \ + Collector.o \ + DssslApp.o \ diff --git a/openjade/patches/openjade-nola.patch b/openjade/patches/openjade-nola.patch new file mode 100644 index 0000000..1e23ca5 --- /dev/null +++ b/openjade/patches/openjade-nola.patch @@ -0,0 +1,12 @@ +diff -urNp openjade-1.3.2-orig/jade/Makefile.sub openjade-1.3.2/jade/Makefile.sub +--- openjade-1.3.2-orig/jade/Makefile.sub 2002-11-15 23:46:50.000000000 +0100 ++++ openjade-1.3.2/jade/Makefile.sub 2009-02-13 11:52:30.000000000 +0100 +@@ -4,7 +4,7 @@ OBJS=jade.o SgmlFOTBuilder.o RtfFOTBuild + INCLUDE=-I$(srcdir)/../grove -I$(srcdir)/../spgrove -I$(srcdir)/../style + # XLIBS=../style/libostyle.a ../spgrove/libospgrove.a ../grove/libogrove.a \ + # ../lib/libosp.a +-XLIBS=../style/libostyle.a ../spgrove/libospgrove.a ../grove/libogrove.a $(splibdir)/libosp.a ++XLIBS=../style/libostyle.a ../spgrove/libospgrove.a ../grove/libogrove.a $(splibdir)/libosp.so + GENSRCS=JadeMessages.h HtmlMessages.h RtfMessages.h TeXMessages.h \ + HtmlFOTBuilder_inst.cxx RtfFOTBuilder_inst.cxx TeXFOTBuilder_inst.cxx \ + TransformFOTBuilder_inst.cxx MifMessages.h MifFOTBuilder_inst.cxx diff --git a/opensp/opensp.nm b/opensp/opensp.nm new file mode 100644 index 0000000..4dabe2f --- /dev/null +++ b/opensp/opensp.nm @@ -0,0 +1,63 @@ +############################################################################### +# IPFire.org - An Open Source Firewall Solution # +# Copyright (C) - IPFire Development Team info@ipfire.org # +############################################################################### + +name = opensp +version = 1.5.2 +release = 2 + +groups = Application/Text +url = http://openjade.sourceforge.net/ +license = MIT +summary = SGML and XML parser. + +description + OpenSP is an implementation of the ISO/IEC 8879:1986 standard SGML + (Standard Generalized Markup Language). +end + +source_dl = http://downloads.sourceforge.net/project/%%7Bname%7D/%%7Bname%7D/%%7Bthisapp... + +thisapp = OpenSP-%{version} + +build + requires + gcc-c++ + docbook-dtds + docbook-xsl + libxml2 + libxslt + xmlto + end + + configure_options += \ + --mandir=/usr/share/man/ \ + --disable-dependency-tracking \ + --disable-static \ + --disable-rpath \ + --enable-http \ + --enable-default-catalog=/etc/sgml/catalog \ + --enable-default-search-path=/usr/share/sgml:/usr/share/xml + + install_cmds + # Create symlinks and manpages for binaries wtitout "o". + for file in nsgmls sgmlnorm spam spent sx ; do + ln -s o${file} %{BUILDROOT}/usr/bin/${file} + echo ".so man1/o${file}.1" > %{BUILDROOT}/usr/share/man/man1/${file}.1 + done + + # Rename sx to sgml2xml. + mv %{BUILDROOT}/usr/bin/sx %{BUILDROOT}/usr/bin/sgml2xml + mv %{BUILDROOT}/usr/share/man//man1/{sx,sgml2xml}.1 + end + +end + +packages + package %{name} + + package %{name}-devel + template DEVEL + end +end diff --git a/opensp/patches/opensp-multilib.patch b/opensp/patches/opensp-multilib.patch new file mode 100644 index 0000000..a988613 --- /dev/null +++ b/opensp/patches/opensp-multilib.patch @@ -0,0 +1,91 @@ +--- OpenSP-1.5.2/configure.in.multilib 2005-12-23 14:15:21.000000000 +0000 ++++ OpenSP-1.5.2/configure.in 2006-06-13 13:36:49.000000000 +0100 +@@ -90,7 +90,7 @@ + #define SP_SIZEOF_BOOL_1 + #endif + +-#if (SIZEOF_WCHAR_T == SIZEOF_UNSIGNED_SHORT) ++#if (WCHAR_MAX == SHRT_MAX) + #define SP_WCHAR_T_USHORT + #endif + +--- OpenSP-1.5.2/lib/parser_inst.cxx.multilib 2005-07-21 16:33:41.000000000 +0100 ++++ OpenSP-1.5.2/lib/parser_inst.cxx 2006-06-13 13:36:49.000000000 +0100 +@@ -9,6 +9,7 @@ + // Copyright (c) 1994 James Clark + // See the file COPYING for copying permission. + ++#include <limits.h> + #include "splib.h" + + #ifdef SP_MANUAL_INST +@@ -1338,7 +1339,7 @@ + #endif + #endif + // we really just want to test if size_t == unsigned int +-#if !defined(SIZEOF_SIZE_T) || !defined(SIZEOF_UNSIGNED_INT) || (SIZEOF_SIZE_T != SIZEOF_UNSIGNED_INT) ++#if INT_MAX != SSIZE_MAX + #ifdef __DECCXX + #pragma define_template Vector<unsigned int> + #else +--- OpenSP-1.5.2/lib/parser_inst.m4.multilib 2005-05-14 10:17:35.000000000 +0100 ++++ OpenSP-1.5.2/lib/parser_inst.m4 2006-06-13 13:36:49.000000000 +0100 +@@ -1,6 +1,7 @@ + // Copyright (c) 1994 James Clark + // See the file COPYING for copying permission. + ++#include <limits.h> + #include "splib.h" + + #ifdef SP_MANUAL_INST +@@ -166,7 +167,7 @@ + __instantiate(Vector<LeafContentToken*>) + __instantiate(Vector<size_t>) + // we really just want to test if size_t == unsigned int +-#if !defined(SIZEOF_SIZE_T) || !defined(SIZEOF_UNSIGNED_INT) || (SIZEOF_SIZE_T != SIZEOF_UNSIGNED_INT) ++#if INT_MAX != SSIZE_MAX + __instantiate(Vector<unsigned int>) + #endif + +--- OpenSP-1.5.2/config.h.in.multilib 2005-11-05 09:43:42.000000000 +0000 ++++ OpenSP-1.5.2/config.h.in 2006-06-13 13:41:45.000000000 +0100 +@@ -1,5 +1,7 @@ + /* config.h.in. Generated from configure.in by autoheader. */ + ++#include <limits.h> ++ + /* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP + systems. This function is required for `alloca.c' support on those systems. + */ +@@ -333,22 +335,6 @@ + /* The size of a `bool', as computed by sizeof. */ + #undef SIZEOF_BOOL + +-/* The size of a `size_t', as computed by sizeof. */ +-#undef SIZEOF_SIZE_T +- +-/* The size of a `unsigned int', as computed by sizeof. */ +-#undef SIZEOF_UNSIGNED_INT +- +-/* The size of a `unsigned short', as computed by sizeof. */ +-#undef SIZEOF_UNSIGNED_SHORT +- +-/* The size of a `wchar_t', as computed by sizeof. */ +-#undef SIZEOF_WCHAR_T +- +-/* Define as the maximum value of type 'size_t', if the system doesn't define +- it. */ +-#undef SIZE_MAX +- + /* define this if h_errno should be declared extern int */ + #undef SP_DECLARE_H_ERRNO + +@@ -503,7 +489,7 @@ + #define SP_SIZEOF_BOOL_1 + #endif + +-#if (SIZEOF_WCHAR_T == SIZEOF_UNSIGNED_SHORT) ++#if (WCHAR_MAX == SHRT_MAX) + #define SP_WCHAR_T_USHORT + #endif + diff --git a/opensp/patches/opensp-nodeids.patch b/opensp/patches/opensp-nodeids.patch new file mode 100644 index 0000000..4e539d0 --- /dev/null +++ b/opensp/patches/opensp-nodeids.patch @@ -0,0 +1,128 @@ +--- OpenSP-1.5.2/docsrc/releasenotes.xml.nodeids 2006-10-13 13:54:59.000000000 +0100 ++++ OpenSP-1.5.2/docsrc/releasenotes.xml 2006-10-13 13:58:25.000000000 +0100 +@@ -1,7 +1,7 @@ + <?xml version='1.0'?> + <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" + "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd"> +-<book> ++<book id="relnotesb"> + <bookinfo> + <title>OpenSP 1.5.2</title> + <subtitle>Release Notes</subtitle> +@@ -16,7 +16,7 @@ + </copyright> + </bookinfo> + +- <chapter><title>OpenSP 1.5.2 Release Notes</title> ++ <chapter id="relnotesc"><title>OpenSP 1.5.2 Release Notes</title> + + <para>The OpenJade project provides a suite of tools and libraries for + validating, processing and applying DSSSL (Document Style Semantics and +@@ -29,7 +29,7 @@ + can be used as a basis for either open source or commerical projects. The + library can be built as either a dynamic or static library. + </para> +- <sect1><title>Applications of OpenSP</title> ++ <sect1 id="apps"><title>Applications of OpenSP</title> + <para>The OpenSP library has been used in a number of projects. The + World Wide Web consortium on-line HTML and XHTML validator is based on the + OpenSP library. In addition to the OpenSP library a set of command line tools +@@ -41,7 +41,7 @@ + tools.</para> + </sect1> + +- <sect1><title>Obtaining OpenSP</title> ++ <sect1 id="obtaining"><title>Obtaining OpenSP</title> + <para>OpenSP is a project hosted at sourceforge.net and is available + from the OpenJade web site at http://openjade.sourceforge.net or directly from + the OpenJade project page at http://sourceforge.net/projects/openjade</para> +@@ -49,7 +49,7 @@ + linkend="bindist"/> for information on how to obtain pre-compiled + binary packages.</para> + </sect1> +- <sect1><title>Supported Platforms</title> ++ <sect1 id="supported"><title>Supported Platforms</title> + <para>OpenSP is intended to be as portable as possible. It should be + possible to compile and build on most contemporary UNIX type platforms. In + addition OpenSP should also build on Microsoft's Win32 based operating +@@ -166,7 +166,7 @@ + <email>openjade-devel@lists.sourceforge.net</email>, including any + diffs/patches you have used.</para> + </sect1> +- <sect1><title>Building OpenSP from Source</title> ++ <sect1 id="building"><title>Building OpenSP from Source</title> + <para>OpenSP requires 20Mb to 50Mb of disk space to build. An + installation will require around 10Mb to 20Mb depending on + architecture.</para> +@@ -249,7 +249,7 @@ + the latest version of OpenSP to be available from your distributor in due + course.</para> + </sect1> +- <sect1><title>Installation</title> ++ <sect1 id="installation"><title>Installation</title> + <para>In addition to the OpenSP executables and libraries you will also + need various DTDs and declaration files. Some DTDs and associated files + (entity definitions) are available in the <filename>pubtext</filename> +@@ -263,7 +263,7 @@ + recommended that you set up and use such a catalog system. + </para> + </sect1> +- <sect1><title>Support</title> ++ <sect1 id="support"><title>Support</title> + <para>If, after reading the documentation, you still have a problem, + then you may require some additional help. The OpenJade project is a volunteer + effort and as such does not provide any formal support. Instead, you should +@@ -299,7 +299,7 @@ + often the case that someone has had the same problem before.</para> + + </sect1> +- <sect1><title>Version 1.5.2</title> ++ <sect1 id="v152"><title>Version 1.5.2</title> + <formalpara><title>Released December 2005.</title> + <para>The release contains a number of enhancements together with + support for version 4.0 of the GNU C++ compiler.</para> +@@ -418,7 +418,7 @@ + </table> + </sect1> + +- <sect1><title>Version 1.5.1</title> ++ <sect1 id="v151"><title>Version 1.5.1</title> + <formalpara><title>Released October 2003.</title> + <para>The release contains a number of new features together with + support for version 3.3 for the GNU C++ compiler.</para> +@@ -613,7 +613,7 @@ + </table> + </sect1> + +- <sect1><title>Version 1.5</title> ++ <sect1 id="v15"><title>Version 1.5</title> + <formalpara><title>Released November 2002.</title> + <para>In addition to many new features this version also supports the + latest GNU C++ compiler: gcc 3.2 at the time of writing.</para> +@@ -976,7 +976,7 @@ + </tgroup> + </table> + </sect1> +- <sect1> ++ <sect1 id="v14"> + <title>Version 1.4</title> + <formalpara><title>Released February 2000</title> + <para>Version 1.4 added many improvements. Changes +@@ -1023,7 +1023,7 @@ + </listitem> + </itemizedlist> + </sect1> +- <sect1><title>Version 1.3.4</title> ++ <sect1 id="v134"><title>Version 1.3.4</title> + <formalpara><title>Released October 1999</title> + <para>The second release from the OpenJade project. This version was + distributed as part of OpenJade 1.3</para> +@@ -1040,7 +1040,7 @@ + + </itemizedlist> + </sect1> +- <sect1><title>Version 1.3.3</title> ++ <sect1 id="v133"><title>Version 1.3.3</title> + <para>The first release from the OpenJade project</para> + </sect1> + </chapter> diff --git a/opensp/patches/opensp-sigsegv.patch b/opensp/patches/opensp-sigsegv.patch new file mode 100644 index 0000000..69bd3a9 --- /dev/null +++ b/opensp/patches/opensp-sigsegv.patch @@ -0,0 +1,20 @@ +--- OpenSP-1.5.2/lib/ExtendEntityManager.cxx 2005-11-05 10:05:20.000000000 +0100 ++++ OpenSP-1.5.2.new/lib/ExtendEntityManager.cxx 2007-06-21 12:56:26.000000000 +0200 +@@ -1238,7 +1238,8 @@ StorageObjectSpec::StorageObjectSpec() + } + + StorageObjectSpec::StorageObjectSpec(const StorageObjectSpec& x) +-: codingSystemName(x.codingSystemName), ++: storageManager(x.storageManager), ++ codingSystemName(x.codingSystemName), + codingSystem(x.codingSystem), + specId(x.specId), + baseId(x.baseId), +@@ -1253,6 +1254,7 @@ StorageObjectSpec::StorageObjectSpec(con + StorageObjectSpec& StorageObjectSpec::operator=(const StorageObjectSpec& x) + { + if (this != &x) { ++ storageManager = x.storageManager; + codingSystemName = x.codingSystemName; + codingSystem = x.codingSystem; + specId = x.specId; diff --git a/perl-SGMLSpm/perl-SGMLSpm.nm b/perl-SGMLSpm/perl-SGMLSpm.nm new file mode 100644 index 0000000..4590ed9 --- /dev/null +++ b/perl-SGMLSpm/perl-SGMLSpm.nm @@ -0,0 +1,44 @@ +############################################################################### +# IPFire.org - An Open Source Firewall Solution # +# Copyright (C) - IPFire Development Team info@ipfire.org # +############################################################################### + +name = perl-SGMLSpm +version = 1.03ii +release = 1 +arch = noarch + +groups = Development/Libraries +url = http://search.cpan.org/dist/SGMLSpm/ +license = GPLv2+ +summary = Perl library for parsing the output of nsgmls. + +description + Perl programs can use the SGMLSpm module to help convert SGML, HTML or XML + documents into new formats. +end + +source_dl = http://www.cpan.org/authors/id/D/DM/DMEGG/ + +thisapp = SGMLSpm-%{version} + +build + DIR_APP = %{DIR_SRC}/SGMLSpm + + build = # Nothing to do. + + install + # Create directory layout. + mkdir -pv %{BUILDROOT}/usr/bin + mkdir -pv %{BUILDROOT}/usr/share/perl5 + + # Install the module. + make install_system \ + BINDIR=%{BUILDROOT}/usr/bin/ \ + PERL5DIR=%{BUILDROOT}/usr/share/perl5/ + end +end + +packages + package %{name} +end diff --git a/sgml-common/MLCATALOG b/sgml-common/MLCATALOG new file mode 100644 index 0000000..2ca27aa --- /dev/null +++ b/sgml-common/MLCATALOG @@ -0,0 +1,9 @@ +<?xml version="1.0"?> +<!DOCTYPE catalog PUBLIC "-//OASIS//DTD Entity Resolution XML Catalog V1.0//EN" "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd"> +<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog"> + <delegatePublic publicIdStartString="-//OASIS//ENTITIES DocBook XML" catalog="file:///etc/sgml/docbook/xmlcatalog"/> + <delegatePublic publicIdStartString="-//OASIS//DTD DocBook XML" catalog="file:///etc/sgml/docbook/xmlcatalog"/> + <delegatePublic publicIdStartString="ISO 8879:1986" catalog="file:///etc/sgml/docbook/xmlcatalog"/> + <delegateSystem systemIdStartString="http://www.oasis-open.org/docbook/" catalog="file:///etc/sgml/docbook/xmlcatalog"/> + <delegateURI uriStartString="http://www.oasis-open.org/docbook/" catalog="file:///etc/sgml/docbook/xmlcatalog"/> +</catalog> diff --git a/sgml-common/html.dcl b/sgml-common/html.dcl new file mode 100644 index 0000000..710e9e2 --- /dev/null +++ b/sgml-common/html.dcl @@ -0,0 +1,88 @@ +<!SGML "ISO 8879:1986" +-- + SGML Declaration for HyperText Markup Language (HTML). + +-- + +CHARSET + BASESET "ISO 646:1983//CHARSET + International Reference Version + (IRV)//ESC 2/5 4/0" + DESCSET 0 9 UNUSED + 9 2 9 + 11 2 UNUSED + 13 1 13 + 14 18 UNUSED + 32 95 32 + 127 1 UNUSED + BASESET "ISO Registration Number 100//CHARSET + ECMA-94 Right Part of + Latin Alphabet Nr. 1//ESC 2/13 4/1" + + DESCSET 128 32 UNUSED + 160 96 32 + +CAPACITY SGMLREF + TOTALCAP 150000 + GRPCAP 150000 + ENTCAP 150000 + +SCOPE DOCUMENT +SYNTAX + SHUNCHAR CONTROLS 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 + 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 127 + BASESET "ISO 646:1983//CHARSET + International Reference Version + (IRV)//ESC 2/5 4/0" + DESCSET 0 128 0 + FUNCTION + RE 13 + RS 10 + SPACE 32 + TAB SEPCHAR 9 + + + NAMING LCNMSTRT "" + UCNMSTRT "" + LCNMCHAR ".-" + UCNMCHAR ".-" + NAMECASE GENERAL YES + ENTITY NO + DELIM GENERAL SGMLREF + SHORTREF SGMLREF + NAMES SGMLREF + QUANTITY SGMLREF + ATTSPLEN 2100 + LITLEN 1024 + NAMELEN 72 -- somewhat arbitrary; taken from + internet line length conventions -- + PILEN 1024 + TAGLVL 100 + TAGLEN 2100 + GRPGTCNT 150 + GRPCNT 64 + +FEATURES + MINIMIZE + DATATAG NO + OMITTAG YES + RANK NO + SHORTTAG YES + LINK + SIMPLE NO + IMPLICIT NO + EXPLICIT NO + OTHER + CONCUR NO + SUBDOC NO + FORMAL YES + APPINFO "SDA" -- conforming SGML Document Access application + -- +> +<!-- + $Id: html.dcl,v 1.1 2004/09/09 12:19:26 cvsdist Exp $ + + Author: Daniel W. Connolly <connolly@w3.org> + + See also: http://www.w3.org/hypertext/WWW/MarkUp/MarkUp.html + --> diff --git a/sgml-common/html.soc b/sgml-common/html.soc new file mode 100644 index 0000000..c0b1949 --- /dev/null +++ b/sgml-common/html.soc @@ -0,0 +1,31 @@ + -- catalog: SGML Open style entity catalog for HTML -- + -- $Id: html.soc,v 1.1 2004/09/09 12:19:26 cvsdist Exp $ -- + -- Hacked by jjc -- + + -- Ways to refer to Level 2: most general to most specific -- +PUBLIC "-//IETF//DTD HTML//EN" html.dtd +PUBLIC "-//IETF//DTD HTML 2.0//EN" html.dtd +PUBLIC "-//IETF//DTD HTML Level 2//EN" html.dtd +PUBLIC "-//IETF//DTD HTML 2.0 Level 2//EN" html.dtd + + -- Ways to refer to Level 1: most general to most specific -- +PUBLIC "-//IETF//DTD HTML Level 1//EN" html-1.dtd +PUBLIC "-//IETF//DTD HTML 2.0 Level 1//EN" html-1.dtd + + -- Ways to refer to + Strict Level 2: most general to most specific -- +PUBLIC "-//IETF//DTD HTML Strict//EN" html-s.dtd +PUBLIC "-//IETF//DTD HTML 2.0 Strict//EN" html-s.dtd +PUBLIC "-//IETF//DTD HTML Strict Level 2//EN" html-s.dtd +PUBLIC "-//IETF//DTD HTML 2.0 Strict Level 2//EN" html-s.dtd + + -- Ways to refer to + Strict Level 1: most general to most specific -- +PUBLIC "-//IETF//DTD HTML Strict Level 1//EN" html-1s.dtd +PUBLIC "-//IETF//DTD HTML 2.0 Strict Level 1//EN" html-1s.dtd + + -- ISO latin 1 entity set for HTML -- +PUBLIC "ISO 8879-1986//ENTITIES Added Latin 1//EN//HTML" ISOlat1.sgm + +SGMLDECL html.dcl +DOCTYPE html html.dtd diff --git a/sgml-common/patches/sgml-common-quotes.patch b/sgml-common/patches/sgml-common-quotes.patch new file mode 100644 index 0000000..c901b9e --- /dev/null +++ b/sgml-common/patches/sgml-common-quotes.patch @@ -0,0 +1,94 @@ +--- sgml-common-0.6.3/bin/install-catalog.in.quotes Mon Nov 5 11:19:23 2001 ++++ sgml-common-0.6.3/bin/install-catalog.in Mon Nov 5 11:20:12 2001 +@@ -39,8 +39,8 @@ + # Process actions + case $1 in + -a|--add) SGML_ACTION="addition" +- SGML_CENTRALIZED=$2 +- SGML_ORDINARY=$3 ++ SGML_CENTRALIZED="$2" ++ SGML_ORDINARY="$3" + ;; + -r|--remove) if [ -z "$3" -o "$3" = "--version" ] + then +@@ -48,8 +48,8 @@ + exit 0 + fi + SGML_ACTION="removal" +- SGML_CENTRALIZED=$2 +- SGML_ORDINARY=$3 ++ SGML_CENTRALIZED="$2" ++ SGML_ORDINARY="$3" + ;; + -h|--help) echo -e $SGML_HELP_MESSAGE + exit 0 +@@ -96,14 +96,14 @@ + fi + case $SGML_ACTION in + addition) +- if [ -e $SGML_CENTRALIZED -a ! -w $SGML_CENTRALIZED ] ++ if [ -e "$SGML_CENTRALIZED" -a ! -w "$SGML_CENTRALIZED" ] + then + echo "`basename $0`: can not modify "$SGML_CENTRALIZED"." >&2 + exit 2 + fi + ;; + removal) +- if [ ! -w $SGML_CENTRALIZED ] ++ if [ ! -w "$SGML_CENTRALIZED" ] + then + echo "`basename $0`: can not modify "$SGML_CENTRALIZED"." >&2 + exit 2 +@@ -119,7 +119,7 @@ + fi + case $SGML_ACTION in + addition) +- if [ ! -s $SGML_ORDINARY ] ++ if [ ! -s "$SGML_ORDINARY" ] + then + echo "`basename $0`: "$SGML_ORDINARY" does not exist or is empty." >&2 + exit 2 +@@ -131,33 +131,33 @@ + case $SGML_ACTION in + addition) + echo "`basename $0`: addition of $SGML_ORDINARY in $SGML_CENTRALIZED" +- if grep -q $SGML_ORDINARY $SGML_CENTRALIZED 2>/dev/null ++ if grep -q "$SGML_ORDINARY" "$SGML_CENTRALIZED" 2>/dev/null + then + echo "Warning: $SGML_ORDINARY is already installed in the centralized catalog $SGML_CENTRALIZED" >&2 + else +- echo "$SGML_POINTER $SGML_ORDINARY" >> $SGML_CENTRALIZED ++ echo "$SGML_POINTER "$SGML_ORDINARY"" >> "$SGML_CENTRALIZED" + fi +- grep -q $SGML_CENTRALIZED /etc/sgml/catalog 2>/dev/null ++ grep -q "$SGML_CENTRALIZED" /etc/sgml/catalog 2>/dev/null + if [ $? -ne 0 ] + then + echo "`basename $0`: addition of $SGML_CENTRALIZED in /etc/sgml/catalog" +- echo "$SGML_POINTER $SGML_CENTRALIZED" >> /etc/sgml/catalog ++ echo "$SGML_POINTER "$SGML_CENTRALIZED"" >> /etc/sgml/catalog + fi + ;; + removal) + echo "`basename $0`: removal of $SGML_ORDINARY from $SGML_CENTRALIZED" +- if grep -q $SGML_ORDINARY $SGML_CENTRALIZED 2>/dev/null ++ if grep -q "$SGML_ORDINARY" "$SGML_CENTRALIZED" 2>/dev/null + then +- sed -e ":$SGML_POINTER $SGML_ORDINARY:d" < $SGML_CENTRALIZED > ${SGML_CENTRALIZED}.new +- mv ${SGML_CENTRALIZED}.new $SGML_CENTRALIZED ++ sed -e ":$SGML_POINTER "\?$SGML_ORDINARY"\?:d" < "$SGML_CENTRALIZED" > "${SGML_CENTRALIZED}.new" ++ mv "${SGML_CENTRALIZED}.new" "$SGML_CENTRALIZED" + else + echo "Warning: $SGML_ORDINARY was not found in the centralized catalog $SGML_CENTRALIZED" >&2 + fi +- if [ ! -s $SGML_CENTRALIZED ] ++ if [ ! -s "$SGML_CENTRALIZED" ] + then +- rm $SGML_CENTRALIZED ++ rm "$SGML_CENTRALIZED" + echo "`basename $0`: removal of $SGML_CENTRALIZED from /etc/sgml/catalog" +- sed -e ":$SGML_POINTER $SGML_CENTRALIZED:d" < /etc/sgml/catalog > /etc/sgml/catalog.new ++ sed -e ":$SGML_POINTER "\?$SGML_CENTRALIZED"\?:d" < /etc/sgml/catalog > /etc/sgml/catalog.new + mv /etc/sgml/catalog.new /etc/sgml/catalog + fi + ;; diff --git a/sgml-common/patches/sgml-common-umask.patch b/sgml-common/patches/sgml-common-umask.patch new file mode 100644 index 0000000..90bda3b --- /dev/null +++ b/sgml-common/patches/sgml-common-umask.patch @@ -0,0 +1,12 @@ +--- sgml-common-0.6.3/bin/install-catalog.in.umask Mon May 21 11:48:37 2001 ++++ sgml-common-0.6.3/bin/install-catalog.in Mon May 21 12:00:34 2001 +@@ -13,6 +13,9 @@ + \040 -h, --help: \t\t\t\t Print this help message and exit\n\ + \040 -v, --version: \t\t\t Print the version number and exit\n" + ++# We need the files we create to be world readable ++umask 022 ++ + # Set version message + SGML_VERSION_MESSAGE="sgml-common version @VERSION@ (install-catalog version 1.0)" + diff --git a/sgml-common/patches/sgml-common-xmldir.patch b/sgml-common/patches/sgml-common-xmldir.patch new file mode 100644 index 0000000..d7c2b2b --- /dev/null +++ b/sgml-common/patches/sgml-common-xmldir.patch @@ -0,0 +1,19 @@ +--- sgml-common-0.6.3/xml-iso-entities/Makefile.am.xmldir Fri Oct 5 16:37:43 2001 ++++ sgml-common-0.6.3/xml-iso-entities/Makefile.am Fri Oct 5 16:37:57 2001 +@@ -1,4 +1,4 @@ +-isoentdir = $(prefix)/share/sgml/xml-iso-entities-8879.1986 ++isoentdir = $(prefix)/share/xml/xml-iso-entities-8879.1986 + isoent_DATA = ISOamsa.ent ISOamsb.ent ISOamsc.ent ISOamsn.ent ISOamso.ent ISOamsr.ent \ + ISObox.ent ISOcyr1.ent ISOcyr2.ent ISOdia.ent ISOgrk1.ent ISOgrk2.ent \ + ISOgrk3.ent ISOgrk4.ent ISOlat1.ent ISOlat2.ent ISOnum.ent ISOpub.ent \ +--- sgml-common-0.6.3/xml-iso-entities/Makefile.in.xmldir 2007-05-15 17:21:31.000000000 +0100 ++++ sgml-common-0.6.3/xml-iso-entities/Makefile.in 2007-05-15 17:21:43.000000000 +0100 +@@ -62,7 +62,7 @@ + VERSION = @VERSION@ + docdir = @docdir@ + +-isoentdir = $(prefix)/share/sgml/xml-iso-entities-8879.1986 ++isoentdir = $(prefix)/share/xml/xml-iso-entities-8879.1986 + isoent_DATA = ISOamsa.ent ISOamsb.ent ISOamsc.ent ISOamsn.ent ISOamso.ent ISOamsr.ent ISObox.ent ISOcyr1.ent ISOcyr2.ent ISOdia.ent ISOgrk1.ent ISOgrk2.ent ISOgrk3.ent ISOgrk4.ent ISOlat1.ent ISOlat2.ent ISOnum.ent ISOpub.ent ISOtech.ent catalog + + diff --git a/sgml-common/sgml-common.nm b/sgml-common/sgml-common.nm new file mode 100644 index 0000000..a6e6d8e --- /dev/null +++ b/sgml-common/sgml-common.nm @@ -0,0 +1,112 @@ +############################################################################### +# IPFire.org - An Open Source Firewall Solution # +# Copyright (C) - IPFire Development Team info@ipfire.org # +############################################################################### + +name = sgml-common +version = 0.6.3 +release = 2 +arch = noarch + +groups = Applications/Text +url = +license = GPL+ +summary = Common SGML catalog and DTD files. + +desciption + The sgml-common package contains a collection of entities and DTDs + that are useful for processing SGML, but that don't need to be + included in multiple packages. Sgml-common also includes an + up-to-date Open Catalog file. +end + +source_dl = +sources = %{thisapp}.tgz + +build + requires + autoconf + automake + libxml2-devel + end + + configure_options += \ + --mandir=/usr/share/man \ + --sysconfdir=/etc + + prepare_cmds + for i in COPYING INSTALL install-sh missing mkinstalldirs; do \ + rm -f ${i}; \ + cp -pvf /usr/share/automake*/${i} .; \ + done + end + + install_cmds + mkdir -pv %{BUILDROOT}/etc/{sg,x}ml/docbook + mkdir -pv %{BUILDROOT}/usr/share/sgml/docbook + + # Touch SGML catalog + touch %{BUILDROOT}/etc/sgml/catalog + + # Create an empty XML catalog. + xmlcatalog --noout --create %{BUILDROOT}/etc/xml/catalog + + # Now put the common DocBook entries in it + xmlcatalog --noout --add "delegatePublic" \ + "-//OASIS//ENTITIES DocBook XML" \ + "file:///etc/sgml/docbook/xmlcatalog" %{BUILDROOT}/etc/xml/catalog + + xmlcatalog --noout --add "delegatePublic" \ + "-//OASIS//DTD DocBook XML" \ + "file:///etc/sgml/docbook/xmlcatalog" %{BUILDROOT}/etc/xml/catalog + + xmlcatalog --noout --add "delegatePublic" \ + "ISO 8879:1986" \ + "file:///etc/sgml/docbook/xmlcatalog" %{BUILDROOT}/etc/xml/catalog + + xmlcatalog --noout --add "delegateSystem" \ + "http://www.oasis-open.org/docbook/" \ + "file:///etc/sgml/docbook/xmlcatalog" %{BUILDROOT}/etc/xml/catalog + + xmlcatalog --noout --add "delegateURI" \ + "http://www.oasis-open.org/docbook/" \ + "file:///etc/sgml/docbook/xmlcatalog" %{BUILDROOT}/etc/xml/catalog + + # Also create the common DocBook catalog + xmlcatalog --noout --create \ + %{BUILDROOT}/etc/sgml/docbook/xmlcatalog + + ln -svf ../../../../etc/sgml/docbook/xmlcatalog \ + %{BUILDROOT}/usr/share/sgml/docbook/xmlcatalog + + rm -f %{BUILDROOT}/usr/share/sgml/xml.dcl + + install -p -m0644 %{DIR_SOURCE}/*.dcl %{DIR_SOURCE}/*.soc \ + %{BUILDROOT}/usr/share/sgml + + rm -rf %{BUILDROOT}/usr/share/xml/* + end +end + +packages + package %{name} + requires + xml-common + end + end + + package xml-common + summary = Common XML catalog and DTD files. + description + The xml-common is a subpackage of sgml-common which contains + a collection XML catalogs that are useful for processing XML, + but that don't need to be included in main package. + end + + files + /etc/xml + /etc/sgml/docbook/xmlcatalog + /usr/share/sgml/docbook/xmlcatalog + end + end +end diff --git a/sgml-common/xml.dcl b/sgml-common/xml.dcl new file mode 100644 index 0000000..fed2103 --- /dev/null +++ b/sgml-common/xml.dcl @@ -0,0 +1,179 @@ +<!SGML -- SGML Declaration for valid XML documents -- + "ISO 8879:1986 (WWW)" + + CHARSET + BASESET + "ISO Registration Number 176//CHARSET + ISO/IEC 10646-1:1993 UCS-4 with implementation + level 3//ESC 2/5 2/15 4/6" + DESCSET + 0 9 UNUSED + 9 2 9 + 11 2 UNUSED + 13 1 13 + 14 18 UNUSED + 32 95 32 + 127 1 UNUSED + 128 32 UNUSED + -- use this instead of the official declaration because SP only + supports 16-bit characters -- + 160 65374 160 + 65534 2 UNUSED + -- 55296 2048 UNUSED + 57344 8190 57344 + 65534 2 UNUSED + 65536 1048576 65536 -- + CAPACITY NONE + + SCOPE DOCUMENT + + SYNTAX + SHUNCHAR NONE + BASESET "ISO Registration Number 176//CHARSET + ISO/IEC 10646-1:1993 UCS-4 with implementation + level 3//ESC 2/5 2/15 4/6" + DESCSET + 0 1114112 0 + FUNCTION + RE 13 + RS 10 + SPACE 32 + TAB SEPCHAR 9 + + NAMING + LCNMSTRT "" + UCNMSTRT "" + NAMESTRT + 58 95 192-214 216-246 248-305 308-318 321-328 + 330-382 384-451 461-496 500-501 506-535 592-680 + 699-705 902 904-906 908 910-929 931-974 976-982 + 986 988 990 992 994-1011 1025-1036 1038-1103 + 1105-1116 1118-1153 1168-1220 1223-1224 + 1227-1228 1232-1259 1262-1269 1272-1273 + 1329-1366 1369 1377-1414 1488-1514 1520-1522 + 1569-1594 1601-1610 1649-1719 1722-1726 + 1728-1742 1744-1747 1749 1765-1766 2309-2361 + 2365 2392-2401 2437-2444 2447-2448 2451-2472 + 2474-2480 2482 2486-2489 2524-2525 2527-2529 + 2544-2545 2565-2570 2575-2576 2579-2600 + 2602-2608 2610-2611 2613-2614 2616-2617 + 2649-2652 2654 2674-2676 2693-2699 2701 + 2703-2705 2707-2728 2730-2736 2738-2739 + 2741-2745 2749 2784 2821-2828 2831-2832 + 2835-2856 2858-2864 2866-2867 2870-2873 2877 + 2908-2909 2911-2913 2949-2954 2958-2960 + 2962-2965 2969-2970 2972 2974-2975 2979-2980 + 2984-2986 2990-2997 2999-3001 3077-3084 + 3086-3088 3090-3112 3114-3123 3125-3129 + 3168-3169 3205-3212 3214-3216 3218-3240 + 3242-3251 3253-3257 3294 3296-3297 3333-3340 + 3342-3344 3346-3368 3370-3385 3424-3425 + 3585-3630 3632 3634-3635 3648-3653 3713-3714 + 3716 3719-3720 3722 3725 3732-3735 3737-3743 + 3745-3747 3749 3751 3754-3755 3757-3758 3760 + 3762-3763 3773 3776-3780 3904-3911 3913-3945 + 4256-4293 4304-4342 4352 4354-4355 4357-4359 + 4361 4363-4364 4366-4370 4412 4414 4416 4428 + 4430 4432 4436-4437 4441 4447-4449 4451 4453 + 4455 4457 4461-4462 4466-4467 4469 4510 4520 + 4523 4526-4527 4535-4536 4538 4540-4546 4587 + 4592 4601 7680-7835 7840-7929 7936-7957 + 7960-7965 7968-8005 8008-8013 8016-8023 8025 + 8027 8029 8031-8061 8064-8116 8118-8124 8126 + 8130-8132 8134-8140 8144-8147 8150-8155 + 8160-8172 8178-8180 8182-8188 8486 8490-8491 + 8494 8576-8578 12295 12321-12329 12353-12436 + 12449-12538 12549-12588 19968-40869 44032-55203 + + LCNMCHAR "" + UCNMCHAR "" + NAMECHAR + 45-46 183 720-721 768-837 864-865 903 1155-1158 + 1425-1441 1443-1465 1467-1469 1471 1473-1474 + 1476 1600 1611-1618 1632-1641 1648 1750-1764 + 1767-1768 1770-1773 1776-1785 2305-2307 2364 + 2366-2381 2385-2388 2402-2403 2406-2415 + 2433-2435 2492 2494-2500 2503-2504 2507-2509 + 2519 2530-2531 2534-2543 2562 2620 2622-2626 + 2631-2632 2635-2637 2662-2673 2689-2691 2748 + 2750-2757 2759-2761 2763-2765 2790-2799 + 2817-2819 2876 2878-2883 2887-2888 2891-2893 + 2902-2903 2918-2927 2946-2947 3006-3010 + 3014-3016 3018-3021 3031 3047-3055 3073-3075 + 3134-3140 3142-3144 3146-3149 3157-3158 + 3174-3183 3202-3203 3262-3268 3270-3272 + 3274-3277 3285-3286 3302-3311 3330-3331 + 3390-3395 3398-3400 3402-3405 3415 3430-3439 + 3633 3636-3642 3654-3662 3664-3673 3761 + 3764-3769 3771-3772 3782 3784-3789 3792-3801 + 3864-3865 3872-3881 3893 3895 3897 3902-3903 + 3953-3972 3974-3979 3984-3989 3991 3993-4013 + 4017-4023 4025 8400-8412 8417 12293 12330-12335 + 12337-12341 12441-12442 12445-12446 12540-12542 + + NAMECASE + GENERAL NO + ENTITY NO + + DELIM + GENERAL SGMLREF + HCRO "&#x" -- 38 is the number for ampersand -- + NESTC "/" + NET ">" + PIC "?>" + SHORTREF NONE + + NAMES + SGMLREF + + QUANTITY NONE + + ENTITIES + "amp" 38 + "lt" 60 + "gt" 62 + "quot" 34 + "apos" 39 + + FEATURES + MINIMIZE + DATATAG NO + OMITTAG NO + RANK NO + SHORTTAG + STARTTAG + EMPTY NO + UNCLOSED NO + NETENABL IMMEDNET + ENDTAG + EMPTY NO + UNCLOSED NO + ATTRIB + DEFAULT YES + OMITNAME NO + VALUE NO + EMPTYNRM YES + IMPLYDEF + ATTLIST NO + DOCTYPE NO + ELEMENT NO + ENTITY NO + NOTATION NO + LINK + SIMPLE NO + IMPLICIT NO + EXPLICIT NO + OTHER + CONCUR NO + SUBDOC NO + FORMAL NO + URN NO + KEEPRSRE YES + VALIDITY TYPE + ENTITIES + REF ANY + INTEGRAL YES + APPINFO NONE + SEEALSO "ISO 8879:1986//NOTATION + Extensible Markup Language (XML) 1.0//EN" +> diff --git a/sgml-common/xml.soc b/sgml-common/xml.soc new file mode 100644 index 0000000..278c6f3 --- /dev/null +++ b/sgml-common/xml.soc @@ -0,0 +1 @@ +SGMLDECL "xml.dcl" diff --git a/systemd/patches/systemd-36-no_manpages.patch b/systemd/patches/systemd-36-no_manpages.patch deleted file mode 100644 index 5c5480f..0000000 --- a/systemd/patches/systemd-36-no_manpages.patch +++ /dev/null @@ -1,90 +0,0 @@ -diff -Nur a/Makefile.am b/Makefile.am ---- a/Makefile.am 2011-09-23 18:30:02.000000000 +0200 -+++ b/Makefile.am 2011-10-09 16:44:18.293116056 +0200 -@@ -749,82 +749,13 @@ - src/dbus-loop.h \ - src/spawn-agent.h - --MANPAGES = \ -- man/systemd.1 \ -- man/systemctl.1 \ -- man/systemadm.1 \ -- man/systemd-cgls.1 \ -- man/systemd-nspawn.1 \ -- man/systemd-tmpfiles.8 \ -- man/systemd-notify.1 \ -- man/sd_notify.3 \ -- man/sd_readahead.3 \ -- man/sd_booted.3 \ -- man/sd_listen_fds.3 \ -- man/sd_is_fifo.3 \ -- man/systemd.unit.5 \ -- man/systemd.service.5 \ -- man/systemd.socket.5 \ -- man/systemd.mount.5 \ -- man/systemd.automount.5 \ -- man/systemd.swap.5 \ -- man/systemd.timer.5 \ -- man/systemd.path.5 \ -- man/systemd.target.5 \ -- man/systemd.device.5 \ -- man/systemd.snapshot.5 \ -- man/systemd.exec.5 \ -- man/daemon.7 \ -- man/sd-daemon.7 \ -- man/sd-readahead.7 \ -- man/runlevel.8 \ -- man/telinit.8 \ -- man/halt.8 \ -- man/shutdown.8 \ -- man/pam_systemd.8 \ -- man/systemd.conf.5 \ -- man/systemd-logind.conf.5 \ -- man/tmpfiles.d.5 \ -- man/hostname.5 \ -- man/timezone.5 \ -- man/machine-id.5 \ -- man/vconsole.conf.5 \ -- man/locale.conf.5 \ -- man/os-release.5 \ -- man/machine-info.5 \ -- man/modules-load.d.5 \ -- man/sysctl.d.5 \ -- man/systemd-ask-password.1 \ -- man/systemd-loginctl.1 -+MANPAGES = - --if ENABLE_BINFMT --MANPAGES += \ -- man/binfmt.d.5 --endif -+MANPAGES_ALIAS = - --MANPAGES_ALIAS = \ -- man/reboot.8 \ -- man/poweroff.8 \ -- man/sd_is_socket.3 \ -- man/sd_is_socket_unix.3 \ -- man/sd_is_socket_inet.3 \ -- man/sd_notifyf.3 \ -- man/init.1 -- --man/reboot.8: man/halt.8 --man/poweroff.8: man/halt.8 --man/sd_is_socket.3: man/sd_is_fifo.3 --man/sd_is_socket_unix.3: man/sd_is_fifo.3 --man/sd_is_socket_inet.3: man/sd_is_fifo.3 --man/sd_notifyf.3: man/sd_notify.3 --man/init.1: man/systemd.1 -- --dist_man_MANS = \ -- $(MANPAGES) \ -- $(MANPAGES_ALIAS) -+dist_man_MANS = - --nodist_man_MANS = \ -- man/systemd.special.7 -+nodist_man_MANS = - - XML_FILES = \ - ${patsubst %.1,%.xml,${patsubst %.3,%.xml,${patsubst %.5,%.xml,${patsubst %.7,%.xml,${patsubst %.8,%.xml,$(MANPAGES)}}}}} diff --git a/systemd/systemd.nm b/systemd/systemd.nm index 322aea3..42aee74 100644 --- a/systemd/systemd.nm +++ b/systemd/systemd.nm @@ -5,7 +5,7 @@
name = systemd version = 36 -release = 3 +release = 4
maintainer = Stefan Schantl stefan.schantl@ipfire.org groups = System/Base @@ -27,6 +27,8 @@ build autoconf cryptsetup-luks-devel dbus-devel + docbook-utils + docbook-xsl gperf intltool libacl-devel diff --git a/tunctl/tunctl.nm b/tunctl/tunctl.nm index a57f1a3..21c542c 100644 --- a/tunctl/tunctl.nm +++ b/tunctl/tunctl.nm @@ -5,7 +5,7 @@
name = tunctl version = 1.5 -release = 1 +release = 2
groups = Networking/Tools url = http://tunctl.sourceforge.net/ @@ -22,19 +22,15 @@ end
source_dl = http://sourceforge.net/projects/tunctl/files/tunctl/%%7Bversion%7D/%%7Bsourc...
-# XXX needs docbook for man page - build + requires + docbook-utils + end + prepare_cmds sed -e "s/^CFLAGS.*/CFLAGS = %{CFLAGS}/" -i Makefile end
- make_build_targets = tunctl CC=gcc - - install - mkdir -pv %{BUILDROOT}/usr/sbin - install -m 755 tunctl %{BUILDROOT}/usr/sbin - end end
packages diff --git a/xmlto/xmlto.nm b/xmlto/xmlto.nm new file mode 100644 index 0000000..b0cf500 --- /dev/null +++ b/xmlto/xmlto.nm @@ -0,0 +1,46 @@ +############################################################################### +# IPFire.org - An Open Source Firewall Solution # +# Copyright (C) - IPFire Development Team info@ipfire.org # +############################################################################### + +name = xmlto +version = 0.0.24 +release = 1 + +groups = Applications/System +url = https://fedorahosted.org/xmlto/ +license = GPLv2+ +summary = A tool for converting XML files to various formats. + +description + This is a package for converting XML files to various formats using XSL + stylesheets. +end + +source_dl = https://fedorahosted.org/releases/x/m/%%7Bname%7D/ +source = %{thisapp}.tar.bz2 + +build + requires + docbook-dtds + docbook-xsl + flex + libxslt + util-linux + end + + configure_options +=\ + BASH=/bin/bash + + test + make check + end +end + +packages + package %{name} + requires + util-linux + end + end +end
hooks/post-receive -- IPFire 3.x development tree
-
git＠ipfire.org