From b07826e974993ddaefc618f7d64d54cef99f242508b8a903b53fff6d8c7068d2 Mon Sep 17 00:00:00 2001 From: Frank Sundermeyer Date: Fri, 21 Dec 2012 12:18:10 +0000 Subject: [PATCH] Version 1.1: daps-auto.pl: * a perl script to automatically build documents and deploy them to a remote machine via rsync EPUB: * completely rewrote the epub generating code * no longer needs an external script (db2epub.ruby) for epub-file generation - now everything is handled in make itself HTML/HTML-Single/JSP: * added a --clean switch which clears the directory before generating a new version Packaging: * completely rewrote the code for package-src - new option --set-date allows to set a publication date (default: current date) * new options for package-html and package-pdf --desktopfiles: generates an archive with desktopfiles for KDE3 --documentfiles: generates a documnet file for KDE4/GNOME2 --pagefiles: generates a page file for GNOME3 * completely rewrote online-docs - now automatically generates epub, color-pdf and single-html archive - new option --export-dir to specify a results directory * completely rewrote locdrop - new option --export-dir to specify a results directory Spellchecking: * no longer a stand-alone program * use "daps -d DC-file spellcheck" to check single files (--file option), complete documents (via DC-file) or parts of a document (vi ROOTID) OBS-URL: https://build.opensuse.org/package/show/Documentation:Tools/daps?expand=0&rev=102 --- daps-1.0.2.tar.bz2 | 3 - daps-1.1.tar.bz2 | 3 + daps.changes | 75 ++++++++++++++++++++ daps.spec | 171 +++++++++++++++++++++++++++------------------ 4 files changed, 180 insertions(+), 72 deletions(-) delete mode 100644 daps-1.0.2.tar.bz2 create mode 100644 daps-1.1.tar.bz2 diff --git a/daps-1.0.2.tar.bz2 b/daps-1.0.2.tar.bz2 deleted file mode 100644 index dab1453..0000000 --- a/daps-1.0.2.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:265f9ae423971ce22aa635247dfe7d4614252be28aad1f86f5a23a45b100dc1a -size 1411777 diff --git a/daps-1.1.tar.bz2 b/daps-1.1.tar.bz2 new file mode 100644 index 0000000..a0fa8b4 --- /dev/null +++ b/daps-1.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3f26c77848fcd415c7df95c540aac06df41898d271bbb5671e11545dc86c1a64 +size 2571335 diff --git a/daps.changes b/daps.changes index 5c951c3..d2bdb59 100644 --- a/daps.changes +++ b/daps.changes @@ -1,3 +1,78 @@ +------------------------------------------------------------------- +Fri Dec 21 10:03:32 UTC 2012 - fsundermeyer@opensuse.org + +Version 1.1: + +daps-auto.pl: + * a perl script to automatically build documents and deploy them + to a remote machine via rsync + +EPUB: + * completely rewrote the epub generating code + * no longer needs an external script (db2epub.ruby) for + epub-file generation - now everything is handled in + make itself + +HTML/HTML-Single/JSP: + * added a --clean switch which clears the directory + before generating a new version + +Packaging: + * completely rewrote the code for package-src + - new option --set-date allows to set a publication date + (default: current date) + * new options for package-html and package-pdf + --desktopfiles: generates an archive with desktopfiles for KDE3 + --documentfiles: generates a documnet file for KDE4/GNOME2 + --pagefiles: generates a page file for GNOME3 + * completely rewrote online-docs + - now automatically generates epub, color-pdf and single-html archive + - new option --export-dir to specify a results directory + * completely rewrote locdrop + - new option --export-dir to specify a results directory + +Spellchecking: + * no longer a stand-alone program + * use "daps -d DC-file spellcheck" to check single files + (--file option), complete documents (via DC-file) or + parts of a document (vi ROOTID) + * can be configured via config variables ASPELL_* + +Emacs macros for DocBook: + * Now supports nxml-mode + +Documentation: + * User Guide: significant additions + +Misc: + * Added a --manifest option to dist-html which adds a manifest + files containing the html-files in the same order as in the + document + * Replaced bash 4 only code with bash 3 compatible code + (bash 4 is no longer a prerequisite for daps) + +Bugfixes: + * Ticket #77 Lang variable ($LL) might not be set + * Ticket #104 Inconsistent Tar Ball for dist-graphics + * Corrected the webhelp.indexer.language setting + * a misplaced >/dev/null prevented the svg2svg conversion, + resulting in 0 byte SVGs + * added proper error handling to setfiles, sourcefiles, docfiles + computing + * html-single output in a separate htmlsingle/ directory + * Raised FOP_STACK to 2048k, because otherwise FOP builds on + x86_64 fail + * Fixed a bug in listing the double images. backup images like + foo.svg~ or foo.svg.~ were listed, too + * EPUB generation failed when no CSS file was specified. This + is fixed now + * Fixed sed statements for preserving and recovering entities; + the former statements did not match all entity declarations + possible and recovering was error-prone + * Only use optipng when it is available + * Fixed targets warn-images and warn-cap + + ------------------------------------------------------------------- Mon Aug 6 15:53:53 UTC 2012 - pgajdos@suse.com diff --git a/daps.spec b/daps.spec index fc0ebb4..735781d 100644 --- a/daps.spec +++ b/daps.spec @@ -17,11 +17,12 @@ Name: daps -Version: 1.0.2 +Version: 1.1 Release: 0 %define docbuilddir %{_datadir}/daps %define regcat %{_bindir}/sgml-register-catalog +%define fontdir %{_datadir}/fonts/truetype %define dbstyles %{_datadir}/xml/docbook/stylesheet/nwalsh/current %define daps_catalog for-catalog-%{name}.xml @@ -33,96 +34,89 @@ Source0: %{name}-%{version}.tar.bz2 Source1: %{name}.rpmlintrc Source2: %{name}-fetch-source BuildRoot: %{_tmppath}/%{name}-%{version}-build + BuildArch: noarch -BuildRequires: bash >= 4.0 +BuildRequires: ImageMagick +BuildRequires: bash >= 3.1 BuildRequires: dia BuildRequires: docbook-xsl-stylesheets >= 1.75 BuildRequires: docbook_4 -%if 0%{?suse_version} > 1140 -BuildRequires: perl-Image-ExifTool -%else -BuildRequires: exiftool -%endif +BuildRequires: fam +BuildRequires: fdupes +BuildRequires: ghostscript-library +BuildRequires: inkscape %if 0%{?suse_version} >= 1220 BuildRequires: libxml2-tools %endif -BuildRequires: ImageMagick -BuildRequires: fam -BuildRequires: fdupes -BuildRequires: inkscape BuildRequires: libxslt -BuildRequires: openSUSE-release -BuildRequires: optipng +#%%if %%sles_version >= 11 +#BuildRequires: sles-release +#%%else +#BuildRequires: openSUSE-release +#%%endif +BuildRequires: poppler-tools +BuildRequires: python-lxml BuildRequires: python-xml -BuildRequires: sgml-skel +#BuildRequires: sgml-skel BuildRequires: suse-xsl-stylesheets BuildRequires: svg-dtd BuildRequires: transfig - -# the following requirements are not really needed for building, but we add -# them nevertheless in order to see if the build target is able to fullfill -# the requirements for installation -BuildRequires: LinuxLibertine -BuildRequires: dejavu -BuildRequires: fontpackages-devel -BuildRequires: freefont -BuildRequires: ghostscript-library -BuildRequires: liberation-fonts -BuildRequires: mplus-fonts -BuildRequires: poppler-tools -BuildRequires: xmlformat - +BuildRequires: xml-commons-jaxp-1.3-apis %if 0%{?suse_version} >= 1140 -BuildRequires: perl-checkbot BuildRequires: xmlgraphics-fop >= 0.94 %else BuildRequires: fop >= 0.94 -%if %{undefined sles_version} -BuildRequires: checkbot %endif +#--- +# Fontstuff +# +%if 0%{?suse_version} > 1220 +BuildRequires: dejavu-fonts +BuildRequires: fontpackages-devel +BuildRequires: gnu-free-fonts +BuildRequires: liberation-fonts +BuildRequires: mplus-fonts +%else +BuildRequires: dejavu +BuildRequires: freefont +BuildRequires: liberation-fonts +BuildRequires: mplus-fonts %endif +# +# In order to keep the requirements list as short as possible, only packages +# needed ti build EPUB, HTML and PDF are really required +# All other packages required for editing or more exotic output formats +# are recommended rather than required + PreReq: libxml2 PreReq: sgml-skel Requires: ImageMagick -Requires: LinuxLibertine -Requires: bash >= 4.0 -Requires: dejavu +Requires: bash >= 3.1 Requires: dia Requires: docbook-xsl-stylesheets >= 1.75 Requires: docbook_4 -Requires: exiftool Requires: fam -Requires: freefont Requires: ghostscript-library Requires: inkscape -Requires: liberation-fonts Requires: libxslt Requires: make -Requires: mplus-fonts -Requires: optipng Requires: poppler-tools -Requires: sgml-skel +Requires: python-lxml +Requires: python-xml +#Requires: sgml-skel Requires: svg-dtd Requires: transfig +Requires: xml-commons-jaxp-1.3-apis %if 0%{?suse_version} >= 1140 -Requires: perl-checkbot Requires: xmlgraphics-fop >= 0.94 %else Requires: fop >= 0.94 -%if %{undefined sles_version} -Requires: checkbot -%else -Recommends: checkbot %endif -%endif -Requires: python-xml -Recommends: agfa-fonts Recommends: aspell aspell-en -# Only works only for openSUSE 11.4 and below %if 0%{?suse_version} < 1210 Recommends: aspell-en-huge %endif @@ -130,25 +124,56 @@ Recommends: daps-docmanager Recommends: docbook_5 Recommends: emacs psgml Recommends: epubcheck -# Split of ttf-founder-simplified and ttf-founder-traditional -Recommends: FZFangSong FZHeiTi FZSongTi -Recommends: fifth-leg-font +Recommends: exiftool Recommends: jing +Recommends: optipng +%if 0%{?suse_version} >= 1140 +Recommends: perl-checkbot +%else +Recommends: checkbot +%endif Recommends: remake -# needed to create ePUBs -Recommends: ruby -# Japanese Fonts: -Recommends: sazanami-fonts Recommends: suse-xsl-stylesheets -# Chinese -Recommends: ttf-arphic -# Korean Fonts: -Recommends: unfonts # Internal XEP package: Recommends: xep +Recommends: xmlformat +Recommends: xmlstarlet -#Obsoletes: susedoc <= 4.3.27 -Provides: susedoc < 4.4 +#------ +# 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 +Provides: susedoc %description DocBook Authoring and Publishing Suite (DAPS) @@ -199,7 +224,13 @@ edit-xml-catalog --group --catalog /etc/xml/suse-catalog.xml \ edit-xml-catalog --group --catalog /etc/xml/suse-catalog.xml \ --add /etc/xml/%{daps_catalog} +%if 0%{?suse_version} > 1220 %reconfigure_fonts_post +%else +if test -x sbin/conf.d/SuSEconfig.fonts +then %run_suseconfig -m fonts +fi +%endif exit 0 #---------------------- @@ -215,19 +246,21 @@ if [ -x /usr/bin/edit-xml-catalog ] ; then --del %{name} fi -%reconfigure_fonts_post +%if 0%{?suse_version} > 1220 +%reconfigure_fonts_postun +%else +if test -x sbin/conf.d/SuSEconfig.fonts +then %run_suseconfig -m fonts +fi +%endif fi exit 0 -#---------------------- -%posttrans -%reconfigure_fonts_posttrans - #---------------------- %files %defattr(-,root,root) -%dir %{_ttfontsdir} +%dir %{fontdir} %dir %{_sysconfdir}/%{name} %dir %{_defaultdocdir}/%{name} @@ -239,8 +272,8 @@ exit 0 %{_bindir}/* %{_datadir}/emacs/site-lisp/docbook_macros.el -%{_ttfontsdir}/* %{docbuilddir} +%{fontdir}/* %exclude %{_defaultdocdir}/%{name}/INSTALL