Hello community, here is the log from the commit of package daps for openSUSE:Factory checked in at 2018-11-06 13:59:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/daps (Old) and /work/SRC/openSUSE:Factory/.daps.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "daps" Tue Nov 6 13:59:55 2018 rev:41 rq:644005 version:3.0.0 Changes: -------- --- /work/SRC/openSUSE:Factory/daps/daps.changes 2017-06-29 15:08:38.331988706 +0200 +++ /work/SRC/openSUSE:Factory/.daps.new/daps.changes 2018-11-06 14:00:45.207736674 +0100 @@ -1,0 +2,33 @@ +Tue Oct 23 10:07:12 UTC 2018 - [email protected] + +- Workaround to make it possible to build things + +------------------------------------------------------------------- +Fri Oct 19 14:02:11 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 + +* 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 + +------------------------------------------------------------------- @@ -17,0 +51 @@ +- remove daps-dont-complain-about-deprecated-option.patch Old: ---- daps-2.4.0.tar.bz2 New: ---- daps-3.0.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ daps.spec ++++++ --- /var/tmp/diff_new_pack.0UsAa1/_old 2018-11-06 14:00:46.207735377 +0100 +++ /var/tmp/diff_new_pack.0UsAa1/_new 2018-11-06 14:00:46.219735361 +0100 @@ -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 ############################################################### @@ -42,7 +42,7 @@ %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 @@ -61,13 +61,13 @@ BuildRequires: fdupes BuildRequires: ghostscript BuildRequires: inkscape +BuildRequires: jing BuildRequires: libxml2-tools BuildRequires: libxslt BuildRequires: libxslt-tools BuildRequires: poppler-tools -BuildRequires: python-lxml BuildRequires: python-xml -#BuildRequires: sgml-skel +BuildRequires: python3-lxml BuildRequires: suse-xsl-stylesheets BuildRequires: svg-dtd BuildRequires: transfig @@ -76,6 +76,19 @@ 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 +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 @@ -94,13 +107,14 @@ 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: python-xml -#Requires: sgml-skel +Requires: python3-lxml Requires: suse-xsl-stylesheets Requires: svg-schema Requires: transfig @@ -118,10 +132,12 @@ 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 +164,10 @@ %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 +182,12 @@ #---------------------- %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 +197,7 @@ %files %defattr(-,root,root) +%dir %{_datadir}/%{name} %dir %{_sysconfdir}/%{name} %dir %{_defaultdocdir}/%{name} @@ -209,14 +207,18 @@ %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/* ++++++ daps-2.4.0.tar.bz2 -> daps-3.0.0.tar.bz2 ++++++ ++++ 9815 lines of diff (skipped)
