diff --git a/daps-2.1.5.tar.bz2 b/daps-2.1.5.tar.bz2 deleted file mode 100644 index b30c809..0000000 --- a/daps-2.1.5.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:61d0d573cdf5397380cd7d009ba8a05d2c30e017f6b835fe805c1511a2f05e60 -size 2364058 diff --git a/daps-2.2.0.tar.bz2 b/daps-2.2.0.tar.bz2 new file mode 100644 index 0000000..1a83797 --- /dev/null +++ b/daps-2.2.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:12733d0ec5f2ecfa91661c763c4a21661fb1f34705b9072826a65fdc9340f863 +size 2365234 diff --git a/daps.changes b/daps.changes index 440dd49..134204d 100644 --- a/daps.changes +++ b/daps.changes @@ -1,3 +1,99 @@ +------------------------------------------------------------------- +Wed Jun 15 12:34:00 UTC 2016 - fsundermeyer@opensuse.org + +Stable release DAPS 2.2.0: + +* New Features: + - new subcommand "xmlformat" prettyfies the XML sources of a + given DC-file or ROOTID using daps-xmlformat with + /etc/daps/docbook-xmlformat.conf. + (Note: this command will modify the original XML sources!) + - SVG image support for HTML builds. To use it, make sure to + provide the images in SVG format ad reference to them as follows: + + + + - the new global switch --jobs lets you specify how many parallel + jobs to use. The default is set to the number of CPU cores (as was + done in previous versions). + - all commands generating file lists (e.g. "list-srcfiles") now + generate human readable output on STDOUT. When the output goes + to a pipe or subshell, it will be generated as a a one-liner. + - Debugging of XML errors has been made easier. Sometimes the error + message of the validator only points to an xi:include line, making + it impossible to find the real location of the error. The option + --novalid for the target "bigfile" will create the bigfile + without performing a validation check on the sources. A single XML + will be built and validated. Now the error message points to the + exact location of the error in the bigfile. From there it should be + easy to find the error in the original sources. + - Verbose and debugging output now also show all profiling + attributes set in the DC-file, plus version information for + the sytlesheets (if available) + - added the option --norefchecks to all output-generating targets + ("html", "pdf", ...), "validate", "bigfile" and others. Allows + to build/validate documents without checking internal links + (<... linkend="">). + - subcommand "online-docs" now always converts the bigfile that is + created to NovDoc. To keep the same format as the original + sources, specify --dbnoconv. To create a DocBook4 bigfile from + DocBook5 sources, specify --db5todb4. + +* Bugfixes: + - #368: db4tonovdoc.xsl generates invalid NovDoc + - #367: daps does not validate fop output + - #366: Spellcheck trying to check the files "Cannot", "stat:", "No", + "such", "file" ... + - #364: DocBook5: Allow validating without checking xrefs + - #363: Allow building a bigfile from invalid sources + - #362: Make the number of parallel jobs configurable + - #361: Externel xrefs are resolved to "????" + - #360: Check Rootid fails on Debian 8.4.0 + - #356: file list output should default to pretty format + - #354: Validate the result of online docs when it has been + converted from DB5 to DB4 or novdoc + - #353: Make db5 to db4 conversion default for online-docs + - #351, #348, #342, #282: Fixes for the daps spec-file + - #346: daps-xmlformat writes its messages into the output + - #343: daps-init warning messages + - #340: ePUB builds always show remarks + - #335: on Debian, make install creates incorrect group in + /etc/xml/config + - #330: Enable SVG2Grayscale stylesheet to handle new color + names + - #305: locdrop produces no "non-trans" image tarball for a + complete set + - #301: SVG to PNG conversion creates very large PNGs + - #289: Verbose / Debugging Output Should Show Profiling + Attributes + - #251: Write XSLT to Return xml-model PI + - #226: Let stylesheets know which version of DAPS calls them + - subcommand "clean-all" fails if run from within a directory + that will be removed with that command + - daps fails when called from a directory that no longer exists + +* Cross-Distribution Support + - first release with full Debian/Ubuntu support--manual + adjustments after the installation are no longer needed + (was required in previous releases for DocBook5 support). + Many thanks to Tomáš Bažant and Christoph Berg for their help! + - GitHub checkouts now also work for Fedora/RedHat and + Debian/Ubuntu--refer to + https://github.com/openSUSE/daps/blob/develop/INSTALL.adoc + for details + - tested on Debian 8.5.0 / Fedora 23 / openSUSE 13.2 and + Leap 42.1 / SUSE Linux Enterprise 12 / Ubuntu 16.0 + +* Misc: + - removed "daps-envconvert", a script for converting susedoc + ENV-files to DAPS DC-files. susedoc was the predecessor of + DAPS. + +* Documentation: + - the documentation has _not_ been updated for this release, so + new features mentioned above are not yet covered + + ------------------------------------------------------------------- Sun Apr 17 10:35:37 UTC 2016 - bwiedemann@suse.com diff --git a/daps.spec b/daps.spec index b9fe9e8..95dd4a6 100644 --- a/daps.spec +++ b/daps.spec @@ -17,22 +17,23 @@ Name: daps -Version: 2.1.5 +Version: 2.2.0 Release: 0 ############################################################### # # ATTENTION: Do NOT edit this file outside of -# https://svn.code.sf.net/p/daps/svn/trunk/daps/packaging/daps.spec +# https://github.com/openSUSE/daps/blob/develop/packaging/daps.spec # # Your changes will be lost on the next update -# If you do not have access to the SVN repository, notify +# If you do not have access to the GitHub repository, notify # or # or send a patch # ################################################################ # -# Please submit bugfixes or comments via https://sourceforge.net/p/daps/tickets +# Please submit bugfixes or comments via +# https://github.com/openSUSE/daps/issues # %define docbuilddir %{_datadir}/daps @@ -48,7 +49,6 @@ Source0: %{name}-%{version}.tar.bz2 Source1: %{name}.rpmlintrc Source2: %{name}-fetch-source-svn Source3: %{name}-fetch-source-git -Patch0: reproducible.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch @@ -62,16 +62,9 @@ BuildRequires: docbook_4 BuildRequires: fdupes BuildRequires: ghostscript BuildRequires: inkscape -%if 0%{?suse_version} >= 1220 BuildRequires: libxml2-tools -%endif BuildRequires: libxslt BuildRequires: libxslt-tools -#%%if 0%%{?suse_version} == 1315 -#BuildRequires: sles-release -#%%else -#BuildRequires: openSUSE-release -#%%endif BuildRequires: poppler-tools BuildRequires: python-lxml BuildRequires: python-xml @@ -79,17 +72,14 @@ BuildRequires: python-xml BuildRequires: suse-xsl-stylesheets BuildRequires: svg-dtd BuildRequires: transfig +BuildRequires: xerces-j2 BuildRequires: xml-commons-jaxp-1.3-apis -%if 0%{?suse_version} >= 1140 BuildRequires: xmlgraphics-fop >= 0.94 -%else -BuildRequires: fop >= 0.94 -%endif BuildRequires: xmlstarlet # # In order to keep the requirements list as short as possible, only packages -# needed ti build EPUB, HTML and PDF are really required +# needed to build EPUB, HTML and PDF are really required # All other packages required for editing or more exotic output formats # are recommended rather than required @@ -100,9 +90,12 @@ Requires: ImageMagick Requires: bash >= 3.1 Requires: dia Requires: docbook-xsl-stylesheets >= 1.77 +Requires: docbook5-xsl-stylesheets >= 1.77 Requires: docbook_4 +Requires: docbook_5 Requires: ghostscript-library Requires: inkscape +Requires: jing Requires: libxslt Requires: make Requires: poppler-tools @@ -112,26 +105,18 @@ Requires: python-xml Requires: suse-xsl-stylesheets Requires: svg-schema Requires: transfig +Requires: xerces-j2 Requires: xml-commons-jaxp-1.3-apis -%if 0%{?suse_version} >= 1140 Requires: xmlgraphics-fop >= 0.94 -%else -Requires: fop >= 0.94 -%endif Requires: xmlstarlet +Requires: zip -Recommends: daps-docmanager -Recommends: docbook_5 -Recommends: docbook5-xsl-stylesheets >= 1.77 +Recommends: aspell-en +Recommends: calibre Recommends: epubcheck Recommends: exiftool -Recommends: jing Recommends: optipng -%if 0%{?suse_version} >= 1140 Recommends: perl-checkbot -%else -Recommends: checkbot -%endif Recommends: remake Recommends: suse-doc-style-checker Recommends: w3m @@ -162,7 +147,6 @@ for upgrade instructions. #-------------------------------------------------------------------------- %prep %setup -q -n %{name} -%patch0 -p1 #%%patch1 -p1 #-------------------------------------------------------------------------- @@ -220,6 +204,7 @@ exit 0 %dir %{_sysconfdir}/%{name} %dir %{_defaultdocdir}/%{name} +%dir %{_datadir}/%{name} %dir %{_datadir}/xml/daps %dir %{_datadir}/xml/daps/schema @@ -229,6 +214,7 @@ exit 0 %doc %{_mandir}/man1/*.1%{ext_man} %doc %{_defaultdocdir}/%{name}/* +%{_datadir}/%{name}/* %{_bindir}/* %{_datadir}/emacs/site-lisp/docbook_macros.el %{_datadir}/xml/daps/schema/* @@ -236,7 +222,6 @@ exit 0 %exclude %{_defaultdocdir}/%{name}/INSTALL %exclude %{_sysconfdir}/%{name}/config.in %exclude %{_sysconfdir}/%{name}/catalog.xml - #---------------------- %changelog diff --git a/reproducible.patch b/reproducible.patch deleted file mode 100644 index 2bb2c0e..0000000 --- a/reproducible.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: daps/doc/xml/common_copyright_gfdl.xml -=================================================================== ---- daps.orig/doc/xml/common_copyright_gfdl.xml -+++ daps/doc/xml/common_copyright_gfdl.xml -@@ -15,7 +15,7 @@ - --> - - -- Copyright © 2006– -+ Copyright © 2006–2015 - &suse;, LLC and contributors. All rights reserved. - -