From fadf49f49d7aa40f21e457d937c92bd30e215127a1244136b26ca7390adf4839 Mon Sep 17 00:00:00 2001 From: Stefan Knorr Date: Fri, 19 Oct 2018 15:15:44 +0000 Subject: [PATCH 1/5] Accepting request 643222 from home:rsalevsky:branches:Documentation:Tools Stable release DAPS 3.0.0 OBS-URL: https://build.opensuse.org/request/show/643222 OBS-URL: https://build.opensuse.org/package/show/Documentation:Tools/daps?expand=0&rev=203 --- daps-2.4.0.tar.bz2 | 3 --- daps-3.0.0.tar.bz2 | 3 +++ daps.changes | 28 +++++++++++++++++++++++ daps.spec | 57 +++++++++++++++++++--------------------------- 4 files changed, 54 insertions(+), 37 deletions(-) delete mode 100644 daps-2.4.0.tar.bz2 create mode 100644 daps-3.0.0.tar.bz2 diff --git a/daps-2.4.0.tar.bz2 b/daps-2.4.0.tar.bz2 deleted file mode 100644 index 62e079d..0000000 --- a/daps-2.4.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8d0f5e3434fa832e28e44c7afbb4b6755f963cf9870865e97b38df5bd4f9e4e3 -size 2368834 diff --git a/daps-3.0.0.tar.bz2 b/daps-3.0.0.tar.bz2 new file mode 100644 index 0000000..524cc1b --- /dev/null +++ b/daps-3.0.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4cb178ca20fe1865f6b9bc7707edad3175d33b9dcc6481feabf04bda503b162d +size 2245473 diff --git a/daps.changes b/daps.changes index a9ac594..a75cb33 100644 --- a/daps.changes +++ b/daps.changes @@ -1,3 +1,31 @@ +------------------------------------------------------------------- +Fri Oct 19 14:02:11 UTC 2018 - rick.salevsky@suse.com + +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 + +* Bugfixes: + - #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 + +* Documentation: + - Various updates to reflect changes in the code + - Improve help text for daps-xslt + ------------------------------------------------------------------- Tue Jun 20 13:51:14 UTC 2017 - fsundermeyer@opensuse.org diff --git a/daps.spec b/daps.spec index 21cfa2a..ae08599 100644 --- a/daps.spec +++ b/daps.spec @@ -1,7 +1,7 @@ # # spec file for package daps # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: daps -Version: 2.4.0 +Version: 3.0.0 Release: 0 ############################################################### @@ -65,9 +65,8 @@ BuildRequires: libxml2-tools BuildRequires: libxslt BuildRequires: libxslt-tools BuildRequires: poppler-tools -BuildRequires: python-lxml +BuildRequires: python3-lxml BuildRequires: python-xml -#BuildRequires: sgml-skel BuildRequires: suse-xsl-stylesheets BuildRequires: svg-dtd BuildRequires: transfig @@ -94,13 +93,15 @@ Requires: docbook_4 Requires: docbook_5 Requires: ghostscript-library Requires: inkscape +Requires: java >= 1.8.0 Requires: jing +Requires: libreoffice-draw Requires: libxslt Requires: make Requires: poppler-tools -Requires: python-lxml +Requires: python3-lxml Requires: python-xml -#Requires: sgml-skel +Requires: rubygem(%{rb_default_ruby_abi}:asciidoctor) Requires: suse-xsl-stylesheets Requires: svg-schema Requires: transfig @@ -118,10 +119,12 @@ Recommends: optipng Recommends: perl-checkbot Recommends: remake Recommends: suse-doc-style-checker +Recommends: suse-documentation-dicts-en Recommends: w3m +Recommends: xmlformat + # Internal XEP package: Recommends: xep -Recommends: xmlformat Obsoletes: susedoc < 4.3.32 Provides: susedoc = 4.3.32 @@ -148,6 +151,10 @@ for upgrade instructions. %setup -q -n %{name} #%%patch1 -p1 +# Correct shebang line as suggested in +# https://lists.opensuse.org/opensuse-packaging/2018-03/msg00017.html +sed -i '1 s|/usr/bin/env python|/usr/bin/python|' libexec/daps-xmlwellformed + #-------------------------------------------------------------------------- %build %configure --docdir=%{_defaultdocdir}/%{name} --disable-edit-rootcatalog @@ -162,35 +169,12 @@ make install DESTDIR=$RPM_BUILD_ROOT #---------------------- %post -# -# XML Catalog entries for daps profiling -# -# remove existing entries first (if existing) - needed for -# zypper in, since it does not call postun -# -# delete in case of an update, which $1=2 -if [ "2" = "$1" ]; then - edit-xml-catalog --group --catalog /etc/xml/suse-catalog.xml \ - --del %{name} || true -fi -# ... and readd it again -edit-xml-catalog --group --catalog /etc/xml/suse-catalog.xml \ - --add /etc/xml/%{daps_catalog} - +update-xml-catalog exit 0 #---------------------- %postun -# -# delete catalog entry for daps profiling -# only run if package is really uninstalled ($1 = 0) and not -# in case of an update -# -if [ 0 = $1 ]; then - edit-xml-catalog --group --catalog /etc/xml/suse-catalog.xml \ - --del %{name} -fi - +update-xml-catalog exit 0 #---------------------- @@ -200,6 +184,7 @@ exit 0 %files %defattr(-,root,root) +%dir %{_datadir}/%{name} %dir %{_sysconfdir}/%{name} %dir %{_defaultdocdir}/%{name} @@ -209,14 +194,18 @@ exit 0 %dir %{_datadir}/xml/%{name} %dir %{_datadir}/xml/%{name}/schema -%config %{_sysconfdir}/xml/*.xml +# Catalogs +%config %{_sysconfdir}/xml/catalog.d/%{name}.xml + +# Config files %config %{_sysconfdir}/%{name}/* +# Man/Doc %doc %{_mandir}/man1/*.1%{ext_man} %doc %{_defaultdocdir}/%{name}/* %{_bindir}/* -%{_datadir}/%{name}/* +%attr(644, root, root) %{_datadir}/%{name}/libexec/*.xsl %{_datadir}/bash-completion/completions/%{name} %{_datadir}/emacs/site-lisp/docbook_macros.el %{_datadir}/xml/daps/schema/* From 17894cad97c26fb53ab90e518e8c9aae6509618579a4c2ff6c339b2159028ffd Mon Sep 17 00:00:00 2001 From: Rick Salevsky Date: Mon, 22 Oct 2018 12:58:41 +0000 Subject: [PATCH 2/5] sync changelog OBS-URL: https://build.opensuse.org/package/show/Documentation:Tools/daps?expand=0&rev=204 --- daps.changes | 1 + daps.spec | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/daps.changes b/daps.changes index a75cb33..7be3677 100644 --- a/daps.changes +++ b/daps.changes @@ -43,6 +43,7 @@ Hotfix for 2.4.0: Changelog: - merged SLE 12 and Factory Changelogs +- remove daps-dont-complain-about-deprecated-option.patch ------------------------------------------------------------------- Tue May 30 11:28:44 UTC 2017 - fsundermeyer@opensuse.org diff --git a/daps.spec b/daps.spec index ae08599..ce3436d 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-only OR GPL-3.0-only Group: Productivity/Publishing/XML Url: https://github.com/openSUSE/daps Source0: %{name}-%{version}.tar.bz2 @@ -65,8 +65,8 @@ BuildRequires: libxml2-tools BuildRequires: libxslt BuildRequires: libxslt-tools BuildRequires: poppler-tools -BuildRequires: python3-lxml BuildRequires: python-xml +BuildRequires: python3-lxml BuildRequires: suse-xsl-stylesheets BuildRequires: svg-dtd BuildRequires: transfig @@ -99,9 +99,8 @@ Requires: libreoffice-draw Requires: libxslt Requires: make Requires: poppler-tools -Requires: python3-lxml Requires: python-xml -Requires: rubygem(%{rb_default_ruby_abi}:asciidoctor) +Requires: python3-lxml Requires: suse-xsl-stylesheets Requires: svg-schema Requires: transfig @@ -110,6 +109,7 @@ Requires: xml-commons-jaxp-1.3-apis Requires: xmlgraphics-fop >= 0.94 Requires: xmlstarlet Requires: zip +Requires: rubygem(%{rb_default_ruby_abi}:asciidoctor) Recommends: aspell-en Recommends: calibre From 8e4f93313a3540d63e34b8530b11de0204c50291a51cd5fca5ee7eb1fefd9bc9 Mon Sep 17 00:00:00 2001 From: Stefan Knorr Date: Tue, 23 Oct 2018 10:07:37 +0000 Subject: [PATCH 3/5] Workaround to make it possible to build things OBS-URL: https://build.opensuse.org/package/show/Documentation:Tools/daps?expand=0&rev=205 --- daps.changes | 5 +++++ daps.spec | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/daps.changes b/daps.changes index 7be3677..21669c7 100644 --- a/daps.changes +++ b/daps.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Oct 23 10:07:12 UTC 2018 - sknorr@suse.com + +- Workaround to make it possible to build things + ------------------------------------------------------------------- Fri Oct 19 14:02:11 UTC 2018 - rick.salevsky@suse.com diff --git a/daps.spec b/daps.spec index ce3436d..bb2fdaf 100644 --- a/daps.spec +++ b/daps.spec @@ -164,6 +164,10 @@ sed -i '1 s|/usr/bin/env python|/usr/bin/python|' libexec/daps-xmlwellformed %install make install DESTDIR=$RPM_BUILD_ROOT +# FIXME: temporary workaround for buildstep that is not executed... start workaround vvv +sed -i 's_\(xml:base\)="[^"]*"_\1="file:///usr/share/daps/daps-xslt/"_g' $RPM_BUILD_ROOT/%{_sysconfdir}/xml/catalog.d/%{name}.xml +# ^^^ end workaround + # create symlinks: %fdupes -s $RPM_BUILD_ROOT/%{_datadir} From 93f1081831e0ada307cfba526df417cfdc04a2fd6b183e7c6f3609777d901ced Mon Sep 17 00:00:00 2001 From: Frank Sundermeyer Date: Tue, 23 Oct 2018 15:16:26 +0000 Subject: [PATCH 4/5] Spec-file and build environment fixes OBS-URL: https://build.opensuse.org/package/show/Documentation:Tools/daps?expand=0&rev=206 --- daps-3.0.0.tar.bz2 | 4 ++-- daps.spec | 21 +++++++++++++++------ 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/daps-3.0.0.tar.bz2 b/daps-3.0.0.tar.bz2 index 524cc1b..20c580b 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:4cb178ca20fe1865f6b9bc7707edad3175d33b9dcc6481feabf04bda503b162d -size 2245473 +oid sha256:062eb5420d6995f4d179ed2faffbed265d9ae5055be3a9547d1084fe020a3501 +size 2387786 diff --git a/daps.spec b/daps.spec index bb2fdaf..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 @@ -61,6 +61,7 @@ BuildRequires: docbook_4 BuildRequires: fdupes BuildRequires: ghostscript BuildRequires: inkscape +BuildRequires: jing BuildRequires: libxml2-tools BuildRequires: libxslt BuildRequires: libxslt-tools @@ -75,6 +76,19 @@ BuildRequires: xml-commons-jaxp-1.3-apis BuildRequires: xmlgraphics-fop >= 0.94 BuildRequires: xmlstarlet +# Asciidoctor is not available on Leap 42.3 +# If we have asciidoctor we build the asciidoc manual +# for which we need docbook_5 and jing +# +%if 0%{?sle_version} == 120300 && 0%{?is_opensuse} +Recommends: rubygem(%{rb_default_ruby_abi}:asciidoctor) +%else +Requires: rubygem(%{rb_default_ruby_abi}:asciidoctor) +BuildRequires: docbook_5 +BuildRequires: jing +BuildRequires: rubygem(%{rb_default_ruby_abi}:asciidoctor) +%endif + # # In order to keep the requirements list as short as possible, only packages # needed to build EPUB, HTML and PDF are really required @@ -109,7 +123,6 @@ Requires: xml-commons-jaxp-1.3-apis Requires: xmlgraphics-fop >= 0.94 Requires: xmlstarlet Requires: zip -Requires: rubygem(%{rb_default_ruby_abi}:asciidoctor) Recommends: aspell-en Recommends: calibre @@ -164,10 +177,6 @@ sed -i '1 s|/usr/bin/env python|/usr/bin/python|' libexec/daps-xmlwellformed %install make install DESTDIR=$RPM_BUILD_ROOT -# FIXME: temporary workaround for buildstep that is not executed... start workaround vvv -sed -i 's_\(xml:base\)="[^"]*"_\1="file:///usr/share/daps/daps-xslt/"_g' $RPM_BUILD_ROOT/%{_sysconfdir}/xml/catalog.d/%{name}.xml -# ^^^ end workaround - # create symlinks: %fdupes -s $RPM_BUILD_ROOT/%{_datadir} From b2b4aa2eea145dc1068c595d19a527a13d956f2366fe04fea49ac3044d2938cc Mon Sep 17 00:00:00 2001 From: Stefan Knorr Date: Tue, 23 Oct 2018 16:35:09 +0000 Subject: [PATCH 5/5] Remove unnecessary extra condition (as SLE 12 SP3 and Leap 42.3 have the same package availability status) OBS-URL: https://build.opensuse.org/package/show/Documentation:Tools/daps?expand=0&rev=207 --- daps.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/daps.spec b/daps.spec index 971684c..8433bd3 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-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 @@ BuildRequires: xmlstarlet # If we have asciidoctor we build the asciidoc manual # for which we need docbook_5 and jing # -%if 0%{?sle_version} == 120300 && 0%{?is_opensuse} +%if 0%{?sle_version} == 120300 Recommends: rubygem(%{rb_default_ruby_abi}:asciidoctor) %else Requires: rubygem(%{rb_default_ruby_abi}:asciidoctor)