diff options
Diffstat (limited to 'source/ap/linuxdoc-tools')
| -rw-r--r-- | source/ap/linuxdoc-tools/ChangeLog.txt | 97 | ||||
| -rwxr-xr-x | source/ap/linuxdoc-tools/arm/build | 3 | ||||
| -rw-r--r-- | source/ap/linuxdoc-tools/doinst.sh | 13 | ||||
| -rwxr-xr-x | source/ap/linuxdoc-tools/linuxdoc-tools.SlackBuild | 26 | ||||
| -rwxr-xr-x | source/ap/linuxdoc-tools/linuxdoc-tools.build | 328 | ||||
| -rwxr-xr-x | source/ap/linuxdoc-tools/postbuildfixes.sh | 55 | ||||
| -rw-r--r-- | source/ap/linuxdoc-tools/slack-desc | 14 | ||||
| -rw-r--r-- | source/ap/linuxdoc-tools/sources/asciidoc-0001-a2x-Write-manifests-in-UTF-8-by-default.patch | 38 | ||||
| -rw-r--r-- | source/ap/linuxdoc-tools/sources/linuxdoc-tools-0.9.68-flex.patch | 17 | ||||
| -rw-r--r-- | source/ap/linuxdoc-tools/sources/openjade-1.3-getopts.pl | 65 | ||||
| -rwxr-xr-x | source/ap/linuxdoc-tools/sources/source.download | 97 | ||||
| -rwxr-xr-x | source/ap/linuxdoc-tools/trackbuild.linuxdoc-tools | 12 |
12 files changed, 475 insertions, 290 deletions
diff --git a/source/ap/linuxdoc-tools/ChangeLog.txt b/source/ap/linuxdoc-tools/ChangeLog.txt index 23ce0aa37..f89742479 100644 --- a/source/ap/linuxdoc-tools/ChangeLog.txt +++ b/source/ap/linuxdoc-tools/ChangeLog.txt @@ -1,10 +1,61 @@ -Fri Aug 14 09:23:02 BST 2015 +Wed Nov 8 10:09:53 GMT 2017 + linuxdoc-tools 0.9.72, build 4. + Stuart Winter <mozes@slackware.com> + * Upgraded to DocBook XSL Stylesheets 1.79.2 + Applied patch to Fix Bus error with xsltproc + Thanks to ecd102 on LQ for the report. + +Thu Jun 15 08:08:08 UTC 2017 + linuxdoc-tools 0.9.72, build 3. + Stuart Winter <mozes@slackware.com> + * Remove .la files from the package at the suggestion of volkerdi. + /usr/lib/libospgrove.la + /usr/lib/libosp.la + /usr/lib/libostyle.la + /usr/lib/libogrove.la + (or "lib64"). + None of these are referenced by a '.la' file within any Slackware package. + For rationale behind this, see: + http://www.linuxquestions.org/questions/slackware-14/libtool%27s-la-files-4175429931/#post4795486 + +Wed Jun 7 10:27:13 UTC 2017 + linuxdoc-tools 0.9.72, build 2. + Stuart Winter <mozes@slackware.com> + * Switched to OpenJade-1.3.2 (from 1.3.3-pre1 which was segfaulting) + No other distributions that I checked ever upgraded beyond this last + stable release. Debian are using a modified version of the 1.4 branch + but this doesn't work with our stack yet. + * Upgraded to perl-XML-NamespaceSupport-1.12 + * Upgraded to perl-XML-SAX-Base-1.09 + * Updated build script to work with bash 4.4. Thanks to Heinz Wiesinger. + * Support '.conf.new' for config files within /etc/asciidoc + Thanks to franzen on LQ for the suggestion. + * Log the output of the postbuildfixes.sh script (package fixups, post build, + pre-packaging) to the slacktrack log file. The asciidoc .conf.new support + is conducted within that script, and includes a check as to whether any + dangling symlinks appeared as a result of mv'ing the files. + Requries slacktrack v2.18 as it uses a new option to achieve this. + +Mon Jul 25 19:14:20 UTC 2016 + linuxdoc-tools 0.9.72, build 1. + Stuart Winter <mozes@slackware.com> + * Upgraded to linuxdoc-tools 0.9.72 + * Upgraded to gtk-doc 1.25 + * Upgraded to xmlto 0.0.28 + * Upgraded to DocBook XSL Stylesheets 1.79.1 + No longer ship the "tools" directory because it grew from a couple of + MBs to 23MB, and the content of it looks to be just package updating tools which + does not make sense for a vendor to include in a binary package OS. + * Apply patch from Fedora for AsciiDoc to write manifests in + UTF8 by default. + +Fri Aug 14 09:23:02 UTC 2015 Stuart Winter <mozes@slackware.com> linuxdoc-tools 0.9.69, build 4. * Upgraded to gtk-doc-1.24 * Moved from i486 to i586 target on Intel 32bit -Mon Apr 27 21:07:41 BST 2015 +Mon Apr 27 21:07:41 UTC 2015 Stuart Winter <mozes@slackware.com> linuxdoc-tools 0.9.69, build 3. * Upgraded to asciidoc-8.6.9 @@ -13,7 +64,7 @@ Mon Apr 27 21:07:41 BST 2015 /usr/bin. These used to be supplied as shell wrappers, but the 'make install' now creates symlinks to 'linuxdoc'. -Tue Jul 15 08:57:22 BST 2014 +Tue Jul 15 08:57:22 UTC 2014 Stuart Winter <mozes@slackware.com> linuxdoc-tools 0.9.69, build 2. * The latest Debian patch set for libsgmls renamed /usr/bin/sgmlspl @@ -21,7 +72,7 @@ Tue Jul 15 08:57:22 BST 2014 This file has been renamed back to /usr/bin/sgmlspl Thanks to Matteo Bernardini for the report. -Fri May 16 00:50:09 BST 2014 +Fri May 16 00:50:09 UTC 2014 Stuart Winter <mozes@slackware.com> linuxdoc-tools 0.9.69, build 1. * Upgraded to linuxdoc-tools-0.9.69 @@ -30,7 +81,7 @@ Fri May 16 00:50:09 BST 2014 * Updated build script to cater for some small changes in source archive presentation. -Sun Jun 23 20:56:24 BST 2013 +Sun Jun 23 20:56:24 UTC 2013 Stuart Winter <mozes@slackware.com> linuxdoc-tools 0.9.68, build 4. * Added docbook2X-0.8.8 @@ -50,7 +101,7 @@ Fri Apr 5 21:51:02 UTC 2013 linuxdoc-tools 0.9.68, build 2. * Create a symlink VERSION.xsl -> VERSION -Tue Apr 2 19:54:49 BST 2013 +Tue Apr 2 19:54:49 UTC 2013 Stuart Winter <mozes@slackware.com> linuxdoc-tools 0.9.68, build 1. * Upgraded to linuxdoc-tools 0.9.68 @@ -58,14 +109,14 @@ Tue Apr 2 19:54:49 BST 2013 * Upgraded to DocBook XSL Stylesheets 1.78.1 * Removed dangling symlinks from /usr/doc. -Fri Jun 29 17:34:25 BST 2012 +Fri Jun 29 17:34:25 UTC 2012 Stuart Winter <mozes@slackware.com> linuxdoc-tools 0.9.67, build 2. - * Made a compatibility symlink between + * Made a compatibility symlink between /usr/share/xml/docbook/stylesheet/docbook-xsl -> /usr/share/xml/docbook/xsl-stylesheets-<ver> Thanks to Patrick Verner for the suggestion. -Mon May 28 21:40:41 BST 2012 +Mon May 28 21:40:41 UTC 2012 Stuart Winter <mozes@slackware.com> linuxdoc-tools 0.9.67, build 1 * Removed the files that were overlapping with the 'Python' (and any other) package. @@ -105,7 +156,7 @@ Thu Nov 11 13:37:42 CST 2010 * asciidoc: Patched to revert a change that broke processing the documentation for git. -Tue Oct 19 16:10:42 BST 2010 +Tue Oct 19 16:10:42 UTC 2010 Stuart Winter <mozes@slackware.com> linuxdoc-tools 0.9.66, build 4 Upgraded a couple of component packages: @@ -116,7 +167,7 @@ Tue Oct 19 16:10:42 BST 2010 Thanks to Trev Carey-Smith for the report and Robby Workman for finding the patch. -Sun Jul 25 12:40:07 BST 2010 +Sun Jul 25 12:40:07 UTC 2010 Stuart Winter <mozes@slackware.com> linuxdoc-tools 0.9.66, build 3 Upgraded a few component packages: @@ -125,7 +176,7 @@ Sun Jul 25 12:40:07 BST 2010 * Upgraded to gnome-doc-tools-0.20.1 Thanks to Steve Kennedy for the notification about the new version. * Updated various packages to include more recent patches from Fedora. - * Changed build script to use rpm2cpio instead of rpm2tgz because + * Changed build script to use rpm2cpio instead of rpm2tgz because with different builds/versions of rpm2tgz (or "rpm" - I'm not sure what causes the change) the "tgz" that is created flips back and forth between having the content in a sub directory, or the root @@ -141,7 +192,7 @@ Wed Feb 10 10:02:16 GMT 2010 * Applied an upstream patch to gtk-doc-1.13, fixing problems with gtkdoc-fixxref. * Updated build script to work with the new rpm2tgz which now - packages all src RPM contents into the root of the tar archive + packages all src RPM contents into the root of the tar archive rather than a sub directory. Tue Jan 12 20:42:57 GMT 2010 @@ -162,7 +213,7 @@ Tue Nov 10 18:28:49 GMT 2009 * Upgraded to xmlto-0.0.23 * Upgraded to asciidoc-8.5.1 -Sun Aug 2 19:07:43 BST 2009 +Sun Aug 2 19:07:43 UTC 2009 Stuart Winter <mozes@slackware.com> linuxdoc-tools-0.9.56, build 5. * Replace /usr/share/xml/docbook/xml-dtd-4.5/ent/isogrk4.ent with @@ -170,7 +221,7 @@ Sun Aug 2 19:07:43 BST 2009 ""1D6C2" is not a character number in the document character set" Thanks to Niels Horn for the fix and Ron Parker for the report. -Thu Jul 30 15:56:10 BST 2009 +Thu Jul 30 15:56:10 UTC 2009 Stuart Winter <mozes@slackware.com> linuxdoc-tools-0.9.56, build 4. * Upgraded to: @@ -207,16 +258,16 @@ a lot easier, so I'm very keen to keep to their build process If anybody knows how to resolve this, please let me know! -Fri May 29 18:48:41 BST 2009 +Fri May 29 18:48:41 UTC 2009 Stuart Winter <mozes@slackware.com> linuxdoc-tools-0.9.56, build 3. * Remove orphaned *.pyc (Python compiled) files. The addition of GNOME doc-tools causes some Python *.py files to be recompiled, resulting in them appearing in this - package. These files belonged to the Python package and - therefore caused an overlap. - -Mon May 25 14:29:26 BST 2009 + package. These files belonged to the Python package and + therefore caused an overlap. + +Mon May 25 14:29:26 UTC 2009 Stuart Winter <mozes@slackware.com> linuxdoc-tools-0.9.56, build 2. * Added missing asciidoc filters. @@ -224,7 +275,7 @@ Mon May 25 14:29:26 BST 2009 Now use asciidoc's 'make install' target to install rather than hand crafted script. -Tue May 12 18:34:38 BST 2009 +Tue May 12 18:34:38 UTC 2009 Stuart Winter <mozes@slackware.com> linuxdoc-tools-0.9.56, build 1. * Upgraded to linuxdoc-tools 0.9.56 @@ -247,7 +298,7 @@ Thu Feb 28 17:47:21 CST 2008 <pjv> sgml-common-0.6.3-23.fc9.src.rpm xmlto-0.0.20.tar.bz2 -Sat May 5 13:38:46 BST 2007 +Sat May 5 13:38:46 UTC 2007 Stuart Winter <mozes@slackware.com> linuxdoc-tools-0.9.21, build 4 * Converted from docbook RPM source builds to direct source build, with @@ -264,7 +315,7 @@ Sat May 5 13:38:46 BST 2007 * Upgraded to DocBook XSL Stylesheets v1.72.0 & docs * Added AsciiDoc v8.2.1 * Added xmlto v0.0.18 - * Removed unused build script code cruft from linuxdoc-tools.build + * Removed unused build script code cruft from linuxdoc-tools.build * Re-ordered the build script since OpenSP v1.5.2 requires xmlto, and xmlto requires the docbook stuff to be installed. * Removed buildDocBookCatalog script. If you delete your system's SGML or XML diff --git a/source/ap/linuxdoc-tools/arm/build b/source/ap/linuxdoc-tools/arm/build index a4a6410a9..b6dfb2519 100755 --- a/source/ap/linuxdoc-tools/arm/build +++ b/source/ap/linuxdoc-tools/arm/build @@ -9,8 +9,7 @@ source /usr/share/slackdev/buildkit.sh # Package metadata: export PKGNAM=linuxdoc-tools -export VERSION=${VERSION:-0.9.69} -export PKGARCH=${PKGARCH:-arm} +export VERSION=${VERSION:-0.9.72} export BUILD=${BUILD:-4} export PKGSERIES=${PKGSERIES:-ap} export SLACKPACKAGE=$PKGNAM-$VERSION-$PKGARCH-$BUILD.txz diff --git a/source/ap/linuxdoc-tools/doinst.sh b/source/ap/linuxdoc-tools/doinst.sh new file mode 100644 index 000000000..b9a1d17b6 --- /dev/null +++ b/source/ap/linuxdoc-tools/doinst.sh @@ -0,0 +1,13 @@ +#!/bin/bash +config() { + NEW="$1" + OLD="$( dirname $NEW )/$( basename $NEW .new )" + # If there's no config file by that name, mv it over: + if [ ! -r $OLD ]; then + mv $NEW $OLD + elif [ "$( md5sum < $OLD )" = "$( md5sum < $NEW )" ]; then # toss the redundant copy + rm $NEW + fi + # Otherwise, we leave the .new copy for the admin to consider... +} + diff --git a/source/ap/linuxdoc-tools/linuxdoc-tools.SlackBuild b/source/ap/linuxdoc-tools/linuxdoc-tools.SlackBuild index 7c2f20540..0dd27f994 100755 --- a/source/ap/linuxdoc-tools/linuxdoc-tools.SlackBuild +++ b/source/ap/linuxdoc-tools/linuxdoc-tools.SlackBuild @@ -1 +1,27 @@ +#!/bin/bash + +# This is just to gather information for use by PRINT_PACKAGE_NAME. Make any +# changes to the ./trackbuild script. +cd $(dirname $0) +PKGNAM=linuxdoc-tools +VERSION=$(grep PKGVERSION= trackbuild.linuxdoc-tools | cut -f 2 -d = | cut -f 1 -d ' ') +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) export ARCH=i586 ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$( uname -m ) ;; + esac +fi +BUILD=$(grep BUILD= trackbuild.linuxdoc-tools | cut -f 2 -d - | cut -f 1 -d }) + +# If the variable PRINT_PACKAGE_NAME is set, then this script will report what +# the name of the created package would be, and then exit. This information +# could be useful to other scripts. +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz" + exit 0 +fi + ./trackbuild.linuxdoc-tools diff --git a/source/ap/linuxdoc-tools/linuxdoc-tools.build b/source/ap/linuxdoc-tools/linuxdoc-tools.build index 2cf8aca9a..91521a6d0 100755 --- a/source/ap/linuxdoc-tools/linuxdoc-tools.build +++ b/source/ap/linuxdoc-tools/linuxdoc-tools.build @@ -18,32 +18,36 @@ LINUXDOCTOOLSVER=$PKGVERSION # Bundled package versions: ASCIIDOCVER=8.6.9 -DSSSLSTYLESHEETSVER=1.79 -XSLSTYLESHEETSVER=1.78.1 +DSSSLSTYLESHEETSVER=1.79 # docbook-dsssl-*.tar.xz (plus -doc- source archive), not SRPM. +XSLSTYLESHEETSVER=1.79.2 # docbook-style-xsl-*src.rpm ("DocBook XSL Stylesheets" in our ChangeLog.txt) DOCBOOKUTILSVER=0.6.14 SGMLDTD3VER=3.1 SGMLDTD4VER=4.5 XMLDTDVER=4.5 GNOMEDOCUTILSVER=0.20.10 -GTKDOCVER=1.24 +GTKDOCVER=1.25 SGMLSPLVER=1.03ii -OPENJADEVER=1.3.3-pre1 +OPENJADEVER=1.3.2 OPENSPVER=1.5.2 SGMLCOMMONVER=0.6.3 -XMLTOVER=0.0.26 +XMLTOVER=0.0.28 DOCBOOK2XVER=0.8.8 +# Global settings: +XML_CATALOG=/etc/xml/catalog +XML_DOCBOOKCATALOG=/etc/xml/docbook + # Determine the general CFLAGS for the known architectures: case $ARCH in - arm) export SLKCFLAGS="-O2 -march=armv5te" + arm*) export SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=hard" export LIBDIRSUFFIX="" - export HOSTTARGET="-gnueabi" + export HOSTTARGET="-gnueabihf" ;; - armv7hl) export SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16" - export LIBDIRSUFFIX="" - export HOSTTARGET="-gnueabi" + aarch64) export SLKCFLAGS="-O2" + export LIBDIRSUFFIX="64" + export HOSTTARGET="" ;; - i586) export SLKCFLAGS="-O2 -march=i586 -mtune=i686" + i?86) export SLKCFLAGS="-O2 -march=i586 -mtune=i686" export LIBDIRSUFFIX="" export HOSTTARGET="" ;; @@ -66,6 +70,9 @@ esac # Extract source: cd $TMP +mkdir asciidoc && cd asciidoc +#rpm2cpio $CWD/sources/asciidoc-${ASCIIDOCVER}*.src.rpm | cpio -div || exit 1 +#tar xvf asciidoc-$ASCIIDOCVER.tar.*z* tar xvf $CWD/sources/asciidoc-$ASCIIDOCVER.tar.*z* cd asciidoc-$ASCIIDOCVER || exit 1 chown -R root:root . @@ -75,6 +82,21 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +# Apply patches: +# Note: Don't take the "explicit-interpreter" patch) because: On Slackware 15.0, /usr/bin/python -> python2.7 +# Rationale: We're going to assume that by the time Slackware switches Python default to 3, AsciiDoc would +# also be Python3 compatible. If not, someone will probably patch it once all distributions +# drop Python2 support. +# +# Assemble patch list from spec file: +# egrep '^Patch[0-9].*: ' *.spec | awk -F: '{print $2" \\"}' +for i in \ + \ + 0001-a2x-Write-manifests-in-UTF-8-by-default.patch \ + \ + ; do xzcat $CWD/sources/${i}.xz | patch -p1 --verbose || exit 1 +done || exit 1 + # Configure: ./configure \ --prefix=/usr \ @@ -86,6 +108,10 @@ find . \ make install && make docs || exit 1 find /etc/asciidoc -type f -print0 | xargs -0 chmod 644 +# After the build completes, we'll rename the asciidoc config files to '.new' +# (see 'postbuildfixes.sh'), but for now we need them in place so that the +# application works, since asciidoc is used to build some of this monolithic package. + # Copy docs: mkdir -vpm755 /usr/doc/asciidoc-$ASCIIDOCVER cp -fav \ @@ -100,7 +126,7 @@ cd $TMP mkdir sgml-common && cd sgml-common rpm2cpio $CWD/sources/sgml-common-${SGMLCOMMONVER}*.src.rpm | cpio -div || exit 1 # The real source archive is stored inside the source RPM, you see: -tar xvf sgml-common-$SGMLCOMMONVER.tgz +tar xvf sgml-common-$SGMLCOMMONVER.tgz cd sgml-common-$SGMLCOMMONVER || exit 1 chown -R root:root . find . \ @@ -172,7 +198,7 @@ find . \ ############### ( cd docbook-$SGMLDTD3VER - pwd + pwd # Remove the ENT definitions from the catalog file: sed -i -e '/ISO 8879/d' docbook.cat @@ -188,7 +214,7 @@ find . \ # Update SGML catalog: install-catalog --add /etc/sgml/sgml-docbook-dtd-$SGMLDTD3VER.cat \ - /usr/share/sgml/docbook/sgml-dtd-$SGMLDTD3VER/catalog + /usr/share/sgml/docbook/sgml-dtd-$SGMLDTD3VER/catalog install-catalog --add /etc/sgml/sgml-docbook-dtd-$SGMLDTD3VER.cat \ /etc/sgml/sgml-docbook.cat @@ -205,7 +231,7 @@ EOF mkdir -vpm755 /usr/doc/sgml-dtd-$SGMLDTD3VER cp -fav \ ChangeLog *.txt \ - /usr/doc/sgml-dtd-$SGMLDTD3VER/ + /usr/doc/sgml-dtd-$SGMLDTD3VER/ ) ############### @@ -228,7 +254,7 @@ EOF cp -fav *.dtd *.mod *.dcl /usr/share/sgml/docbook/sgml-dtd-$SGMLDTD4VER # Update SGML catalog: install-catalog --add /etc/sgml/sgml-docbook-dtd-$SGMLDTD4VER.cat \ - /usr/share/sgml/docbook/sgml-dtd-$SGMLDTD4VER/catalog + /usr/share/sgml/docbook/sgml-dtd-$SGMLDTD4VER/catalog install-catalog --add /etc/sgml/sgml-docbook-dtd-$SGMLDTD4VER.cat \ /etc/sgml/sgml-docbook.cat @@ -262,7 +288,7 @@ EOF cd $TMP mkdir opensp && cd opensp rpm2cpio $CWD/sources/opensp-${OPENSPVER}*.src.rpm | cpio -div || exit 1 -tar xvf OpenSP-$OPENSPVER.tar.gz +tar xvf OpenSP-$OPENSPVER.tar.gz cd OpenSP-$OPENSPVER || exit 1 chown -R root:root . find . \ @@ -333,10 +359,10 @@ mv -f /usr/bin/osx /usr/bin/osgml2xml # #( cd /usr/man/man1 # mv -fv osx.1 osgml2xml.1 -# ln -vfs osgml2xml.1 osx.1 +# ln -vfs osgml2xml.1 osx.1 # for file in nsgmls sgmlnorm spam spent sgml2xml ; do # rm -f ${file}.1* -# ln -vfs o${file}.1 ${file}.1 +# ln -vfs o${file}.1 ${file}.1 # done #) @@ -349,8 +375,8 @@ mv -fv /usr/doc/OpenSP /usr/doc/OpenSP-$OPENSPVER # Extract source: cd $TMP -tar xvf $CWD/sources/openjade-${OPENJADEVER}.tar.*z* -cd openjade-${OPENJADEVER} || exit 1 +tar xvf $CWD/sources/openjade-${OPENJADEVER}.tar.xz +cd openjade*/ || exit 1 chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ @@ -359,21 +385,15 @@ find . \ -exec chmod 644 {} \; # Apply patches: -sed -i "s/iostream.h/iostream/g" style/MultiLineInlineNote.cxx - -# GCC 4.6 patch: -xz -dc $CWD/sources/openjade-1.3.2-gcc46.patch.xz | patch --verbose -p1 || exit 1 +# +# GCC >=4.6 patch: +xz -dc $CWD/sources/openjade-1.3.2-gcc46.patch.xz | patch -p1 --verbose || exit 1 -# Install the old Perl 4 'getopts' function. This has been deprecated in Perl 5.16 -# and since it seems that OpenJade isn't being actively released by upstream, we'll -# work around by supplying it to OpenJade directly. It's only a build-time fix anyway -# so it's ok to have a dirty work-around: -xz -dc $CWD/sources/openjade-1.3-getopts.pl.xz > getopts.pl +# Migrate from Perl 4 'getopts' function which was deprecated in Perl 5.16: +sed -i -e '/getopts/{N;s#&G#g#;s#do .getopts.pl.;##;}' -e '/use POSIX/ause Getopt::Std;' msggen.pl -# Configure without optimisation. -# OpenSP & OpenJade are sensitive to optimisations and can result -# in segfaults with anything other than O2 - particularly on the ARM -# platform. +# Configure: +CXXFLAGS="$SLKCFLAGS -fno-lifetime-dse" \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ @@ -388,8 +408,8 @@ xz -dc $CWD/sources/openjade-1.3-getopts.pl.xz > getopts.pl --datadir=/usr/share/sgml/openjade-$OPENJADEVER \ || exit 1 -# Build (setting the perl library to be the PWD so it finds the old 'getopts.pl'): -make PERL5LIB=$PWD || exit 1 +# Build: +make || exit 1 # Install: mkdir -p /etc/sgml @@ -470,7 +490,7 @@ cp -fav \ cd $TMP mkdir docbook-utils && cd docbook-utils rpm2cpio $CWD/sources/docbook-utils-${DOCBOOKUTILSVER}*.src.rpm | cpio -div || exit 1 -tar xvf docbook-utils-$DOCBOOKUTILSVER.tar.gz +tar xvf docbook-utils-$DOCBOOKUTILSVER.tar.gz cd docbook-utils-$DOCBOOKUTILSVER || exit 1 chown -R root:root . find . \ @@ -479,18 +499,23 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +# Extract patch set from Spec file: +# egrep '^Patch[0-9].*: ' *.spec | awk -F: '{print $2" \\"}' +# # Apply patches: for i in \ - docbook-utils-spaces.patch \ - docbook-utils-2ndspaces.patch \ - docbook-utils-w3mtxtconvert.patch \ - docbook-utils-grepnocolors.patch \ - docbook-utils-sgmlinclude.patch \ - docbook-utils-rtfmanpage.patch \ - docbook-utils-papersize.patch \ - docbook-utils-nofinalecho.patch \ - docbook-utils-newgrep.patch ; do - patch --verbose -p1 < ../$i + \ + docbook-utils-spaces.patch \ + docbook-utils-2ndspaces.patch \ + docbook-utils-w3mtxtconvert.patch \ + docbook-utils-grepnocolors.patch \ + docbook-utils-sgmlinclude.patch \ + docbook-utils-rtfmanpage.patch \ + docbook-utils-papersize.patch \ + docbook-utils-nofinalecho.patch \ + docbook-utils-newgrep.patch \ + \ + ; do patch --verbose -p1 < ../$i done || exit 1 # Configure: @@ -563,7 +588,7 @@ mkdir -vpm755 /usr/share/xml/docbook/xml-dtd-$XMLDTDVER cp -fav docbook.cat *.dtd *.mod ent/ \ /usr/share/xml/docbook/xml-dtd-$XMLDTDVER -# Use the Unicode-4 entities from sgml-common to fix errors such as +# Use the Unicode-4 entities from sgml-common to fix errors such as # "1D6C2" is not a character number in the document character set ( cd /usr/share/xml/docbook/xml-dtd-$XMLDTDVER/ent rm -fv isogrk4.ent @@ -577,76 +602,76 @@ mkdir -vpm755 /etc/xml # # Populate /etc/xml/docbook: # -if [ ! -e /etc/xml/docbook ]; then - xmlcatalog --noout --create /etc/xml/docbook +if [ ! -e $XML_DOCBOOKCATALOG ]; then + xmlcatalog --noout --create $XML_DOCBOOKCATALOG fi && xmlcatalog --noout --add "public" \ "-//OASIS//DTD DocBook XML V${XMLDTDVER}//EN" \ "http://www.oasis-open.org/docbook/xml/${XMLDTDVER}/docbookx.dtd" \ - /etc/xml/docbook && + $XML_DOCBOOKCATALOG && xmlcatalog --noout --add "public" \ "-//OASIS//DTD DocBook XML CALS Table Model V${XMLDTDVER}//EN" \ "file:///usr/share/xml/docbook/xml-dtd-${XMLDTDVER}/calstblx.dtd" \ - /etc/xml/docbook && + $XML_DOCBOOKCATALOG && xmlcatalog --noout --add "public" \ "-//OASIS//DTD XML Exchange Table Model 19990315//EN" \ "file:///usr/share/xml/docbook/xml-dtd-${XMLDTDVER}/soextblx.dtd" \ - /etc/xml/docbook && + $XML_DOCBOOKCATALOG && xmlcatalog --noout --add "public" \ "-//OASIS//ELEMENTS DocBook XML Information Pool V${XMLDTDVER}//EN" \ "file:///usr/share/xml/docbook/xml-dtd-${XMLDTDVER}/dbpoolx.mod" \ - /etc/xml/docbook && + $XML_DOCBOOKCATALOG && xmlcatalog --noout --add "public" \ "-//OASIS//ELEMENTS DocBook XML Document Hierarchy V${XMLDTDVER}//EN" \ "file:///usr/share/xml/docbook/xml-dtd-${XMLDTDVER}/dbhierx.mod" \ - /etc/xml/docbook && + $XML_DOCBOOKCATALOG && xmlcatalog --noout --add "public" \ "-//OASIS//ELEMENTS DocBook XML HTML Tables V${XMLDTDVER}//EN" \ "file:///usr/share/xml/docbook/xml-dtd-${XMLDTDVER}/htmltblx.mod" \ - /etc/xml/docbook && + $XML_DOCBOOKCATALOG && xmlcatalog --noout --add "public" \ "-//OASIS//ENTITIES DocBook XML Notations V${XMLDTDVER}//EN" \ "file:///usr/share/xml/docbook/xml-dtd-${XMLDTDVER}/dbnotnx.mod" \ - /etc/xml/docbook && + $XML_DOCBOOKCATALOG && xmlcatalog --noout --add "public" \ "-//OASIS//ENTITIES DocBook XML Character Entities V${XMLDTDVER}//EN" \ "file:///usr/share/xml/docbook/xml-dtd-${XMLDTDVER}/dbcentx.mod" \ - /etc/xml/docbook && + $XML_DOCBOOKCATALOG && xmlcatalog --noout --add "public" \ "-//OASIS//ENTITIES DocBook XML Additional General Entities V${XMLDTDVER}//EN" \ "file:///usr/share/xml/docbook/xml-dtd-${XMLDTDVER}/dbgenent.mod" \ - /etc/xml/docbook && + $XML_DOCBOOKCATALOG && xmlcatalog --noout --add "rewriteSystem" \ "http://www.oasis-open.org/docbook/xml/${XMLDTDVER}" \ "file:///usr/share/xml/docbook/xml-dtd-${XMLDTDVER}" \ - /etc/xml/docbook && + $XML_DOCBOOKCATALOG && xmlcatalog --noout --add "rewriteURI" \ "http://www.oasis-open.org/docbook/xml/${XMLDTDVER}" \ "file:///usr/share/xml/docbook/xml-dtd-${XMLDTDVER}" \ - /etc/xml/docbook + $XML_DOCBOOKCATALOG || exit 1 # # Populate /etc/xml/catalog: # -if [ ! -e /etc/xml/catalog ]; then - xmlcatalog --noout --create /etc/xml/catalog +if [ ! -e $XML_CATALOG ]; then + xmlcatalog --noout --create $XML_CATALOG fi && xmlcatalog --noout --add "delegatePublic" \ "-//OASIS//ENTITIES DocBook XML" \ "file:///etc/xml/docbook" \ - /etc/xml/catalog && + $XML_CATALOG && xmlcatalog --noout --add "delegatePublic" \ "-//OASIS//DTD DocBook XML" \ "file:///etc/xml/docbook" \ - /etc/xml/catalog && + $XML_CATALOG && xmlcatalog --noout --add "delegateSystem" \ "http://www.oasis-open.org/docbook/" \ "file:///etc/xml/docbook" \ - /etc/xml/catalog && + $XML_CATALOG && xmlcatalog --noout --add "delegateURI" \ "http://www.oasis-open.org/docbook/" \ "file:///etc/xml/docbook" \ - /etc/xml/catalog + $XML_CATALOG || exit 1 # Rewrites for older docbooks. This allows older docbooks to be referenced. # It means, however, that you __*shouldn't* have these older docbooks__ @@ -658,23 +683,23 @@ do xmlcatalog --noout --add "public" \ "-//OASIS//DTD DocBook XML V$DTDVERSION//EN" \ "http://www.oasis-open.org/docbook/xml/$DTDVERSION/docbookx.dtd" \ - /etc/xml/docbook + $XML_DOCBOOKCATALOG || exit 1 xmlcatalog --noout --add "rewriteSystem" \ "http://www.oasis-open.org/docbook/xml/$DTDVERSION" \ "file:///usr/share/xml/docbook/xml-dtd-$XMLDTDVER" \ - /etc/xml/docbook + $XML_DOCBOOKCATALOG || exit 1 xmlcatalog --noout --add "rewriteURI" \ "http://www.oasis-open.org/docbook/xml/$DTDVERSION" \ "file:///usr/share/xml/docbook/xml-dtd-$XMLDTDVER" \ - /etc/xml/docbook + $XML_DOCBOOKCATALOG || exit 1 xmlcatalog --noout --add "delegateSystem" \ "http://www.oasis-open.org/docbook/xml/$DTDVERSION/" \ "file:///etc/xml/docbook" \ - /etc/xml/catalog + $XML_CATALOG || exit 1 xmlcatalog --noout --add "delegateURI" \ "http://www.oasis-open.org/docbook/xml/$DTDVERSION/" \ "file:///etc/xml/docbook" \ - /etc/xml/catalog + $XML_CATALOG || exit 1 done # Copy docs: @@ -686,16 +711,24 @@ cp -favv \ ############################### ## docbook-xsl (stylesheets) ## ############################### - +# Build receipes: +# [1] http://www.linuxfromscratch.org/blfs/view/8.1/pst/docbook-xsl.html +# [2] Fedora's .spec file - included witin the SRPM we extract. +# # Extract source: cd $TMP mkdir docbook-style-xsl && cd docbook-style-xsl -rpm2cpio $CWD/sources/docbook-style-xsl-${XSLSTYLESHEETSVER}*.src.rpm | cpio -div || exit 1 -tar xvf docbook-xsl-$XSLSTYLESHEETSVER.tar.bz2 -# This unpacks atop of the main tree: -tar xvf docbook-xsl-doc-$XSLSTYLESHEETSVER.tar.bz2 - -# Enter unpacked sources: +# This directory holds the sources and patches extracted from the SRPM: +rpm2cpio $CWD/sources/docbook-style-xsl-*.src.rpm | cpio -div || exit 1 +# Create a build directory to contain the two source archives: +# +# Rename the "-nons-" package name back to the original, "docbook-xsl-<version>" +mkdir -p build/docbook-xsl-$XSLSTYLESHEETSVER ; cd build/docbook-xsl-$XSLSTYLESHEETSVER +tar xvf ../../docbook-xsl-nons-$XSLSTYLESHEETSVER.tar.bz2 || exit 1 +mv -fv docbook-xsl-nons-$XSLSTYLESHEETSVER/* . +cd .. +# Merge doc package into a single source tree (unpacks in to docbook-xsl-$XSLSTYLESHEETSVER) +tar xvf ../docbook-xsl-doc-$XSLSTYLESHEETSVER.tar.bz2 || exit 1 cd docbook-xsl-$XSLSTYLESHEETSVER || exit 1 chown -R root:root . @@ -705,68 +738,100 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +# Assemble patch list from spec file: +# egrep '^Patch[0-9].*: ' *.spec | awk -F: '{print $2" \\"}' # Apply patches: for i in \ - docbook-xsl-pagesetup.patch \ - docbook-xsl-marginleft.patch \ - docbook-xsl-newmethods.patch \ - docbook-xsl-non-constant-expressions.patch \ - docbook-xsl-list-item-body.patch \ - docbook-xsl-mandir.patch ; do - patch --verbose -p1 < ../$i + \ + docbook-xsl-pagesetup.patch \ + docbook-xsl-marginleft.patch \ + docbook-xsl-newmethods.patch \ + docbook-xsl-non-constant-expressions.patch \ + docbook-xsl-list-item-body.patch \ + docbook-xsl-mandir.patch \ + \ + ; do patch --verbose -p1 < ../../$i done || exit 1 +patch -p2 < ../../docbook-style-xsl-non-recursive-string-subst.patch || exit 1 + +cp -fav ../../docbook-style-xsl.Makefile Makefile +# Switch to UTF-8 files: +for fhtml in $(find ./doc -name '*.html' -type f) ; do + iconv -f ISO-8859-1 -t UTF-8 "$fhtml" -o "$fhtml".tmp + mv -f "$fhtml".tmp "$fhtml" + sed -i 's/charset=ISO-8859-1/charset=UTF-8/' "$fhtml" +done +for f in $(find -name "*'*") ; do + mv -fv "$f" $(echo "$f" | tr -d "'") +done + +# Build and install: +make install \ + BINDIR=/usr/bin \ + DESTDIR=/usr/share/xml/docbook/xsl-stylesheets-$XSLSTYLESHEETSVER || exit 1 +install -vpm644 \ + VERSION.xsl \ + /usr/share/xml/docbook/xsl-stylesheets-$XSLSTYLESHEETSVER/ || exit 1 +ln -vfs xsl-stylesheets-$XSLSTYLESHEETSVER \ + /usr/share/xml/docbook/xsl-stylesheets +# Don't ship the extensions (https://bugzilla.redhat.com/show_bug.cgi?id=177256) +rm -rf /usr/share/xml/docbook/xsl-stylesheets/extensions/* -# Install: -mkdir -vpm755 /usr/share/xml/docbook/xsl-stylesheets-$XSLSTYLESHEETSVER -cp -fav \ - VERSION common eclipse extensions fo highlighting html \ - htmlhelp images javahelp lib manpages params profiling \ - slides template tools website wordml xhtml \ - /usr/share/xml/docbook/xsl-stylesheets-$XSLSTYLESHEETSVER # Some Linux distributions have this here, so we install a compatibility symlink: # (this convoluted way of doing it is for makepkg's benefit) mkdir -vpm755 /usr/share/xml/docbook/stylesheet ( cd /usr/share/xml/docbook/stylesheet rm -fv docbook-xsl - ln -vfs ../xsl-stylesheets-$XSLSTYLESHEETSVER docbook-xsl ) + ln -vfs ../xsl-stylesheets-$XSLSTYLESHEETSVER docbook-xsl + # Some stylesheets will look for 'VERSION.xsl' or 'VERSION' + # Migrating from docbook-xsl to docbook-xsl-nons has meant both are + # now present, and differ by a couple of lines. + # However, if 'VERSION' ceases to exist, let's symlink it to .xsl + # (which will be present, since we put it there during the install phase above). + cd docbook-xsl + [ ! -r VERSION ] && ln -vsf VERSION.xsl VERSION + ) -# Some stylesheets will look for VERSION.xsl rather than VERSION. -# They are the same in the sources, so make a compatibility symlink: -if [ ! -r /usr/share/xml/docbook/stylesheet/docbook-xsl/VERSION.xsl ]; then - ( cd /usr/share/xml/docbook/stylesheet/docbook-xsl ; ln -sf VERSION VERSION.xsl ) -fi +# Copy docs: +mkdir -vpm755 /usr/doc/docbook-xsl-$XSLSTYLESHEETSVER +cp -fav doc/* README* RELEASE-NOTES* NEWS* \ + /usr/doc/docbook-xsl-$XSLSTYLESHEETSVER # Create config files: -if [ ! -d /etc/xml ]; then install -v -m755 -d /etc/xml; fi -if [ ! -f /etc/xml/catalog ]; then - xmlcatalog --noout --create /etc/xml/catalog +mkdir -vpm755 /etc/xml +if [ ! -f $XML_CATALOG ]; then + xmlcatalog --noout --create $XML_CATALOG fi - # Configure system: xmlcatalog --noout --add "rewriteSystem" \ - "http://docbook.sourceforge.net/release/xsl/$XSLSTYLESHEETSVER" \ - "/usr/share/xml/docbook/xsl-stylesheets-$XSLSTYLESHEETSVER" \ - /etc/xml/catalog - + "http://cdn.docbook.org/release/xsl-nons/$XSLSTYLESHEETSVER" \ + "file://usr/share/xml/docbook/xsl-stylesheets-$XSLSTYLESHEETSVER" \ + $XML_CATALOG || exit 1 xmlcatalog --noout --add "rewriteURI" \ - "http://docbook.sourceforge.net/release/xsl/$XSLSTYLESHEETSVER" \ - "/usr/share/xml/docbook/xsl-stylesheets-$XSLSTYLESHEETSVER" \ - /etc/xml/catalog - + "http://cdn.docbook.org/release/xsl-nons/$XSLSTYLESHEETSVER" \ + "file://usr/share/xml/docbook/xsl-stylesheets-$XSLSTYLESHEETSVER" \ + $XML_CATALOG || exit 1 +xmlcatalog --noout --add "rewriteSystem" \ + "http://cdn.docbook.org/release/xsl-nons/current" \ + "file://usr/share/xml/docbook/xsl-stylesheets-$XSLSTYLESHEETSVER" \ + $XML_CATALOG || exit 1 +xmlcatalog --noout --add "rewriteURI" \ + "http://cdn.docbook.org/release/xsl-nons/current/" \ + "file://usr/share/xml/docbook/xsl-stylesheets-$XSLSTYLESHEETSVER" \ + $XML_CATALOG || exit 1 + +## Note: +## These are the sourceforge URIs, for the previous package before +## it was renamed to "-nons". We'll keep these around for a while, but +## check that they still exist when next updating this package. xmlcatalog --noout --add "rewriteSystem" \ "http://docbook.sourceforge.net/release/xsl/current" \ "/usr/share/xml/docbook/xsl-stylesheets-$XSLSTYLESHEETSVER" \ - /etc/xml/catalog - + $XML_CATALOG || exit 1 xmlcatalog --noout --add "rewriteURI" \ "http://docbook.sourceforge.net/release/xsl/current" \ "/usr/share/xml/docbook/xsl-stylesheets-$XSLSTYLESHEETSVER" \ - /etc/xml/catalog - -# Copy docs: -mkdir -vpm755 /usr/doc/docbook-xsl-$XSLSTYLESHEETSVER -cp -fav doc/* README* RELEASE-NOTES* NEWS* \ - /usr/doc/docbook-xsl-$XSLSTYLESHEETSVER + $XML_CATALOG || exit 1 ####################### Build xmlto ################################ @@ -818,7 +883,9 @@ find . \ tar xvvf $CWD/sources/libsgmls-perl_$SGMLSPLVER-*.debian.tar.xz || exit 1 # Apply patches from Debian: -cat debian/patches/series | while read dpf ; do patch -p1 --verbose < debian/patches/$dpf || exit 1 ; done || exit 1 +cat debian/patches/series | while read dpf ; do + patch -p1 --verbose < debian/patches/$dpf || exit 1 +done || exit 1 # Configure: perl Makefile.PL INSTALLDIRS=vendor || exit 1 @@ -886,6 +953,7 @@ CPPFLAGS="$SLKCFLAGS" \ --mandir=/usr/man \ --with-installed-nsgmls \ --infodir=/usr/info \ + --enable-docs="txt html info" \ || exit 1 # --with-installed-iso-entities \ # --with-texdir=/usr/share/texmf/tex/latex/ \ @@ -914,7 +982,7 @@ make install \ # Install info page: cat debian/linuxdoc-tools.info-base doc/guide.info > /usr/info/linuxdoc-sgml.info -# This package contains a number of programs. +# This package contains a number of programs. # We maintain our own change log for this package. Since the package name is # 'linuxdoc-tools', let's put our changelog into here: install -vpm644 $CWD/ChangeLog.txt /usr/doc/linuxdoc-tools-$LINUXDOCTOOLSVER/Slackware-ChangeLog.txt @@ -927,7 +995,7 @@ export PATH=$OPATH # Extract source: cd $TMP tar xvf $CWD/sources/gnome-doc-utils-$GNOMEDOCUTILSVER.tar.*z* -cd gnome-doc-utils-* || exit 1 +cd gnome-doc-utils-*/ || exit 1 chown -R root:root . find . \ @@ -966,7 +1034,7 @@ cp -fav \ # Extract source: cd $TMP -tar xvf $CWD/sources/gtk-doc-$GTKDOCVER.tar.*z* +tar xvf $CWD/sources/gtk-doc-$GTKDOCVER.tar.*z* cd gtk-doc-$GTKDOCVER || exit 1 chown -R root:root . find . \ @@ -1002,7 +1070,7 @@ cd $TMP ( mkdir XML-NamespaceSupport && cd XML-NamespaceSupport rpm2cpio $CWD/sources/perl-XML-NamespaceSupport-*.src.rpm | cpio -di tar xvf XML-NamespaceSupport-*.tar.gz - cd XML-NamespaceSupport* || exit 1 + cd XML-NamespaceSupport*/ || exit 1 perl Makefile.PL INSTALLDIRS=vendor # Make sure the man pages go where we want them: fgrep -lr -- '/share/man/' . | xargs sed -i 's?/share/man/?/man/?g' @@ -1012,8 +1080,8 @@ cd $TMP ( mkdir perl-XML-SAX-Base && cd perl-XML-SAX-Base rpm2cpio $CWD/sources/perl-XML-SAX-Base-*.src.rpm | cpio -di - tar xvf XML-SAX-Base-*z - cd XML-SAX-Base-* || exit 1 + tar xvf XML-SAX-Base-*z + cd XML-SAX-Base-*/ || exit 1 perl Makefile.PL INSTALLDIRS=vendor fgrep -lr -- '/share/man/' . | xargs sed -i 's?/share/man/?/man/?g' make || exit 1 @@ -1023,7 +1091,7 @@ cd $TMP ( mkdir XML-SAX && cd XML-SAX rpm2cpio $CWD/sources/perl-XML-SAX-[0-9]*.src.rpm | cpio -di tar xvf XML-SAX-*nopatents.tar* - cd XML-SAX-* || exit 1 + cd XML-SAX-*/ || exit 1 patch -p1 < ../perl-XML-SAX-0.99-rt20126.patch || exit 1 # Answer Y to updating ParserDetails.ini: yes | perl Makefile.PL INSTALLDIRS=vendor @@ -1038,7 +1106,7 @@ cd $TMP # Build docbook2X: # Extract source: tar xvf $CWD/sources/docbook2x*.orig.tar.xz -cd docbook2X-* || exit 1 +cd docbook2X-*/ || exit 1 chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ @@ -1090,8 +1158,8 @@ cp -fav \ ####################################################################### -# Install the package description: +# Install the package description and post installation script: rm -rf /install mkdir -vpm755 /install install -vpm644 $CWD/slack-desc /install -#EOF +zcat $CWD/doinst.sh.gz > /install/doinst.sh diff --git a/source/ap/linuxdoc-tools/postbuildfixes.sh b/source/ap/linuxdoc-tools/postbuildfixes.sh index c3d99e0ed..c7cb28783 100755 --- a/source/ap/linuxdoc-tools/postbuildfixes.sh +++ b/source/ap/linuxdoc-tools/postbuildfixes.sh @@ -1,17 +1,38 @@ #!/bin/bash # Once slacktrack has determined what the contents of the package -# should be, it copies them into $SLACKTRACKFAKEROOT +# should be, it copies them into $SLACKTRACKFAKEROOT and creates +# an entry in /var/log/packages. +# Subsequently, within $SLACKTRACKFAKEROOT, it performs the requested +# packaging operations (gzipping man pages, setting permissions and ownerships, +# etc.) and then runs _this_ script. +# # From here we can make modifications to the package's contents # immediately prior to the invocation of makepkg: slacktrack will -# do nothing else with the contents of the package after the execution -# of this script. - +# perform no other operations upon the contents of the package after +# the execution of _this_ script. +# It also means that when we rename the conf files to ".new", it does not +# affect the ability to ''removepkg linuxdoc-tools'' on the build box, +# as the entry in /var/log/packages still matches what was installed +# into /etc by the 'linuxdoc-tools.build' script. +# # If you modify anything here, be careful *not* to include the full # path name - only use relative paths (ie rm usr/bin/foo *not* rm /usr/bin/foo). # Enter the package's contents: -cd $SLACKTRACKFAKEROOT +cd $SLACKTRACKFAKEROOT || exit 1 + +# Remove .la files: +echo "Deleting .la files..." +find . -type f -name '*.la' -print | while read lafile ; do + # Remove it from the build box itself to prevent other packages potentially referencing it. + # This wouldn't be a problem if you removepkg linuxdoc-tools (the version created by slacktrack + # that contains everything prior to _this_ post build script running) before building any other + # packages; but in case you don't, let's remove it from the OS file system: + rm "/${lafile}" + # Remove it from the distributable package t?z file: + rm -fv "${lafile}" +done # OpenSP creates this symlink; we delete it. if [ -L usr/share/doc ]; then @@ -35,7 +56,7 @@ chmod -R a-s . # Remove dangling symlinks from /usr/doc. asciidoc-8.6.7 was a culprit. find usr/doc -xtype l -print0 | xargs -0 rm -fv -# Ensure some permissions. +# Ensure some permissions. # I don't know why but these dirs are installed chmod 1755: #drwxr-xr-t root/root 0 2006-05-27 15:42:44 var/lib/texmf/ #drwxr-xr-t root/root 0 2006-05-27 15:42:44 var/lib/texmf/pk/ @@ -52,7 +73,7 @@ find usr/doc -xtype l -print0 | xargs -0 rm -fv # This directory needs these permissions to permit pleb accounts to make # fonts: #chmod 1777 var/lib/texmf -# +# # Never mind: I think this stuff is surplus to requirements: rm -rf var/lib/texmf # Now to prevent deletion of anything else that lives in the package's '/var' @@ -60,13 +81,29 @@ rmdir var/lib rmdir var # There's no reason to include huge redundant documentation: -cd usr/doc +pushd usr/doc find . -name "*.txt" | while read docfile ; do basedocname=$(echo $docfile | rev | cut -f 2- -d . | rev) rm -fv ${basedocname}.{html,pdf,xml} rm -fv docbook-xsl*/reference.pdf.gz done +popd + +# Allow preservation of conf files for ascii-doc. Some of the other bundled +# packages may benefit from this treatment, but nobody's asked for anything +# other than asciidoc in over 10 years! +echo "Renaming configuration files to '.conf.new'.." +find etc/asciidoc -type f -name '*.conf' -print0 | xargs -0i mv -fv '{}' '{}.new' +# Search for any dangling symlinks created by renaming the files: +if [ ! -z "$( find -L etc/asciidoc -type l -print )" ]; then + echo "WARNING: Dangling symlinks in etc/asciidoc -- you need to fix them!" + find -L etc/asciidoc -type l -print +fi +# Populate the doinst.sh script +find etc/asciidoc -type f -name '*.conf.new' | while read cfile ; do + echo "config $cfile" >> install/doinst.sh +done -# Now you should manually extract the .tgz +# Now you should manually extract the .t?z # - check through the install/doinst.sh script; # - check the contents, permissions and ownerships in the package archive. diff --git a/source/ap/linuxdoc-tools/slack-desc b/source/ap/linuxdoc-tools/slack-desc index 3b9eec9fb..9a0797bcb 100644 --- a/source/ap/linuxdoc-tools/slack-desc +++ b/source/ap/linuxdoc-tools/slack-desc @@ -1,19 +1,19 @@ # HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line +# The "handy ruler" below makes it easier to edit a package description. Line # up the first '|' above the ':' following the base package name, and the '|' on -# the right side marks the last column you can put a character in. You must make -# exactly 11 lines for the formatting to be correct. It's also customary to +# the right side marks the last column you can put a character in. You must make +# exactly 11 lines for the formatting to be correct. It's also customary to # leave one space after the ':'. |-----handy-ruler------------------------------------------------------| linuxdoc-tools: linuxdoc-tools (utilities for working with DocBook and SGML) linuxdoc-tools: -linuxdoc-tools: SGML stands for Standard Generalized Markup Language. This is a +linuxdoc-tools: SGML stands for Standard Generalized Markup Language. This is a linuxdoc-tools: system which allows you to produce LaTeX, HTML, GNU info, LyX, RTF, -linuxdoc-tools: and plain text (via groff) from a single source file in SGML. It is +linuxdoc-tools: and plain text (via groff) from a single source file in SGML. It is linuxdoc-tools: often used for technical software documentation, such as the Linux -linuxdoc-tools: HOWTO documents. +linuxdoc-tools: HOWTO documents. linuxdoc-tools: -linuxdoc-tools: This package includes everything you need to use SGML -- all of the +linuxdoc-tools: This package includes everything you need to use SGML - all of the linuxdoc-tools: standard SGML tools; OpenJade; tools for working with DocBook linuxdoc-tools: documents (various DTDs); xmlto and AsciiDoc. diff --git a/source/ap/linuxdoc-tools/sources/asciidoc-0001-a2x-Write-manifests-in-UTF-8-by-default.patch b/source/ap/linuxdoc-tools/sources/asciidoc-0001-a2x-Write-manifests-in-UTF-8-by-default.patch new file mode 100644 index 000000000..d6d45df0b --- /dev/null +++ b/source/ap/linuxdoc-tools/sources/asciidoc-0001-a2x-Write-manifests-in-UTF-8-by-default.patch @@ -0,0 +1,38 @@ +From adb0929f0db4da533a9d5b317e6f49a91feb3b3e Mon Sep 17 00:00:00 2001 +From: Stanislav Ochotnicky <sochotnicky@redhat.com> +Date: Tue, 3 Dec 2013 18:03:13 +0100 +Subject: [PATCH] [a2x] Write manifests in UTF-8 by default + +This is a workaround for rhbz#968308 where a2x tries to write non-ASCII content +epub manifest. Since the write_file is mostly used to write xml content which +defaults to UTF-8 this seems fairly safe +--- + a2x.py | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/a2x.py b/a2x.py +index 1b192a2..ad163e3 100755 +--- a/a2x.py ++++ b/a2x.py +@@ -21,6 +21,7 @@ import urlparse + import zipfile + import xml.dom.minidom + import mimetypes ++import codecs + + PROG = os.path.basename(os.path.splitext(__file__)[0]) + VERSION = '8.6.8' +@@ -144,8 +145,8 @@ def find_executable(file_name): + result = _find_executable(file_name) + return result + +-def write_file(filename, data, mode='w'): +- f = open(filename, mode) ++def write_file(filename, data, mode='w', encoding='utf-8'): ++ f = codecs.open(filename, mode, encoding) + try: + f.write(data) + finally: +-- +1.8.4.2 + diff --git a/source/ap/linuxdoc-tools/sources/linuxdoc-tools-0.9.68-flex.patch b/source/ap/linuxdoc-tools/sources/linuxdoc-tools-0.9.68-flex.patch deleted file mode 100644 index ba3da2ee8..000000000 --- a/source/ap/linuxdoc-tools/sources/linuxdoc-tools-0.9.68-flex.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- linuxdoc-tools-0.9.68/rtf-fix/rtf2rtf.l 2008-05-28 18:16:36.000000000 +0200 -+++ linuxdoc-tools-0.9.68/rtf-fix/rtf2rtf.l-patched 2013-02-19 11:10:25.367016000 +0100 -@@ -72,7 +72,14 @@ - int skipnewline = 0; - - extern char *yytext; -+ -+#if YY_FLEX_MAJOR_VERSION > 2 \ -+ || (YY_FLEX_MAJOR_VERSION == 2 && YY_FLEX_MINOR_VERSION > 5) \ -+ || (YY_FLEX_MAJOR_VERSION == 2 && YY_FLEX_MINOR_VERSION == 5 && YY_FLEX_SUBMINOR_VERSION > 35) -+extern yy_size_t yyleng; -+#else - extern int yyleng; -+#endif - - #define CHAPTER 1 - #define SECTION 2 diff --git a/source/ap/linuxdoc-tools/sources/openjade-1.3-getopts.pl b/source/ap/linuxdoc-tools/sources/openjade-1.3-getopts.pl deleted file mode 100644 index 5b18fe009..000000000 --- a/source/ap/linuxdoc-tools/sources/openjade-1.3-getopts.pl +++ /dev/null @@ -1,65 +0,0 @@ -;# getopts.pl - a better getopt.pl -# -# This library is no longer being maintained, and is included for backward -# compatibility with Perl 4 programs which may require it. -# -# In particular, this should not be used as an example of modern Perl -# programming techniques. -# -# Suggested alternatives: Getopt::Long or Getopt::Std -# -;# Usage: -;# do Getopts('a:bc'); # -a takes arg. -b & -c not. Sets opt_* as a -;# # side effect. - -sub Getopts { - local($argumentative) = @_; - local(@args,$_,$first,$rest); - local($errs) = 0; - - @args = split( / */, $argumentative ); - while(@ARGV && ($_ = $ARGV[0]) =~ /^-(.)(.*)/) { - ($first,$rest) = ($1,$2); - $pos = index($argumentative,$first); - if($pos >= 0) { - if($args[$pos+1] eq ':') { - shift(@ARGV); - if($rest eq '') { - ++$errs unless(@ARGV); - $rest = shift(@ARGV); - } - eval " - push(\@opt_$first, \$rest); - if (!defined \$opt_$first or \$opt_$first eq '') { - \$opt_$first = \$rest; - } - else { - \$opt_$first .= ' ' . \$rest; - } - "; - } - else { - eval "\$opt_$first = 1"; - if($rest eq '') { - shift(@ARGV); - } - else { - $ARGV[0] = "-$rest"; - } - } - } - else { - print STDERR "Unknown option: $first\n"; - ++$errs; - if($rest ne '') { - $ARGV[0] = "-$rest"; - } - else { - shift(@ARGV); - } - } - } - $errs == 0; -} - -1; diff --git a/source/ap/linuxdoc-tools/sources/source.download b/source/ap/linuxdoc-tools/sources/source.download index d723574cb..e30a191d8 100755 --- a/source/ap/linuxdoc-tools/sources/source.download +++ b/source/ap/linuxdoc-tools/sources/source.download @@ -1,3 +1,11 @@ +# Extract all SRPM URLs to make it easy to download. +# Often there's nothing that's changed between the version of the SRPM we hold, and +# the upstream version - the version was increased due to a rebuild within Fedora. +# However, I update our copy of the SRPM regardless, since it eases maintenance. +# +# egrep "^wget.*src.rpm$" source.download +# + # Incase you're wondering why we're using source RPMs, this is because # they contain patches required to either fix build or runtime problems, # and it's easier to maintain this hunk of a package when the patches & @@ -9,7 +17,7 @@ # https://packages.debian.org/sid/linuxdoc-tools # # This provides things such as sgml2txt. -wget -c http://ftp.de.debian.org/debian/pool/main/l/linuxdoc-tools/linuxdoc-tools_0.9.69.orig.tar.gz +wget -c http://http.debian.net/debian/pool/main/l/linuxdoc-tools/linuxdoc-tools_0.9.72.orig.tar.gz # We're taking some patches from here - now separated out: #wget -c ftp://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/development/rawhide/source/SRPMS/l/linuxdoc-tools-0.9.68-3.fc19.src.rpm @@ -17,32 +25,26 @@ wget -c http://ftp.de.debian.org/debian/pool/main/l/linuxdoc-tools/linuxdoc-tool # http://openjade.sourceforge.net/download.html # wget -c http://kent.dl.sourceforge.net/sourceforge/openjade/OpenSP-1.5.2.tar.gz # -wget -c ftp://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/development/rawhide/source/SRPMS/o/opensp-1.5.2-22.fc23.src.rpm +# https://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/development/rawhide/Everything/source/tree/Packages/o/ +# +wget -c https://dl.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/source/tree/Packages/o/opensp-1.5.2-24.fc26.src.rpm # OpenJade: # http://openjade.sourceforge.net/ # We're using a gcc 4.6 patch from Fedora's SRPM: -# ftp://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/development/rawhide/source/SRPMS/o/openjade-1.3.2-39.fc17.src.rpm -# And we're using the old Perl 4 core libraries (as a dirty but effective build time work-around) taken from: -# http://packages.debian.org/sid/libperl4-corelibs-perl -# http://ftp.de.debian.org/debian/pool/main/libp/libperl4-corelibs-perl/libperl4-corelibs-perl_0.003.orig.tar.gz -wget -c http://downloads.sourceforge.net/openjade/openjade-1.3.3-pre1.tar.gz +# +# https://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/development/rawhide/Everything/source/tree/Packages/o/ +# +wget https://dl.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/source/tree/Packages/o/openjade-1.3.2-55.fc27.src.rpm # sgmltools-common. # It's broken and needs patching so we'll use Fedora's. #wget -c ftp://sources.redhat.com/pub/docbook-tools/new-trials/SOURCES/sgml-common-0.6.3.tgz -wget -c ftp://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/development/rawhide/source/SRPMS/s/sgml-common-0.6.3-43.fc23.src.rpm - - -# DocBook docs: -# http://www.oasis-open.org/docbook/sgml/ # -#wget -c http://www.oasis-open.org/docbook/sgml/3.1/docbk31.zip -#wget -c http://www.docbook.org/sgml/4.5/docbook-4.5.zip -# We use Debian's source because it's more convenient since they package all versions in one archive: -# https://packages.debian.org/search?keywords=docbook&searchon=names&suite=all§ion=all -wget -c http://ftp.de.debian.org/debian/pool/main/d/docbook/docbook_4.5.orig.tar.gz +# https://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/development/rawhide/Everything/source/tree/Packages/s/ # +wget -c ftp://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/development/rawhide/Everything/source/tree/Packages/s/sgml-common-0.6.3-47.fc28.src.rpm + # http://www.linuxfromscratch.org/blfs/view/stable/pst/docbook-dsssl.html # Check versions: # http://sourceforge.net/projects/docbook/files/ @@ -50,32 +52,46 @@ wget -c ftp://ftp.linux.ee/pub/gentoo/distfiles/distfiles/docbook-dsssl-1.79.tar wget -c http://switch.dl.sourceforge.net/sourceforge/docbook/docbook-dsssl-doc-1.79.tar.bz2 # Why don't they put the patches into the distributed source...??? #wget -c ftp://sources.redhat.com/pub/docbook-tools/new-trials/SOURCES/docbook-utils-0.6.14.tar.gz -wget -c ftp://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/development/rawhide/source/SRPMS/d/docbook-utils-0.6.14-39.fc23.src.rpm # # -# http://www.linuxfromscratch.org/blfs/view/svn/pst/docbook.html -wget -c http://www.docbook.org/xml/4.5/docbook-xml-4.5.zip -# https://sourceforge.net/project/showfiles.php?group_id=21935&package_id=16608 +# https://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/development/rawhide/Everything/source/tree/Packages/d/ +# +wget -c ftp://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/development/rawhide/Everything/source/tree/Packages/d/docbook-utils-0.6.14-43.fc27.src.rpm # -wget -c ftp://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/development/rawhide/source/SRPMS/d/docbook-style-xsl-1.78.1-4.fc23.src.rpm # + + # We use the Fedora "docbook-style-xsl" SRPM for this rather than the original source which is why # these "docbook-xsl*" files aren't in our sources directory. #wget -c "http://downloads.sourceforge.net/project/docbook/docbook-xsl/1.75.2/docbook-xsl-1.75.2.tar.bz2?use_mirror=freefr" ##wget -c "http://downloads.sourceforge.net/project/docbook/docbook-xsl-doc/1.75.2/docbook-xsl-doc-1.75.2.tar.bz2?use_mirror=freefr" +# +# https://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/development/rawhide/Everything/source/tree/Packages/d/ +# +wget -c https://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/development/rawhide/Everything/source/tree/Packages/d/docbook-style-xsl-1.79.2-6.fc28.src.rpm +# http://www.linuxfromscratch.org/blfs/view/svn/pst/docbook.html +wget -c http://www.docbook.org/xml/4.5/docbook-xml-4.5.zip +# https://sourceforge.net/project/showfiles.php?group_id=21935&package_id=16608 +# # gnome-doc-utils, needed to build gtk-doc: # Recompressed with LZMA after download. # I guess this mirror is out of date now. It's easier to just look at Fedora's development # directory anyway :-) # wget -c http://ftp.acc.umu.se/pub/GNOME/sources/gnome-doc-utils/0.20/gnome-doc-utils-0.20.0.tar.bz2 -wget -c ftp://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/development/rawhide/source/SRPMS/g/gnome-doc-utils-0.20.10-7.fc23.src.rpm +# +# https://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/development/rawhide/Everything/source/tree/Packages/g/ +# +wget -c ftp://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/development/rawhide/Everything/source/tree/Packages/g/gnome-doc-utils-0.20.10-13.fc27.src.rpm # gtk-doc: # There aren't any patches taken from the SRPM, but you can check the version used in Fedora # and see if any are being applied. We will pull the source archive from the SRPM: -wget -c ftp://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/development/rawhide/source/SRPMS/g/gtk-doc-1.24-2.fc23.src.rpm +# +# https://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/development/rawhide/Everything/source/tree/Packages/g/ +# +wget -c ftp://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/development/rawhide/Everything/source/tree/Packages/g/gtk-doc-1.26-2.fc27.src.rpm #wget -c http://ftp.acc.umu.se/pub/GNOME/sources/gtk-doc/1.21/gtk-doc-1.21.tar.xz # http://git.gnome.org/browse/gtk-doc/commit/?id=2bffebcf9c125f5610b8fb660d42c3c5b9dfd4f0 @@ -84,27 +100,46 @@ wget -c ftp://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/ # http://packages.debian.org/search?keywords=sgmlspl&searchon=names&suite=all§ion=all # There's nothing in the FTP download site at this time, so I'll take it from Debian. wget -c http://ftp.debian.org/debian/pool/main/libs/libsgmls-perl/libsgmls-perl_1.03ii.orig.tar.gz -wget -c http://ftp.debian.org/debian/pool/main/libs/libsgmls-perl/libsgmls-perl_1.03ii-33.debian.tar.xz +wget -c http://http.debian.net/debian/pool/main/libs/libsgmls-perl/libsgmls-perl_1.03ii-36.debian.tar.xz # xmlto # https://fedorahosted.org/releases/x/m/xmlto # wget -c --no-check-certificate https://fedorahosted.org/releases/x/m/xmlto/xmlto-0.0.23.tar.bz2 # Fedora includes a patch, so we'll take it: -wget -c ftp://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/development/rawhide/source/SRPMS/x/xmlto-0.0.26-4.fc23.src.rpm +# +# https://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/development/rawhide/Everything/source/tree/Packages/x +# +wget -c ftp://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/development/rawhide/Everything/source/tree/Packages/x/xmlto-0.0.28-5.fc27.src.rpm # AsciiDoc # http://www.methods.co.nz/asciidoc/ -#wget -c ftp://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/development/rawhide/source/SRPMS/a/asciidoc-8.6.8-1.fc19.src.rpm +# Taken some patches from Fedora. +wget -c ftp://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/development/rawhide/Everything/source/tree/Packages/a/asciidoc-8.6.8-12.fc27.src.rpm # docbook2X: # # Pre-requisite PERL modules for docbook2X: -wget -c ftp://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/development/rawhide/source/SRPMS/p/perl-XML-NamespaceSupport-1.11-16.fc23.src.rpm -wget -c ftp://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/development/rawhide/source/SRPMS/p/perl-XML-SAX-Base-1.08-14.fc23.src.rpm -wget -c ftp://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/development/rawhide/source/SRPMS/p/perl-XML-SAX-0.99-15.fc23.src.rpm +# https://dl.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/source/tree/Packages/p/ +# +wget -c https://dl.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/source/tree/Packages/p/perl-XML-NamespaceSupport-1.12-3.fc27.src.rpm +wget -c https://dl.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/source/tree/Packages/p/perl-XML-SAX-0.99-20.fc27.src.rpm +wget -c https://dl.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/source/tree/Packages/p/perl-XML-SAX-Base-1.09-3.fc27.src.rpm # #http://packages.debian.org/sid/docbook2x # Fedora keep it here, but Debian have a couple of (what look to be useful) patches. #wget -c ftp://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/development/rawhide/source/SRPMS/d/docbook2X-0.8.8-14.fc19.src.rpm +# +# https://packages.debian.org/search?keywords=docbook2x&searchon=names&suite=all§ion=all wget -c http://ftp.de.debian.org/debian/pool/main/d/docbook2x/docbook2x_0.8.8.orig.tar.gz -wget -c http://ftp.de.debian.org/debian/pool/main/d/docbook2x/docbook2x_0.8.8-9.debian.tar.gz +wget -c http://http.debian.net/debian/pool/main/d/docbook2x/docbook2x_0.8.8-15.debian.tar.xz + + +# DocBook docs: +# http://www.oasis-open.org/docbook/sgml/ +# +#wget -c http://www.oasis-open.org/docbook/sgml/3.1/docbk31.zip +#wget -c http://www.docbook.org/sgml/4.5/docbook-4.5.zip +# We use Debian's source because it's more convenient since they package all versions in one archive: +# https://packages.debian.org/search?keywords=docbook&searchon=names&suite=all§ion=all +wget -c http://ftp.de.debian.org/debian/pool/main/d/docbook/docbook_4.5.orig.tar.gz +# diff --git a/source/ap/linuxdoc-tools/trackbuild.linuxdoc-tools b/source/ap/linuxdoc-tools/trackbuild.linuxdoc-tools index 16bb30246..f45c1638d 100755 --- a/source/ap/linuxdoc-tools/trackbuild.linuxdoc-tools +++ b/source/ap/linuxdoc-tools/trackbuild.linuxdoc-tools @@ -24,15 +24,14 @@ PKGNAM=linuxdoc-tools # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) export ARCH=i586 ;; - armv7hl) export ARCH=armv7hl ;; - arm*) export ARCH=arm ;; + i?86) export ARCH=i586 ;; + arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: - *) export ARCH=$( uname -m ) ;; + *) export ARCH=$( uname -m ) ;; esac fi -export PKGVERSION=0.9.69 # use the version of linuxdoc-tools as the package version. +export PKGVERSION=0.9.72 # use the version of linuxdoc-tools as the package version. BUILD=${BUILD:-5} PKGEXT=${PKGEXT:-txz} @@ -50,6 +49,7 @@ removepkg linuxdoc-tools rm -rf /etc/{xml,sgml} rm -rf /usr/share/doc/linuxdoc-tools rm -rf /usr/share/sgml +rm -rf /etc/asciidoc # in case there are any '.conf.new' files remaining rm -rf /usr/share/xml/{docbook,xml-iso-entities*} # can't wipe the entire dir because of libglade rm -rf ~/.texmf-var/ # created by docbook-utils rm -rf ~/.texlive* # incase you were using Texlive rather than Textex-3 @@ -75,9 +75,9 @@ TFS="--touch-filesystem-first" slacktrack $TFS \ --notidy \ --showdeps \ + --run-after-withlog $CWD/postbuildfixes.sh \ -T $TMP \ -l $CWD/build.$ARCH.log \ - -R $CWD/postbuildfixes.sh \ -b $PKGSTORE \ -rYQOcp $PKGNAM-$PKGVERSION-$ARCH-$BUILD.$PKGEXT ./linuxdoc-tools.build |