From 8148c7a7fb1e4bacc2fec79e81cae58ea486bd0172f17cc7dbaa413a316e9d75 Mon Sep 17 00:00:00 2001 From: Frank Sundermeyer Date: Fri, 9 Nov 2018 10:10:17 +0000 Subject: [PATCH 1/5] Public/final release DAPS 3.0.0 OBS-URL: https://build.opensuse.org/package/show/Documentation:Tools/daps?expand=0&rev=209 --- daps-3.0.0.tar.bz2 | 4 +-- daps.changes | 79 ++++++++++++++++++++++++++++++++++++++++++++++ daps.rpmlintrc | 4 ++- daps.spec | 4 +-- 4 files changed, 86 insertions(+), 5 deletions(-) diff --git a/daps-3.0.0.tar.bz2 b/daps-3.0.0.tar.bz2 index 20c580b..fa74d4e 100644 --- a/daps-3.0.0.tar.bz2 +++ b/daps-3.0.0.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:062eb5420d6995f4d179ed2faffbed265d9ae5055be3a9547d1084fe020a3501 -size 2387786 +oid sha256:0875950b0e55a76c7a505b3019f5301d9f181439769d93b7fc6f774d3d80eeb3 +size 2349899 diff --git a/daps.changes b/daps.changes index 21669c7..bbceb38 100644 --- a/daps.changes +++ b/daps.changes @@ -1,3 +1,82 @@ +------------------------------------------------------------------- +Thu Nov 8 16:19:58 UTC 2018 - fsundermeyer@opensuse.org + +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 + ------------------------------------------------------------------- Tue Oct 23 10:07:12 UTC 2018 - sknorr@suse.com diff --git a/daps.rpmlintrc b/daps.rpmlintrc index 660481b..55ee2bd 100644 --- a/daps.rpmlintrc +++ b/daps.rpmlintrc @@ -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") diff --git a/daps.spec b/daps.spec index 8433bd3..971684c 100644 --- a/daps.spec +++ b/daps.spec @@ -42,7 +42,7 @@ Release: 0 %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 or GPL-3.0 Group: Productivity/Publishing/XML Url: https://github.com/openSUSE/daps Source0: %{name}-%{version}.tar.bz2 @@ -80,7 +80,7 @@ BuildRequires: xmlstarlet # 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) From 5ef91ae1833c65cb8374e4cfe9cb6c3abf0502e096220e6f66f10de8eb1586fd Mon Sep 17 00:00:00 2001 From: Frank Sundermeyer Date: Wed, 21 Nov 2018 15:24:51 +0000 Subject: [PATCH 2/5] Only recommend libreoffice-draw on aarch64 %{ix86} x86_64 OBS-URL: https://build.opensuse.org/package/show/Documentation:Tools/daps?expand=0&rev=210 --- daps.changes | 5 +++++ daps.spec | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/daps.changes b/daps.changes index bbceb38..ffeb06b 100644 --- a/daps.changes +++ b/daps.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Nov 21 15:24:05 UTC 2018 - fsundermeyer@opensuse.org + +- Only recommend libreoffice-draw on aarch64 %{ix86} x86_64 + ------------------------------------------------------------------- Thu Nov 8 16:19:58 UTC 2018 - fsundermeyer@opensuse.org diff --git a/daps.spec b/daps.spec index 971684c..6edb75d 100644 --- a/daps.spec +++ b/daps.spec @@ -109,7 +109,6 @@ Requires: ghostscript-library Requires: inkscape Requires: java >= 1.8.0 Requires: jing -Requires: libreoffice-draw Requires: libxslt Requires: make Requires: poppler-tools @@ -128,6 +127,9 @@ Recommends: aspell-en Recommends: calibre Recommends: epubcheck Recommends: exiftool +%ifarch aarch64 %{ix86} x86_64 +Recommends: libreoffice-draw +%endif Recommends: optipng Recommends: perl-checkbot Recommends: remake From 8fa52282d6777aeeaa89575a7a56d40b0c40740e68df2c713432dfa379c89637 Mon Sep 17 00:00:00 2001 From: Frank Sundermeyer Date: Fri, 30 Nov 2018 15:19:08 +0000 Subject: [PATCH 3/5] Updated license statement in spec file to SPDX 3.3 notation OBS-URL: https://build.opensuse.org/package/show/Documentation:Tools/daps?expand=0&rev=211 --- daps.changes | 5 +++++ daps.spec | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/daps.changes b/daps.changes index ffeb06b..eaf4cd6 100644 --- a/daps.changes +++ b/daps.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Nov 30 15:18:14 UTC 2018 - fsundermeyer@opensuse.org + +- Updated license statement in spec file to SPDX 3.3 notation + ------------------------------------------------------------------- Wed Nov 21 15:24:05 UTC 2018 - fsundermeyer@opensuse.org diff --git a/daps.spec b/daps.spec index 6edb75d..e9884dc 100644 --- a/daps.spec +++ b/daps.spec @@ -42,7 +42,7 @@ Release: 0 %define daps_catalog for-catalog-%{name}.xml Summary: DocBook Authoring and Publishing Suite -License: GPL-2.0 or GPL-3.0 +License: GPL-2.0-or-later Group: Productivity/Publishing/XML Url: https://github.com/openSUSE/daps Source0: %{name}-%{version}.tar.bz2 From cf663abc077dfc8e3811249c9fe392af962e41382a932ad853597a6c07e45fb0 Mon Sep 17 00:00:00 2001 From: Frank Sundermeyer Date: Mon, 3 Dec 2018 13:56:22 +0000 Subject: [PATCH 4/5] Updated License statement in spec file to SPDX 3.3 notation Part2 OBS-URL: https://build.opensuse.org/package/show/Documentation:Tools/daps?expand=0&rev=212 --- daps.changes | 2 +- daps.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/daps.changes b/daps.changes index eaf4cd6..5c01518 100644 --- a/daps.changes +++ b/daps.changes @@ -1,5 +1,5 @@ ------------------------------------------------------------------- -Fri Nov 30 15:18:14 UTC 2018 - fsundermeyer@opensuse.org +Mon Dec 3 13:54:30 UTC 2018 - fsundermeyer@opensuse.org - Updated license statement in spec file to SPDX 3.3 notation diff --git a/daps.spec b/daps.spec index e9884dc..3f643ce 100644 --- a/daps.spec +++ b/daps.spec @@ -42,7 +42,7 @@ Release: 0 %define daps_catalog for-catalog-%{name}.xml Summary: DocBook Authoring and Publishing Suite -License: GPL-2.0-or-later +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 From 6e032319fad6c95e75dafd9f6618e058ef029957e3590e2a223a18ab5719b235 Mon Sep 17 00:00:00 2001 From: Frank Sundermeyer Date: Mon, 3 Dec 2018 13:57:23 +0000 Subject: [PATCH 5/5] Updated License statement in spec file to SPDX 3.3 notation Part3 OBS-URL: https://build.opensuse.org/package/show/Documentation:Tools/daps?expand=0&rev=213 --- daps.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/daps.spec b/daps.spec index 3f643ce..d2a0378 100644 --- a/daps.spec +++ b/daps.spec @@ -42,7 +42,7 @@ Release: 0 %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