Author: bdubbs Date: Sat Jan 19 13:27:19 2019 New Revision: 21002 Log: Change to docbook-xsl-nons
Modified: trunk/BOOK/introduction/welcome/changelog.xml trunk/BOOK/pst/xml/docbook-xsl.xml Modified: trunk/BOOK/introduction/welcome/changelog.xml ============================================================================== --- trunk/BOOK/introduction/welcome/changelog.xml Sat Jan 19 10:51:47 2019 (r21001) +++ trunk/BOOK/introduction/welcome/changelog.xml Sat Jan 19 13:27:19 2019 (r21002) @@ -45,6 +45,10 @@ <para>January 18th, 2019</para> <itemizedlist> <listitem> + <para>[bdubbs] - Change to docbook-xsl-nons. Fixes + <ulink url="&blfs-ticket-root;11559">#11559</ulink>.</para> + </listitem> + <listitem> <para>[renodr] - Update to gtk-vnc-0.9.0. Fixes <ulink url="&blfs-ticket-root;11562">#11562</ulink>.</para> </listitem> Modified: trunk/BOOK/pst/xml/docbook-xsl.xml ============================================================================== --- trunk/BOOK/pst/xml/docbook-xsl.xml Sat Jan 19 10:51:47 2019 (r21001) +++ trunk/BOOK/pst/xml/docbook-xsl.xml Sat Jan 19 13:27:19 2019 (r21002) @@ -6,9 +6,9 @@ <!ENTITY path "https://github.com/docbook/xslt10-stylesheets/releases/download/release"> - <!ENTITY docbook-xsl-download-http "&path;/&docbook-xsl-version;/docbook-xsl-&docbook-xsl-version;.tar.bz2"> + <!ENTITY docbook-xsl-download-http "&path;/&docbook-xsl-version;/docbook-xsl-nons-&docbook-xsl-version;.tar.bz2"> <!ENTITY docbook-xsl-download-ftp " "> - <!ENTITY docbook-xsl-md5sum "4a400f0264a19329c7f95f69e098744a"> + <!ENTITY docbook-xsl-md5sum "2666d1488d6ced1551d15f31d7ed8c38"> <!ENTITY docbook-xsl-size "22 MB"> <!ENTITY docbook-xsl-buildsize "58 MB (includes installing optional documentation)"> <!ENTITY docbook-xsl-time "less than 0.1 SBU"> @@ -27,7 +27,7 @@ <date>$Date$</date> </sect1info> - <title>docbook-xsl-&docbook-xsl-version;</title> + <title>docbook-xsl-nons-&docbook-xsl-version;</title> <indexterm zone="docbook-xsl"> <primary sortas="a-DocBook-XSL-Stylesheets">DocBook XSL @@ -69,7 +69,7 @@ <itemizedlist spacing='compact'> <listitem> <para>Required patch: <ulink - url="&patch-root;/docbook-xsl-&docbook-xsl-version;-stack_fix-1.patch"/> + url="&patch-root;/docbook-xsl-nons-&docbook-xsl-version;-stack_fix-1.patch"/> </para> </listitem> </itemizedlist> @@ -123,7 +123,7 @@ <para>First, fix a problem that causes stack overflows when doing recursion:</para> -<screen><userinput>patch -Np1 -i ../docbook-xsl-&docbook-xsl-version;-stack_fix-1.patch</userinput></screen> +<screen><userinput>patch -Np1 -i ../docbook-xsl-nons-&docbook-xsl-version;-stack_fix-1.patch</userinput></screen> <para>If you downloaded the optional documentation tarball, unpack it with the following command:</para> @@ -137,26 +137,26 @@ by running the following commands as the <systemitem class="username">root</systemitem> user:</para> -<screen role="root"><userinput>install -v -m755 -d /usr/share/xml/docbook/xsl-stylesheets-&docbook-xsl-version; && +<screen role="root"><userinput>install -v -m755 -d /usr/share/xml/docbook/xsl-stylesheets-nons-&docbook-xsl-version; && cp -v -R VERSION assembly common eclipse epub epub3 extensions fo \ highlighting html htmlhelp images javahelp lib manpages params \ profiling roundtrip slides template tests tools webhelp website \ xhtml xhtml-1_1 xhtml5 \ - /usr/share/xml/docbook/xsl-stylesheets-&docbook-xsl-version; && + /usr/share/xml/docbook/xsl-stylesheets-nons-&docbook-xsl-version; && -ln -s VERSION /usr/share/xml/docbook/xsl-stylesheets-&docbook-xsl-version;/VERSION.xsl && +ln -s VERSION /usr/share/xml/docbook/xsl-stylesheets-nons-&docbook-xsl-version;/VERSION.xsl && install -v -m644 -D README \ - /usr/share/doc/docbook-xsl-&docbook-xsl-version;/README.txt && + /usr/share/doc/docbook-xsl-nons-&docbook-xsl-version;/README.txt && install -v -m644 RELEASE-NOTES* NEWS* \ - /usr/share/doc/docbook-xsl-&docbook-xsl-version;</userinput></screen> + /usr/share/doc/docbook-xsl-nons-&docbook-xsl-version;</userinput></screen> <para>If you downloaded the optional documentation tarball, install the documentation by issuing the following command as the <systemitem class="username">root</systemitem> user:</para> -<screen role="root"><userinput>cp -v -R doc/* /usr/share/doc/docbook-xsl-&docbook-xsl-version;</userinput></screen> +<screen role="root"><userinput>cp -v -R doc/* /usr/share/doc/docbook-xsl-nons-&docbook-xsl-version;</userinput></screen> </sect2> @@ -177,6 +177,15 @@ <sect3> <title>Configuration Information</title> + <note> + <para>If you are installing the current version of docbook-xsl-nons + over a previous version of docbook-xsl, then remove the old + rewrite entries in the catalog as the <systemitem + class="username">root</systemitem> user:</para> + +<screen><userinput>sed -i '/rewrite/d' /etc/xml/catalog</userinput></screen> + </note> + <para>Create (or append) and populate the XML catalog file using the following commands as the <systemitem class="username">root</systemitem> user:</para> @@ -187,23 +196,33 @@ fi && xmlcatalog --noout --add "rewriteSystem" \ - "http://docbook.sourceforge.net/release/xsl/&docbook-xsl-version;" \ - "/usr/share/xml/docbook/xsl-stylesheets-&docbook-xsl-version;" \ + "https://cdn.docbook.org/release/xsl-nons/1.79.2" \ + "/usr/share/xml/docbook/xsl-stylesheets-nons-1.79.2" \ + /etc/xml/catalog && + +xmlcatalog --noout --add "rewriteURI" \ + "https://cdn.docbook.org/release/xsl-nons/1.79.2" \ + "/usr/share/xml/docbook/xsl-stylesheets-nons-1.79.2" \ + /etc/xml/catalog && + +xmlcatalog --noout --add "rewriteSystem" \ + "https://cdn.docbook.org/release/xsl-nons/current" \ + "/usr/share/xml/docbook/xsl-stylesheets-nons-1.79.2" \ /etc/xml/catalog && xmlcatalog --noout --add "rewriteURI" \ - "http://docbook.sourceforge.net/release/xsl/&docbook-xsl-version;" \ - "/usr/share/xml/docbook/xsl-stylesheets-&docbook-xsl-version;" \ + "https://cdn.docbook.org/release/xsl-nons/current" \ + "/usr/share/xml/docbook/xsl-stylesheets-nons-1.79.2" \ /etc/xml/catalog && xmlcatalog --noout --add "rewriteSystem" \ "http://docbook.sourceforge.net/release/xsl/current" \ - "/usr/share/xml/docbook/xsl-stylesheets-&docbook-xsl-version;" \ + "/usr/share/xml/docbook/xsl-stylesheets-nons-1.79.2" \ /etc/xml/catalog && xmlcatalog --noout --add "rewriteURI" \ "http://docbook.sourceforge.net/release/xsl/current" \ - "/usr/share/xml/docbook/xsl-stylesheets-&docbook-xsl-version;" \ + "/usr/share/xml/docbook/xsl-stylesheets-nons-1.79.2" \ /etc/xml/catalog</userinput></screen> <para>Occasionally, you may find the need to install other versions of -- http://lists.linuxfromscratch.org/listinfo/blfs-book FAQ: http://www.linuxfromscratch.org/blfs/faq.html Unsubscribe: See the above information page