diff --git a/daps-1.1.7.tar.bz2 b/daps-1.1.7.tar.bz2 deleted file mode 100644 index e06373d..0000000 --- a/daps-1.1.7.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:02d7e5ec4fd8b56fbc3341d8166bf80fc179aef0c83bf9d9a0db578cf1788286 -size 2637366 diff --git a/daps-2.0~beta3.tar.bz2 b/daps-2.0~beta3.tar.bz2 new file mode 100644 index 0000000..55f0e3f --- /dev/null +++ b/daps-2.0~beta3.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a029f719ba83c5c9a3d20a2a31263c839a7ee6fb599ee402f748cb39c5ab93c4 +size 4376567 diff --git a/daps-fetch-source b/daps-fetch-source index cfdad70..6fe31ef 100644 --- a/daps-fetch-source +++ b/daps-fetch-source @@ -14,7 +14,7 @@ NAME=daps VERSION= SPECFILE=${NAME}.spec -SVNPATH=svn://svn.code.sf.net/p/daps/svn/branches/daps_1.x +SVNPATH=svn://svn.code.sf.net/p/daps/svn/trunk/daps TMPDIR=$(mktemp -q -d --tmpdir daps_XXXXXXXX) EXCLUDES=${TMPDIR}/${NAME}/packaging/exclude-files_for_daps_package.txt @@ -62,10 +62,10 @@ fi # Create the tarball # export BZIP2=--best -tar chf ${NAME}-${VERSION}.tar -C ${TMPDIR} \ +tar cf ${NAME}-${VERSION}.tar -C ${TMPDIR} \ --exclude-from=$EXCLUDES ${NAME} || exit_on_error "Failed to create the tarball." -tar rhf ${NAME}-${VERSION}.tar -C ${TMPDIR} ${NAME}/suse/xslt \ - || exit_on_error "Failed to add suse/xslt to the tarball." +tar rf ${NAME}-${VERSION}.tar -C ${TMPDIR} ${NAME}/suse/xslt2013 ${NAME}/suse/xslt2005 \ + || exit_on_error "Failed to add suse/xslt{2013,2005} to the tarball." bzip2 -9f ${NAME}-${VERSION}.tar echo "Successfully wrote source tarball ${NAME}-${VERSION}.tar.bz2" diff --git a/daps.changes b/daps.changes index 42c20f4..79b85f3 100644 --- a/daps.changes +++ b/daps.changes @@ -1,3 +1,178 @@ +------------------------------------------------------------------- +Sat Dec 21 21:30:10 UTC 2013 - fsundermeyer@opensuse.org + +New release DAPS 2.0~beta3: +Features: +- Use original HTML DocBook Stylesheets for txt output by default: + * use custom stylesheets by setting TXT_USE_DBSTYLES to "no" +Bugfixes: + - STYLEROOT and FB_STYLEROOT definitions in the config files were + checked even if values were specified on the command line + (ticket #211)use custom stylesheets by setting TXT_USE_DBSTYLES + to "no" + - JSP result directory was incorrect when no profiled MAIN existed + (ticket #212) + - PDF was not copied to the result dir when running package-pdf + - Improved error message when having specified a second bareword + after the subcommand (ticket #185) + +------------------------------------------------------------------- +Thu Dec 12 11:48:18 UTC 2013 - fsundermeyer@opensuse.org + +Bugfix release DAPS 2.0~beta2: + - two fixes for package-html and package-pdf: + * ticket #208 package-pdf and package-html should support... + * ticket #209 package-html --jsp is broken + +------------------------------------------------------------------- +Fri Dec 6 20:39:09 UTC 2013 - fsundermeyer@opensuse.org + +Version DAPS 2.0~beta1: +- First beta for a new major release + + Output targets: + --------------- + * the number of subcommands has been significantly reduced, see + "daps --commands", "daps help" and "daps help " for + more information + - "html-single" has been replaced by "html --single" + - "jsp" has been replaced with "html --jsp" + - "color-pdf" has been replaced by "pdf" (now produces color PDFS) + - "pdf" has been replaced by "pdf --grayscale --cropmarks" + - "projectfiles" and "projectgraphics" have been replaced with + "list-srcfiles" (see daps help "list-srcfiles" for more options) + - all dist-* commands have been removed + - when calling deprecated targets, an error message hinting at a + valid alternative (is existing) is shown + * subcommand bigfile now generates a bigfile for the given rootid + (rather than for the complate set); target bigfile-reduced has been + dropped + * subbcommands package-pdf and package-html now have switches + --dcoumentfiles, --desktopfiles and --pagefiles which generate + the resource files for GNOME and KDE + * new subcommands + - "clean-package" removes all generated package data for the given + DC-file. Generated images and profiled sources will _not_ be + deleted. + - "dapsenv" shows a list of the most important make variables + and their values + - "images" generates images only for a given rootid. Intended for + debugging purposes + - "package-src" (creates a tarball with profiled XML sources and + images); switch --set-date allows to specify a build date (default + date is "now") + - "list-file" lists the filename that contains the ID specified + with the mandatory paramater --rootid. + * ePUB generation has been completely rewritten (pure make solution, + no longer uses the ruby script from upstream); generated ePUBs + now validate with epubcheck3. + - added support for .mobi (Amzon Kindle format). Requires calibre. + (ticket #98) + * replaced support for HTML4 with support for HTML5 (--html5) + xhtml remains the default, html4 is no longer supported + * to nullify a CSS-file definition for HTML or EPUB (HTML_CSS or + EPUB_CSS) from the DC-file, specify "--css none" + + Miscellaneous: + -------------- + * now supports XSLT processor saxon6 (in addition to xsltproc), + specify with --xsltprocessor (default: xsltproc) + * improved verbosity handling: + - if output is not a terminal (e.g. pipe) only prints the + resulting filename (-v0) + - default verbosity shows a result message plus filename (-v1) + - -v2 shows additional messages + - -v3 shows the complete make output from make -j1 (commands are + executed successively, not parallel) + - --debug shows the complete make output from make -j1+x + (commands are executed parallel; this also shows in the debug + output) + * added support for JPG images (ticket #101) + * added support for a "static/" directory in STYLEROOT containing + css, js and images taht are reference in the CSS and the + stylesheets for HTML + * New general switch --commands shows all available subcommands + * if the XML sources are not well-formed, a meaningful error + message is shown + * xsltparameters have to be submitted as --param PARAM=VALUE or + --stringparam PARAM=VALUE (the "=" is mandatory, used to be + a "space2 with DAPS 1.x) + * output formats are only re-generated when the source files + (xml, entity files or images) have changed. To force a rebuild + run DAPS with --force or run a suitable clean command + * added switches --author and --productname switches to daps-init + + Config file changes: + -------------------- + * New config file variables: + COVERT_OPS_JPG: command-line options for "convert" for converting + jpg images to grayscale + FOP_STACKSIZE: set stacksize for fop (ticket #82) + META, META_STR: permanently run html and PDF builds with + --meta + STATIC_DIR: custom static directory + XML_USER_CATALOGS: add custom catalogs to XML_CATALOG_FILES + (ticket #99) + XSLTPROCESSOR: Use the specified XSLT processor + (saxon6 or xsltproc) + + Code changes: + ------------- + * big makefile (common.mk) has been split into several small files + - easier to maintain + - improved performance by only loading makefiles that are needed + for the given subcommand + * added a comprehensive test suite to ensure better quality when + releasing + * no longer requires Bash 4--Bash 3 is sufficient + + Documentation: + -------------- + * Quickstart has been updated to cover DAPS 2.0 + * Update of User Guide is WIP + * new Tutorial "How to Write an Article with DocBook and DAPS" + + Bugfixes: + --------- + Numerous bugfixes and improvements, among them: + + * #64 Split Makefiles + * #66 daps: DC Files and Platform Dependant Paths + * #73 Create PDFs for target locdrop if --def-file is specified + * #82 Add config parameter for FOP (XEP?) stacksize + * #85 Set a fixed date with package-src target + * #98 Adjust EPUB Stylesheet to Suppot Kindle + * #99 Support User Definied Catalogs by Setting XML_CATALOG_FILES... + * #101 DAPS should support JPEG as a source file format + * #103 Exit target package-source when there are missing images + * #105 DAPS's sub-commands are somewhat inconsistent + * #106 Enable overwriting xsltproc params + * #108 Support FOP 1.1 + * #115 --css/HTML_CSS parameter is completely ignored if styleroot... + * #116 Move font requirements from daps specfile to ... + * #126 Add --show switch to checklink + * #127 productinfo sometimes fails and is slow + * #129 Get rid of native xsltproc calls + * #136 daps Ignores Language in Document for Spell Checking + * #138 DAPS makes it easier to create black/white PDFs than ... + * #139 When trying to create a PDF file with malformed XSLT files... + * #142 Saxon seems to have problems with NovDoc documents + * #146 EPUB CRITICAL Error: No manual specific tmp dir + * #147 EPUB validation error on callouts + * #148 --meta only works when profiling + * #159 Fatal Error in ePUB stylesheets + * #163 JSP Stylesheets fail with saxon6 + * #165 FOP config file is unnecessary + * #166 Reduce Logging Output of Apache's FOP + * #171 Remove unnecessary "eval" statements in the DAPS code + * #192 Create filenames in a single place + * #196 EPUB does not build with saxon + + Known Issues: + ------------- + * the webhelp code hasn't been touched at all; webhelp will most + likely not work + ------------------------------------------------------------------- Thu Jun 6 08:19:06 UTC 2013 - fsundermeyer@opensuse.org diff --git a/daps.spec b/daps.spec index 7e3ec55..153a2bd 100644 --- a/daps.spec +++ b/daps.spec @@ -1,7 +1,7 @@ # # spec file for package daps # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products 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: 1.1.7 +Version: 2.0~beta3 Release: 0 ############################################################### @@ -27,7 +27,7 @@ Release: 0 # # Your changes will be lost on the next update # If you do not have access to the SVN repository, notify -# and +# or # or send a patch # ################################################################ @@ -44,7 +44,7 @@ Summary: DocBook Authoring and Publishing Suite License: GPL-2.0 or GPL-3.0 Group: Productivity/Publishing/XML Url: http://sourceforge.net/p/daps -Source0: http://downloads.sourceforge.net/project/daps/%{name}-%{version}.tar.bz2 +Source0: %{name}-%{version}.tar.bz2 Source1: %{name}.rpmlintrc Source2: %{name}-fetch-source BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -56,7 +56,6 @@ BuildRequires: bash >= 3.1 BuildRequires: dia BuildRequires: docbook-xsl-stylesheets >= 1.77 BuildRequires: docbook_4 -BuildRequires: fam BuildRequires: fdupes BuildRequires: ghostscript-library BuildRequires: inkscape @@ -83,19 +82,8 @@ BuildRequires: xmlgraphics-fop >= 0.94 BuildRequires: fop >= 0.94 %endif #--- -# Fontstuff -# +# Font stuff BuildRequires: fontpackages-devel -BuildRequires: liberation-fonts -BuildRequires: mplus-fonts - -%if 0%{?suse_version} > 1220 -BuildRequires: dejavu-fonts -BuildRequires: gnu-free-fonts -%else -BuildRequires: dejavu -BuildRequires: freefont -%endif # # In order to keep the requirements list as short as possible, only packages @@ -111,7 +99,6 @@ Requires: bash >= 3.1 Requires: dia Requires: docbook-xsl-stylesheets >= 1.77 Requires: docbook_4 -Requires: fam Requires: ghostscript-library Requires: inkscape Requires: libxslt @@ -152,39 +139,6 @@ Recommends: xep Recommends: xmlformat Recommends: xmlstarlet -#------ -# Fonts -#------ -%if 0%{?suse_version} > 1220 -Requires: dejavu-fonts -Requires: gnu-free-fonts -Requires: liberation-fonts -Requires: mplus-fonts -Recommends: agfa-fonts -Recommends: fifth-leg-font -Recommends: linux-libertine-fonts -# Chinese Fonts -Recommends: arphic-fonts -# Japanese Fonts: -Recommends: sazanami-fonts -# Korean Fonts: -Recommends: un-fonts -%else -Requires: dejavu -Requires: freefont -Requires: liberation-fonts -Requires: mplus-fonts -Recommends: agfa-fonts -Recommends: fifth-leg-font -Recommends: LinuxLibertine -# Chinese Fonts -Recommends: ttf-arphic -# Japanese Fonts: -Recommends: sazanami-fonts -# Korean Fonts: -Recommends: unfonts -%endif - Obsoletes: susedoc < 4.3.32 Provides: susedoc = 4.3.32