Hello community, here is the log from the commit of package daps for openSUSE:Factory checked in at 2018-12-19 13:24:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/daps (Old) and /work/SRC/openSUSE:Factory/.daps.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "daps" Wed Dec 19 13:24:09 2018 rev:42 rq:656849 version:3.0.0 Changes: -------- --- /work/SRC/openSUSE:Factory/daps/daps.changes 2018-11-06 14:00:45.207736674 +0100 +++ /work/SRC/openSUSE:Factory/.daps.new.28833/daps.changes 2018-12-19 13:24:12.373324140 +0100 @@ -1,0 +2,89 @@ +Mon Dec 3 13:54:30 UTC 2018 - [email protected] + +- Updated license statement in spec file to SPDX 3.3 notation + +------------------------------------------------------------------- +Wed Nov 21 15:24:05 UTC 2018 - [email protected] + +- Only recommend libreoffice-draw on aarch64 %{ix86} x86_64 + +------------------------------------------------------------------- +Thu Nov 8 16:19:58 UTC 2018 - [email protected] + +Public/final release DAPS 3.0.0 + +* New Features: + - added support for ASCIIDOC sources + - added support for LibreOffice Draw images (*.odg) + - added support for specifying a config file on the command line + (with --config) + - added SVG support for HTML builds + - integrated hunspell and make aspell optional + - initial well-formedness check ignores duplicated IDs (this + allows to have identical IDs in parts that get profiled) + - initial well-formedness warns about missing xi:include files + - daps-autobuild now supports building single books (via the + --dcfiles option) + - DAPS prgram name and version are passed to stylesheets with + xslt parameters "converter.name" and "converter.version" + - implement file not found for XIncludes + - FOP and XEP version numbers are shown in debug/verbose output + - various improvements for the DocBook to NovDoc conversion + - split lib/daps_functions into several files to improve speed + and maintainability + +* Bugfixes: + - #476: DAPS generates ODG->SVG files into images/src + - #475: Tab completion creates error + - #474: Potentially wrong variable assignment + - #437: lodraw tries to convert empty SVG + - #469: RPMLINT complains about permissions of XSLT stylesheet + - #468: xmlwellformed script creates RPMLINT warning + - #466: Build issues with daps-xmlwellformed + - #464: xmlformat incorrectly formats variablelist terms + - #462: Implement file not found for XIncludes + - #459: By default, use the xep-daps.xml configuration from + stylesheets + - #457: Ship the asciidoc postprocessing stylesheet + - #455: Transform glosslist into variablelist (NovDoc conversion) + - #453: Cleanup stylesheet for results from ASCIIDoctor + - #452: Make it possible to specify the ASCIIDOC doc type + - #439: Make xmlformat more verbose in debug mode + - #435: require java-devel >= 1.8.0 + - #425: Well-formedness check fails with double occurrences + of xml:ids + - #424: Fix XML catalog generation + - #422: Integrate hunspell and make aspell optional + - #421: Show FOP and XEP version in debug/verbose output + - #419: HTML and PDF builds need different paths for Admonition + and Callout Images + - #416: DAPS Won't Built With UTF-8 Characters in XML Filenames + - #415: Add support for LibreOffice Draw files + - #397: Spaces in path problem + - #322: Add documentation for --xmlonly / --imgonly switches + for the list-srcfiles subcommand + - #226: Let stylesheets know which version of DAPS calls them + - #119: daps-init: also include example for set + - show a warning when an existing PDF has a size of 0 bytes + (usually the result of a failed FOP build) + - PDF fails when static links in build/.tmp already exist + - fixed DocBook identifiers in configure.ac + - made unpack-lopcdrop more robust against non-critical issues; + improved its debugging output + +* Documentation: + -new guide: ASCIIDOC Quick Start + - Various updates to reflect changes in the code + - Improve help text for daps-xslt + - Improve error message for IDs defined multiple times + + +* Removed support for: + - sourcing DC-files + - help texts for deprecated daps 1.x commands + +* Misc: + - converted Python scripts to Python 3; changed build + dependencies to python3 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ daps.spec ++++++ --- /var/tmp/diff_new_pack.eaNvuq/_old 2018-12-19 13:24:12.865323541 +0100 +++ /var/tmp/diff_new_pack.eaNvuq/_new 2018-12-19 13:24:12.869323536 +0100 @@ -42,7 +42,7 @@ %define daps_catalog for-catalog-%{name}.xml Summary: DocBook Authoring and Publishing Suite -License: GPL-2.0-only OR GPL-3.0-only +License: GPL-2.0-only or GPL-3.0-only Group: Productivity/Publishing/XML Url: https://github.com/openSUSE/daps Source0: %{name}-%{version}.tar.bz2 @@ -80,7 +80,7 @@ # If we have asciidoctor we build the asciidoc manual # for which we need docbook_5 and jing # -%if 0%{?sle_version} == 120300 +%if 0%{?sle_version} == 120300 && 0%{?is_opensuse} Recommends: rubygem(%{rb_default_ruby_abi}:asciidoctor) %else Requires: rubygem(%{rb_default_ruby_abi}:asciidoctor) @@ -109,7 +109,6 @@ Requires: inkscape Requires: java >= 1.8.0 Requires: jing -Requires: libreoffice-draw Requires: libxslt Requires: make Requires: poppler-tools @@ -128,6 +127,9 @@ Recommends: calibre Recommends: epubcheck Recommends: exiftool +%ifarch aarch64 %{ix86} x86_64 +Recommends: libreoffice-draw +%endif Recommends: optipng Recommends: perl-checkbot Recommends: remake ++++++ daps-3.0.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/daps/ChangeLog new/daps/ChangeLog --- old/daps/ChangeLog 2018-10-19 15:44:03.000000000 +0200 +++ new/daps/ChangeLog 2018-11-07 10:42:38.000000000 +0100 @@ -1,30 +1,82 @@ ------------------------------------------------------------------- -Tue Oct 30 13:50:26 UTC 2018 - [email protected] +Tue Nov 06 10:50:26 UTC 2018 - [email protected] Stable release DAPS 3.0.0: * New Features: - - added full support for Python3 - - added SVG support for online-docs - - added support to build AsciiDoc documentation - - integrated hunspell and make aspell optional - - implement file not found for XIncludes + - added support for ASCIIDOC sources + - added support for LibreOffice Draw images (*.odg) + - added support for specifying a config file on the command line + (with --config) + - added SVG support for HTML builds + - integrated hunspell and make aspell optional + - initial well-formedness check ignores duplicated IDs (this + allows to have identical IDs in parts that get profiled) + - initial well-formedness warns about missing xi:include files + - daps-autobuild now supports building single books (via the + --dcfiles option) + - DAPS prgram name and version are passed to stylesheets with + xslt parameters "converter.name" and "converter.version" + - implement file not found for XIncludes + - FOP and XEP version numbers are shown in debug/verbose output + - various improvements for the DocBook to NovDoc conversion + - split lib/daps_functions into several files to improve speed + and maintainability * Bugfixes: + - #476: DAPS generates ODG->SVG files into images/src + - #475: Tab completion creates error + - #474: Potentially wrong variable assignment + - #437: lodraw tries to convert empty SVG + - #469: RPMLINT complains about permissions of XSLT stylesheet + - #468: xmlwellformed script creates RPMLINT warning + - #466: Build issues with daps-xmlwellformed + - #464: xmlformat incorrectly formats variablelist terms + - #462: Implement file not found for XIncludes + - #459: By default, use the xep-daps.xml configuration from + stylesheets + - #457: Ship the asciidoc postprocessing stylesheet + - #455: Transform glosslist into variablelist (NovDoc conversion) + - #453: Cleanup stylesheet for results from ASCIIDoctor + - #452: Make it possible to specify the ASCIIDOC doc type + - #439: Make xmlformat more verbose in debug mode + - #435: require java-devel >= 1.8.0 + - #425: Well-formedness check fails with double occurrences + of xml:ids + - #424: Fix XML catalog generation + - #422: Integrate hunspell and make aspell optional + - #421: Show FOP and XEP version in debug/verbose output - #419: HTML and PDF builds need different paths for Admonition - and Callout Images - - #322: Add --xmlonly / --imgonly switches to list-srcfiles - - #416: DAPS Won't Built With UTF-8 Characters in XML Filenames - - #397: Spaces in path problem - - #469: RPMLINT complains about permissions of XSLT stylesheet - - #464: xmlformat incorrectly formats variablelist terms - - #466: Build issues - - #475: Tab completion creates error - - PDF fails when static links in build/.tmp already exist + and Callout Images + - #416: DAPS Won't Built With UTF-8 Characters in XML Filenames + - #415: Add support for LibreOffice Draw files + - #397: Spaces in path problem + - #322: Add documentation for --xmlonly / --imgonly switches + for the list-srcfiles subcommand + - #226: Let stylesheets know which version of DAPS calls them + - #119: daps-init: also include example for set + - show a warning when an existing PDF has a size of 0 bytes + (usually the result of a failed FOP build) + - PDF fails when static links in build/.tmp already exist + - fixed DocBook identifiers in configure.ac + - made unpack-lopcdrop more robust against non-critical issues; + improved its debugging output * Documentation: - - Various updates to reflect changes in the code - - Improve help text for daps-xslt + -new guide: ASCIIDOC Quick Start + - Various updates to reflect changes in the code + - Improve help text for daps-xslt + - Improve error message for IDs defined multiple times + + +* Removed support for: + - sourcing DC-files + - help texts for deprecated daps 1.x commands + +* Misc: + - converted Python scripts to Python 3; changed build + dependencies to python3 + ------------------------------------------------------------------- Tue May 30 12:32:26 UTC 2017 - [email protected] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/daps/bash_completion/daps new/daps/bash_completion/daps --- old/daps/bash_completion/daps 2018-10-19 15:44:03.000000000 +0200 +++ new/daps/bash_completion/daps 2018-11-07 10:42:38.000000000 +0100 @@ -62,7 +62,7 @@ _filedir -d return 0 ;; - --css|--export-dir|--extra-dict|--file|--statdir) + --css|--extra-dict|--file|--statdir) _filedir return 0 ;; @@ -90,6 +90,10 @@ _filedir -d return 0 ;; + --config) + _filedir + return 0 + ;; --color) COMPREPLY=( $(compgen -W "0 1" -- "$cur") ) return 0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/daps/bin/daps.in new/daps/bin/daps.in --- old/daps/bin/daps.in 2018-10-19 15:44:03.000000000 +0200 +++ new/daps/bin/daps.in 2018-11-07 10:42:38.000000000 +0100 @@ -78,6 +78,7 @@ DEBUG DISTVER DOC_DIR + DAPS_CONFIG_FILE DAPSROOT DAPSROOT_DEFAULT DEF_FILE @@ -268,9 +269,17 @@ DEFAULT_LIB_DIR="${DAPSROOT_DEFAULT}/lib" DEFAULT_LIBEXEC_DIR="${DAPSROOT_DEFAULT}/libexec" -# user config file + +# Config files +# ------------ +# By default USER_CONFIG is parsed +# if DAPS_CONFIG_FILE is set (via --config on the command line), +# USER_CONFIG is ignored +# The file that is oparsed in the enbd is stored in CONF_TO_PARSE +# USER_CONFIG_OLD="$HOME/.daps/config" USER_CONFIG="$HOME/.config/daps/dapsrc" +CONF_TO_PARSE="" # if run from a terminal, set default verbosity to 1, otherwise (script, pipe) # set it to 0 @@ -456,205 +465,6 @@ SUBCOMMANDS[xmlformat]="xmlformat" HELP_SUBCOMMAND[xmlformat]="Prettify your xml-sources using the xmlformat program\nwith a configuration file supplied by daps (/etc/daps/docbook-xmlformat.conf)." -# -# deprecated targets -# - -SUBCOMMANDS[all]="deprecated" -HELP_SUBCOMMAND[all]="This command is deprecated, use \"pdf\" instead." - -SUBCOMMANDS[bigfile-reduced]="deprecated" -HELP_SUBCOMMAND[bigfile-reduced]="This command is no longer supported." - -SUBCOMMANDS[check]="deprecated" -HELP_SUBCOMMAND[check]="This command is deprecated, use \"dapsenv\" instead." - -SUBCOMMANDS[chklink]="deprecated" -HELP_SUBCOMMAND[chklink]="This command is deprecated, use \"checklink\" instead." - -SUBCOMMANDS[color-pdf]="deprecated" -HELP_SUBCOMMAND[color-pdf]="This command is deprecated, use \"pdf\" instead." - -SUBCOMMANDS[color-pdf-name]="deprecated" -HELP_SUBCOMMAND[color-pdf-name]="This command is deprecated, use \"pdf-name\" instead." - -SUBCOMMANDS[db2novdoc]="deprecated" -HELP_SUBCOMMAND[db2novdoc]="This command is no longer supported." - -SUBCOMMANDS[desktop-files]="deprecated" -HELP_SUBCOMMAND[desktop-files]="This command is deprecated, use \"package-html or package-pdf with --desktopfiles\" instead." - -SUBCOMMANDS[desktop-files-dir-name]="deprecated" -HELP_SUBCOMMAND[desktop-files-dir-name]="This command is no longer supported." - -SUBCOMMANDS[dist]="deprecated" -HELP_SUBCOMMAND[dist]="This command is no longer supported." - -SUBCOMMANDS[dist-all]="deprecated" -HELP_SUBCOMMAND[dist-all]="This command is no longer supported." - -SUBCOMMANDS[dist-book]="deprecated" -HELP_SUBCOMMAND[dist-book]="This command is no longer supported." - -SUBCOMMANDS[dist-desktop-files]="deprecated" -HELP_SUBCOMMAND[dist-desktop-files]="This command is no longer supported." - -SUBCOMMANDS[dist-document-files-html]="deprecated" -HELP_SUBCOMMAND[dist-document-files-html]="This command is no longer supported." - -SUBCOMMANDS[dist-document-files-pdf]="deprecated" -HELP_SUBCOMMAND[dist-document-files-pdf]="This command is no longer supported." - -SUBCOMMANDS[dist-graphics]="deprecated" -HELP_SUBCOMMAND[dist-graphics]="This command is deprecated, use \"package-src\" instead." - -SUBCOMMANDS[dist-graphics-png]="deprecated" -HELP_SUBCOMMAND[dist-graphics-png]="This command is no longer supported." - -SUBCOMMANDS[dist-html]="deprecated" -HELP_SUBCOMMAND[dist-html]="This command is deprecated, use \"package-html\" instead." - -SUBCOMMANDS[dist-html-name]="deprecated" -HELP_SUBCOMMAND[dist-html-name]="This command is deprecated, use \"package-html-dir-name\" instead." - -SUBCOMMANDS[dist-html-single]="deprecated" -HELP_SUBCOMMAND[dist-html-single]="This command is deprecated, use \"package-html --single\" instead." - -SUBCOMMANDS[dist-htmlsingle]="deprecated" -HELP_SUBCOMMAND[dist-htmlsingle]="This command is deprecated, use \"package-html --single\" instead." - -SUBCOMMANDS[dist-jsp]="deprecated" -HELP_SUBCOMMAND[dist-jsp]="=This command is deprecated, use \"package-html --jsp\" instead." - -SUBCOMMANDS[dist-jsp-name]="deprecated" -HELP_SUBCOMMAND[dist-jsp-name]="This command is deprecated, use \"package-html-dir-name --jsp\" instead." - -SUBCOMMANDS[dist-single-html]="deprecated" -HELP_SUBCOMMAND[dist-single-html]="This command is deprecated, use \"package-html --single\" instead." - -SUBCOMMANDS[dist-single-html-name]="deprecated" -HELP_SUBCOMMAND[dist-single-html-name]="This command is deprecated, use \"package-html-dir-name --single\" instead." - -SUBCOMMANDS[dist-xml]="deprecated" -HELP_SUBCOMMAND[dist-xml]="This command is deprecated, use \"package-src\" instead." - -SUBCOMMANDS[dist]="deprecated" -HELP_SUBCOMMAND[dist]="This command is no longer supported." - -SUBCOMMANDS[document-files-dir-name]="deprecated" -HELP_SUBCOMMAND[document-files-dir-name]="This command is no longer supported." - -SUBCOMMANDS[document-files-html]="deprecated" -HELP_SUBCOMMAND[document-files-html]="This command is deprecated, use \"package-html --documentfiles\" instead." - -SUBCOMMANDS[document-files-pdf]="deprecated" -HELP_SUBCOMMAND[document-files-pdf]="This command is deprecated, use \"package-pdf --documentfiles\" instead." - -SUBCOMMANDS[force]="deprecated" -HELP_SUBCOMMAND[force]="This command is no longer supported." - -SUBCOMMANDS[htmlsingle]="deprecated" -HELP_SUBCOMMAND[htmlsingle]="This command is deprecated, use \"html --single\" instead." - -SUBCOMMANDS[htmlsingle-name]="deprecated" -HELP_SUBCOMMAND[htmlsingle-name]="This command is deprecated, use \"html-dir-name --single\" instead." - -SUBCOMMANDS[html-single]="deprecated" -HELP_SUBCOMMAND[html-single]="This command is deprecated, use \"html --single\" instead." - -SUBCOMMANDS[html-single-name]="deprecated" -HELP_SUBCOMMAND[html-single-name]="This command is deprecated, use \"html-dir-name --single\" instead." - -SUBCOMMANDS[jana]="deprecated" -HELP_SUBCOMMAND[jana]="This command is deprecated, use \"checklink\" instead." - -SUBCOMMANDS[jsp]="deprecated" -HELP_SUBCOMMAND[jsp]="This command is deprecated, use \"html --jsp\" instead." - -SUBCOMMANDS[jsp-dir-name]="deprecated" -HELP_SUBCOMMAND[jsp-dir-name]="This command is deprecated, use \"html-dir-name --jsp\" instead." - -SUBCOMMANDS[link-entity-dist]="deprecated" -HELP_SUBCOMMAND[link-entity-dist]="This command is no longer supported." - -SUBCOMMANDS[missinggraphics]="deprecated" -HELP_SUBCOMMAND[missinggraphics]="This command is deprecated, use \"list-images-missing\" instead." - -SUBCOMMANDS[online-localized]="deprecated" -HELP_SUBCOMMAND[online-localized]="\nThis command is deprecated, use \"online-docs --noset\" instead." - -SUBCOMMANDS[offspring]="deprecated" -HELP_SUBCOMMAND[offspring]="This command is no longer supported." - -SUBCOMMANDS[package-jsp]="deprecated" -HELP_SUBCOMMAND[package-jsp]="This command is deprecated, use \"package-html --jsp\" instead." - -SUBCOMMANDS[pdf-color]="deprecated" -HELP_SUBCOMMAND[pdf-color]="This command is deprecated, use \"pdf\" instead." - -SUBCOMMANDS[pdf-color-name]="deprecated" -HELP_SUBCOMMAND[pdf-color-name]="This command is deprecated, use \"pdf-name\" instead." - -SUBCOMMANDS[penguin]="deprecated" -HELP_SUBCOMMAND[penguin]="This command is no longer supported." - -SUBCOMMANDS[prof]="deprecated" -HELP_SUBCOMMAND[prof]="This command is deprecated, use \"profile\" instead." - -SUBCOMMANDS[profiledir]="deprecated" -HELP_SUBCOMMAND[profiledir]="This command is deprecated, use \"showvariable VARIABLE=PROFILEDIR\" instead." - -SUBCOMMANDS[projectfiles]="deprecated" -HELP_SUBCOMMAND[projectfiles]="This command is deprecated, use \"list-srcfiles --noimg\" instead." - -SUBCOMMANDS[projectgraphics]="deprecated" -HELP_SUBCOMMAND[projectgraphics]="This command is deprecated, use \"list-srcfiles --nodc --noent --noxml\" instead." - -SUBCOMMANDS[provide-images]="deprecated" -HELP_SUBCOMMAND[provide-images]="This command is deprecated, use \"images --grayscale\" instead." - -SUBCOMMANDS[provide-color-images]="deprecated" -HELP_SUBCOMMAND[provide-color-images]="This command is deprecated, use \"images --color\" instead." - -SUBCOMMANDS[provide-epub-images]="deprecated" -HELP_SUBCOMMAND[provide-epub-images]="This command is no longer supported." - -SUBCOMMANDS[remainingfiles]="deprecated" -HELP_SUBCOMMAND[remainingfiles]="This command is deprecated, use \"list-srcfiles-unused --noimg\" instead." - -SUBCOMMANDS[remaininggraphics]="deprecated" -HELP_SUBCOMMAND[remaininggraphics]="This command is deprecated, use \"list-srcfiles-unused --noxml\" instead." - -SUBCOMMANDS[single-html]="deprecated" -HELP_SUBCOMMAND[single-html]="This command is deprecated, use \"html --single\" instead." - -SUBCOMMANDS[single-html-dir-name]="deprecated" -HELP_SUBCOMMAND[single-html-dir-name]="This command is deprecated, use \"html-dir-name --single\" instead." - -SUBCOMMANDS[txt]="deprecated" -HELP_SUBCOMMAND[txt]="This command is deprecated, use \"text\" instead." - -SUBCOMMANDS[txt-name]="deprecated" -HELP_SUBCOMMAND[txt-name]="This command is deprecated, use \"text-name\" instead." - -SUBCOMMANDS[warn-images]="deprecated" -HELP_SUBCOMMAND[warn-images]="Print a list of source images with non-unique names\nThis command is deprecated, use \"list-images-multisrc\" instead." - -SUBCOMMANDS[wiki]="deprecated" -HELP_SUBCOMMAND[wiki]="This command is no longer supported." - -SUBCOMMANDS[wiki-name]="deprecated" -HELP_SUBCOMMAND[wiki-name]="This command is no longer supported." - -SUBCOMMANDS[xmlfiles]="deprecated" -HELP_SUBCOMMAND[xmlfiles]="This command is deprecated, use \"list-srcfiles --nodc --noent --noimg\" instead." - -SUBCOMMANDS[xmlgraphics-bw]="deprecated" -HELP_SUBCOMMAND[xmlgraphics-bw]="This command is no longer supported." - -SUBCOMMANDS[xmlgraphics]="deprecated" -HELP_SUBCOMMAND[xmlgraphics]="This command is no longer supported." - # ---------------------------------------------------------------------------- # FUNCTIONS # @@ -701,6 +511,13 @@ Default: 1 (when the output does not go to a terminal, colored output will be disabled automatically) + --config Set a configuration file for DAPS that overwrites + defaults set in /etc/daps/config. + By default (when this option is not set) + ~/.config/daps/dapsrc will be parsed, if existing. + In case --config is set, ~/.config/daps/dapsrc + will be ignored. + Default: ~/.config/daps/dapsrc --commands Show a list of available DAPS sub commands --debug Print debugging messages. Alternatively see the verbosity options for an output that is better @@ -856,11 +673,12 @@ local KEY for KEY in "${!SUBCOMMANDS[@]}"; do - if [[ deprecated == "${SUBCOMMANDS[$KEY]}" ]]; then - continue - else - echo "$KEY" - fi + #if [[ deprecated == "${SUBCOMMANDS[$KEY]}" ]]; then + # continue + #else + # echo "$KEY" + #fi + echo "$KEY" done | sort -u } @@ -1221,7 +1039,7 @@ # Therefore we need to save each variable twice in order to recover the # original value. -ARGS=$(getopt -o d:e:hm:v:: -l adocattr:,adocimgdir:,builddir:,color:,colour:,commands,debug,docconfig:,dapsroot:,envfile:,fb_styleroot:,force,help,jobs:,main:,schema:,styleroot:,verbosity::,version,xsltprocessor: -n "$ME" -- "$@") +ARGS=$(getopt -o d:e:hm:v:: -l adocattr:,adocimgdir:,builddir:,config:,color:,colour:,commands,debug,docconfig:,dapsroot:,envfile:,fb_styleroot:,force,help,jobs:,main:,schema:,styleroot:,verbosity::,version,xsltprocessor: -n "$ME" -- "$@") # Exit when getopt returns errors # @@ -1251,6 +1069,12 @@ BUILD_DIR="$BUILD_DIR_CMDL" shift 2 ;; + --config) + [[ -s $2 ]] || exit_on_error "DAPS_CONFIG_FILE \"$2\" is not a valid file" + # make path absolute and strip trailing slash + sanitize_path "$2" "DAPS_CONFIG_FILE" + shift 2 + ;; --color|--colour) if [[ 1 != $2 && 0 != $2 ]]; then exit_on_error "Wrong value ($2) for COLOR. Must be \"0\" or \"1\"" @@ -1388,6 +1212,14 @@ fi fi +# Set the config file that will get parsed: +# +if [[ -n $DAPS_CONFIG_FILE ]]; then + CONF_TO_PARSE="$DAPS_CONFIG_FILE" +elif [[ -f $USER_CONFIG ]]; then + CONF_TO_PARSE="$USER_CONFIG" +fi + unset POSIXLY_CORRECT # we want the regular getopts behaviour on the second run #----------------------------------- @@ -1474,47 +1306,51 @@ ############# INTERLUDE: Copy/Move USER_CONFIG_OLD ##################### # # Move/copy an old DAPS config directory to ~/.config if not already existing +# Only do this, if no config file was set with --config # -MOVE_CONFIG="" -if [[ -f $USER_CONFIG_OLD && ! -f $USER_CONFIG ]]; then - ccecho "warn" "The DAPS user configuration file has moved from\n~/.daps/config to ~/.config/daps/dapsrc" - NEW_CONFDIR=$(dirname "$USER_CONFIG") - NEW_CONFFILE=$(basename "$USER_CONFIG") - OLD_CONFDIR=$(dirname "$USER_CONFIG_OLD") - OLD_CONFFILE=$(basename "$USER_CONFIG_OLD") - while [[ ! $MOVE_CONFIG =~ ^[CcMmNn]$ ]] ; do - read -e -t 20 -i n -p "Do you want me to [c]opy it/[m]ove it/do [n]othing? " MOVE_CONFIG - [[ $? -gt 128 ]] && MOVE_CONFIG="n" # timeout reached - done - case "$MOVE_CONFIG" in - C|c) - cp -r "$OLD_CONFDIR" "$NEW_CONFDIR" && mv "${NEW_CONFDIR}/$OLD_CONFFILE" "${NEW_CONFDIR}/$NEW_CONFFILE" - if [[ 0 -eq $? ]]; then - ccecho "info" "The DAPS config directory $OLD_CONFDIR has been copied to $NEW_CONFDIR.\nThe DAPS config file has been renamed to $NEW_CONFFILE." - else - ccecho "warn" "Copying the DAPS config directory failed" - fi - ;; - M|m) - mv "$OLD_CONFDIR" "$NEW_CONFDIR" && mv "${NEW_CONFDIR}/$OLD_CONFFILE" "${NEW_CONFDIR}/$NEW_CONFFILE" - if [[ 0 -eq $? ]]; then - ccecho "info" "The DAPS config directory $OLD_CONFDIR has been moved to $NEW_CONFDIR.\nThe DAPS config file has been renamed to $NEW_CONFFILE." - else - ccecho "warn" "Moving the DAPS config file failed" - fi - ;; - *) - ccecho "info" "\nThe DAPS config has not been touched and will not be used in this DAPS run" - ;; - esac +if [[ -z $DAPS_CONFIG_FILE ]]; then + MOVE_CONFIG="" + if [[ -f $USER_CONFIG_OLD && ! -f $USER_CONFIG ]]; then + ccecho "warn" "The DAPS user configuration file has moved from\n~/.daps/config to ~/.config/daps/dapsrc" + NEW_CONFDIR=$(dirname "$USER_CONFIG") + NEW_CONFFILE=$(basename "$USER_CONFIG") + OLD_CONFDIR=$(dirname "$USER_CONFIG_OLD") + OLD_CONFFILE=$(basename "$USER_CONFIG_OLD") + while [[ ! $MOVE_CONFIG =~ ^[CcMmNn]$ ]] ; do + read -e -t 20 -i n -p "Do you want me to [c]opy it/[m]ove it/do [n]othing? " MOVE_CONFIG + [[ $? -gt 128 ]] && MOVE_CONFIG="n" # timeout reached + done + case "$MOVE_CONFIG" in + C|c) + cp -r "$OLD_CONFDIR" "$NEW_CONFDIR" && mv "${NEW_CONFDIR}/$OLD_CONFFILE" "${NEW_CONFDIR}/$NEW_CONFFILE" + if [[ 0 -eq $? ]]; then + ccecho "info" "The DAPS config directory $OLD_CONFDIR has been copied to $NEW_CONFDIR.\nThe DAPS config file has been renamed to $NEW_CONFFILE." + else + ccecho "warn" "Copying the DAPS config directory failed" + fi + ;; + M|m) + mv "$OLD_CONFDIR" "$NEW_CONFDIR" && mv "${NEW_CONFDIR}/$OLD_CONFFILE" "${NEW_CONFDIR}/$NEW_CONFFILE" + if [[ 0 -eq $? ]]; then + ccecho "info" "The DAPS config directory $OLD_CONFDIR has been moved to $NEW_CONFDIR.\nThe DAPS config file has been renamed to $NEW_CONFFILE." + else + ccecho "warn" "Moving the DAPS config file failed" + fi + ;; + *) + ccecho "info" "\nThe DAPS config has not been touched and will not be used in this DAPS run" + ;; + esac + fi fi - -if [[ -f $USER_CONFIG && -z "$DAPSROOT_CMDL" ]]; then - parse_config "$USER_CONFIG" +# Set DAPSROOT via user config file +# fs 2018-20-19: Is this needed? Why setting the base dir to CONF_TO_PARSE?? +if [[ -s $CONF_TO_PARSE && -z "$DAPSROOT_CMDL" ]]; then + parse_config "$CONF_TO_PARSE" # make DAPSROOT path absolute and remove trailing / [[ -n "$DAPSROOT" ]] && sanitize_path "$DAPSROOT" "DAPSROOT" \ - "$(readlink -en "$(dirname "$USER_CONFIG")")" + "$(readlink -en "$(dirname "$CONF_TO_PARSE")")" recover_cmdl_values fi @@ -1564,14 +1400,15 @@ # Parse user config # -if [[ -f $USER_CONFIG ]]; then - parse_config "$USER_CONFIG" +if [[ -s $CONF_TO_PARSE ]]; then + parse_config "$CONF_TO_PARSE" # make paths from PATHLIST absolute and remove trailing / -# MY_BASEDIR=$(readlink -en $(dirname $USER_CONFIG)) -# check_pathlist "$MY_BASEDIR" + # MY_BASEDIR=$(readlink -en $(dirname $USER_CONFIG)) + # check_pathlist "$MY_BASEDIR" # make DAPSROOT path absolute and remove trailing / + # fs 2018-10-29 ?????????? Why basedir from CONF_TO_PARSE ??? [[ -n "$DAPSROOT" ]] && sanitize_path "$DAPSROOT" "DAPSROOT" \ - "$(readlink -en "$(dirname "$USER_CONFIG")")" + "$(readlink -en "$(dirname "$CONF_TO_PARSE")")" fi recover_cmdl_values Binary files old/daps/daps-3.0.0.tar.bz2 and new/daps/daps-3.0.0.tar.bz2 differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/daps/doc/adoc/daps_asciidoc.adoc new/daps/doc/adoc/daps_asciidoc.adoc --- old/daps/doc/adoc/daps_asciidoc.adoc 2018-10-19 15:44:03.000000000 +0200 +++ new/daps/doc/adoc/daps_asciidoc.adoc 2018-11-07 10:42:38.000000000 +0100 @@ -1,3 +1,4 @@ +[[art.daps.asciidoc]] = DAPS AsciiDoc Quick Start Guide Frank Sundermeyer <fsundermeyer at opensuse dot org> :Revision: 0 @@ -26,10 +27,11 @@ Projects with {adoc} sources are handled the same way as regular {db} projects. Therefore, the full range of output formats supported by {daps} is supported for {adoc} sources (HTML, single HTML, PDF, EPUB, Mobipocket, plain text). This quick start guide focuses on using {daps} with {adoc} sources and requires basic {daps} knowledge and {adoc} writing experience. -<<for_more>> contains links to documentation on {daps} and {adoc}. +<<art.daps.asciidoc.more>> contains links to documentation on {daps} and {adoc}. The complete {daps} documentation is available online at https://opensuse.github.io/daps/. +[[art.daps.asciidoc.motivation]] == Motivation Over the past years, a lot of software documentation projects have moved from {db} to {adoc}. @@ -45,6 +47,7 @@ However, {daps} cannot handle the conversion to {adoc} as the new source format. +[[art.daps.asciidoc.requirements]] == Requirements To use {adoc} sources with {daps}, you need to install the following packages: @@ -55,6 +58,7 @@ To install DAPS follow the https://github.com/asciidoctor/docbookrx[DAPS installation instructions]. For install `asciidoctor` or `asciidoc` we recommend to use packages available for your Linux distribution. +[[art.daps.asciidoc.project]] == Setting up a Project An {adoc} project has got the same directory structure as a regular {db} project managed with {daps} (see https://opensuse.github.io/daps/doc/cha.daps.user.features.html#sec.daps.user.basics.dirstruct[Directory Structure] for more information. @@ -191,6 +195,7 @@ If you would have two files with different content but the same base name, for example `test.svg` and `test.dia`, the outcome of an automatic conversion would be uncertain (could be either one of the two files). Therefore make sure to always use unique base names. To test for non-unique images, use the following daps command: `daps -d _<DCFILE>_ list-images-multisrc`. +[[art.daps.asciidoc.output]] == Creating Output with {daps} After you have set up the directory structure, created {adoc} documents, and images (optionally), you can use {daps} to create PDFs, HTML, EPUB and other output formats. @@ -252,6 +257,7 @@ daps -d DC-_MYADOC_ spellcheck --lang=en_GB --spell-checker=hunspell ---- +[[art.daps.asciidoc.errors]] == Common Errors and Pitfalls Before generating output formats, {daps} internally converts {adoc} to DocBook XML. @@ -288,6 +294,7 @@ * {daps} currently does not support embedding videos +[[art.daps.asciidoc.github]] == GitHub Integration One of the advantages of using {adoc} as a source for documentation is its seamless integration with GitHub. @@ -333,7 +340,7 @@ \endif::[] ---- -[[for_more]] +[[art.daps.asciidoc.more]] == For More Information Find links to useful online resources here. @@ -361,6 +368,7 @@ * https://github.com/asciidoctor/docbookrx[DocBookRx] [appendix] +[[art.daps.asciidoc.appendix]] == Appendix === Command Line Options and Configuration Settings for {adoc} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/daps/etc/config.in new/daps/etc/config.in --- old/daps/etc/config.in 2018-10-19 15:44:03.000000000 +0200 +++ new/daps/etc/config.in 2018-11-07 10:42:38.000000000 +0100 @@ -356,7 +356,7 @@ # FOP_CONFIG_FILE="@sysconfdir@/daps/fop/fop-daps.xml" FOP_CONFIG_FILE="" -## Key: FOP_OPTIONS +## Key: FOP_CMD_OPTIONS ## ----------------------- ## Description: Command line options for the FOP pdf formatter ## Type: String @@ -930,7 +930,7 @@ # XEP_CONFIG_FILE="@sysconfdir@/daps/xep/xep-daps.xml" -## Key: XEP_OPTIONS +## Key: XEP_CMD_OPTIONS ## ----------------------- ## Description: Command line options for the XEP pdf formatter ## Type: String diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/daps/libexec/daps-xep new/daps/libexec/daps-xep --- old/daps/libexec/daps-xep 2018-10-19 15:44:03.000000000 +0200 +++ new/daps/libexec/daps-xep 2018-11-07 10:42:38.000000000 +0100 @@ -48,4 +48,4 @@ ADDITIONAL_FLAGS="$XEP_DEFAULT_JAVA_FLAGS $XEP_JAVA_FLAGS" \ ADDITIONAL_JARS="$XEP_DEFAULT_JAVA_JARS $XEP_JAVA_JARS" \ ADDITIONAL_OPTIONS="$XEP_DEFAULT_JAVA_OPTIONS $XEP_JAVA_OPTIONS" \ - xep "$@" + xep $XEP_CMD_SWITCHES "$@" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/daps/make/images.mk new/daps/make/images.mk --- old/daps/make/images.mk 2018-10-19 15:44:03.000000000 +0200 +++ new/daps/make/images.mk 2018-11-07 10:42:38.000000000 +0100 @@ -214,7 +214,7 @@ # # lodraw is not capable of being executed in parallel, therfore the image # creation via pattern targets is not possible. We use an empty target instead -# and make it a dependenc of $(GEN_IMAGES) (ONLINE_IMAGES) (COLOR_IMAGES) +# and make it a dependenc of $(GEN_IMAGES) $(ONLINE_IMAGES) $(COLOR_IMAGES) # # Only run the .odg_gen target if there are ODG files!! @@ -223,7 +223,28 @@ $(GEN_IMAGES) (ONLINE_IMAGES) (COLOR_IMAGES): $(IMG_GENDIR)/gen/.odg_gen endif -$(IMG_GENDIR)/gen/.odg_gen: $(USED_ODG) +# The ODG stuff is an ugly hack anyway, so this probably does not matter +# any further (although it significantly increases the uglyness) +# +# In case an SVG has been replaced by an ODG or in case there are dual source +# images (svg+odg) a link to the SVG/PNG is present in +# $(IMG_GENDIR)/gen/svg|png/ +# If that is the case, lodraw follows this link and overwrites the source +# file +# Therefore we need to remove the links first +# +.PHONY: clean_links_for_odg +clean_links_for_odg: $(USED_ODG) + for _IMG in $(notdir $(subst .odg,,$(USED_ODG))); do \ + if [ -h $(IMG_GENDIR)/gen/png/$${_IMG}.png ]; then \ + rm $(IMG_GENDIR)/gen/png/$$_IMG.png; \ + fi; \ + if [ -h $(IMG_GENDIR)/gen/svg/$$_IMG.svg ]; then \ + rm $(IMG_GENDIR)/gen/svg/$$_IMG.svg; \ + fi; \ + done + +$(IMG_GENDIR)/gen/.odg_gen: $(USED_ODG) clean_links_for_odg ifeq "$(VERBOSITY)" "2" @echo " Converting *.odg to PNG" endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/daps/make/pdf.mk new/daps/make/pdf.mk --- old/daps/make/pdf.mk 2018-10-19 15:44:03.000000000 +0200 +++ new/daps/make/pdf.mk 2018-11-07 10:42:38.000000000 +0100 @@ -110,19 +110,18 @@ # Formatter dependent stuff # +# Command line options are set via variables in the config files +# and are processed in the wrapper files +# ifeq "$(FORMATTER)" "fop" FOSTRINGS += --param "fop1.extensions=1" \ --param "xep.extensions=0" - ifdef FOP_CONFIG_FILE - FORMATTER_CMD := $(FOP_WRAPPER) $(FOP_OPTIONS) -c $(FOP_CONFIG_FILE) - else - FORMATTER_CMD := $(FOP_WRAPPER) $(FOP_OPTIONS) - endif + FORMATTER_CMD := $(FOP_WRAPPER) endif ifeq "$(FORMATTER)" "xep" FOSTRINGS += --param "fop1.extensions=0" \ --param "xep.extensions=1" - FORMATTER_CMD := $(XEP_WRAPPER) $(XEP_OPTIONS) + FORMATTER_CMD := $(XEP_WRAPPER) endif ++++++ daps.rpmlintrc ++++++ --- /var/tmp/diff_new_pack.eaNvuq/_old 2018-12-19 13:24:13.649322586 +0100 +++ /var/tmp/diff_new_pack.eaNvuq/_new 2018-12-19 13:24:13.649322586 +0100 @@ -1,9 +1,11 @@ addFilter("explicit-lib-dependency libxml2") addFilter("explicit-lib-dependency libxslt") addFilter("explicit-lib-dependency liberation-fonts") -addFilter("non-executable-script .*/daps/lib/daps_functions") +#addFilter("non-executable-script .*/daps/lib/daps_functions") +addFilter("non-executable-script .*/daps/lib/*") # false positive addFilter("no-manual-page-for-binary daps-init") # internally used only, no man page needed addFilter("no-manual-page-for-binary daps-auto.pl") addFilter("no-manual-page-for-binary daps-xmlformat") +addFilter("no-manual-page-for-binary daps-check-deps")
