Hello community, here is the log from the commit of package daps for openSUSE:Factory checked in at 2012-05-08 12:26:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/daps (Old) and /work/SRC/openSUSE:Factory/.daps.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "daps", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/daps/daps.changes 2012-01-17 16:04:52.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.daps.new/daps.changes 2012-05-08 12:26:29.000000000 +0200 @@ -1,0 +2,288 @@ +Thu May 3 20:24:49 UTC 2012 - [email protected] + +Version 1.0.2 (Bugfix Release): + +* Important: + - in order to avoid confusion with short options for daps itself + (such as -d for --docconfig and --draft), + the subcommands only support long options now. The following + short options for subcommands are no longer supported: + -c (use --comments) + -d (use --draft) + -f (use --file) + -m (use --meta) + -n (use --name) + -p (use --pretty) + -r (use --remarks) + -s (use --show) + - the only short option that will remain is -h (help) + +* Bugfixes: + - added proper help texts for subcommands + - target warn-images did not work + - target missinggraphics did not show all missing images + - daps failed with a useless error message when $MAIN was not + well-formed. The fix produces a useful error message now + - --remarks option did not work with DocBook stylesheets + - paths specified on the command line or the config file had to + be absolute. The fix now allows to also specify relative paths + for all configurable directories and files + - COMMENTS_STR, DRAFT_STR and REMARK_STR were not correctly unset + when one of these modes was not set on the command line but + implied by another mode (e.g. --meta). The result was a wrong + filename + - target webhelp-dir-name was missing + - draft.png was not shown in PDF/HTML draft builds when using the + DocBook Stylesheets + - Due to a variable name mismatch, the --name option did not work + properly + - target showvariable exited with an error if requested variable + was empty + - config options FOP_CONFIG and XEP_CONFIG were not used. The fix + renames them to FOP_CONFIG_FILE and XEP_CONFIG_FILE - these + variables are used in the wrapper scripts + - FOP_WRAPPER and XEP_WRAPPER were not set correctly when + DAPSROOT was set + - disabled Permalink generation for PDFs (this is an HTML-only + feature) + - images were not cerrectly references for target jsp + - the DEF file was not correctly packaged in target locdrop + - fixed webhelp target. Wildcards do not work in classpath + expression, resolved them with $(wildcard $(firstword()) + - Warning message "DEF file is missing" was issued for targets + that do not have a --def-file option + - targets package-html and package-pdf failed with an error on + desktop files generation + - target remaininggraphics always returned an empty list + - SVG to SVG conversions generated useless error messages + +* Stylesheets: + - removed obsolete stuff for @role=productname, + productnumber, or productnameref + +* Documentation: + - Quick Start Guide: Finished + - User Guide: Significant additions, but still work in progress + - Updated README.upgrade_from_susedoc_4.x + + +------------------------------------------------------------------- +Tue Apr 3 10:04:42 UTC 2012 - [email protected] + +Version 1.0: + +Bugfix: + - Use XEP/FOP wrapper scripts by default + +------------------------------------------------------------------- +Mon Apr 2 14:22:05 UTC 2012 - [email protected] + +version 1.0 RC5: + +* Bugfix: + - Setting stack size for FOP to 512k in wrapper script, otherwise + builds on i586 fail during hyphenation + +------------------------------------------------------------------- +Mon Apr 2 12:28:49 UTC 2012 - [email protected] + +Version 1.0 RC4 + +* Bugfix: + - Not all links were dereferenced with --static + + +------------------------------------------------------------------- +Fri Mar 30 19:37:13 UTC 2012 - [email protected] + +Version 1.0 RC3 + +* Bugfixes: + - Issuing hint on missing formatter scripts only when verbosity + is >= 1 + - spec-file: Fixed typo on suse-xsl-stylesheet recommends + python-xml needs to be a general requirement + - fixed path to callouts and style images for FO + + +* Lots of minor documentation fixes/enhancements + +------------------------------------------------------------------- +Thu Mar 29 09:12:37 UTC 2012 - [email protected] + +Version 1.0 RC2 + +* Bugfixes: + - issue a hint rather than exiting when XEP/FOP_WRAPPER do not + exist + - daps_xslt/yelp/*.xsl was not installed by make install + +------------------------------------------------------------------- +Wed Mar 28 08:44:22 UTC 2012 - [email protected] + +Version 1.0 RC1 + +* Bugfixes: + - fixed minor package building issues + - inkscape always returns 0, even in case of an error. Added + a workaround, so daps now exits when an image conversion with + inkscape fails + - --main option should work now + - Fixed errors on setting the fallback stylesheets + - comments and remarks did not show up in the docs when requested + (again ;-(( ) - this is fixed now +* much better error handling - daps will now exit when wrong paths + or a non existing ROOTID are entered in the user config file + or the DC file +* significant enhancements to the Documentation + (Reference & Quickstart) + +------------------------------------------------------------------- +Tue Mar 20 13:14:16 UTC 2012 - [email protected] + +* Bugfix: Target for index generation had wrong ending + (.idx instead of .ind) + +------------------------------------------------------------------- +Fri Mar 16 16:01:26 UTC 2012 - [email protected] + +* Bugfix: Typo in Makefile caused wrong catalog entries + +------------------------------------------------------------------- +Thu Mar 15 15:38:26 UTC 2012 - [email protected] + +* showvariable now only shows the result to make it better suited + for script usage + +------------------------------------------------------------------- +Thu Mar 15 10:12:39 UTC 2012 - [email protected] + +Version 1.0beta2: + +* Bugfix: + Finally found the correct solution for adding/removing catalog + entries in the spec file +* Enhancement: webhelp suppport + +------------------------------------------------------------------- +Wed Mar 7 15:54:22 UTC 2012 - [email protected] + +Version 1.0beta1: + +* Rebuild large parts to make DAPS distribution-independent. + - rewrote Makefile for automake/autoconf + => configure; make; make install is now supported + - thorough cross-distribution testing is still needed, basic tests + have been run on RedHat, Debian and Ubuntu + +* removal of custom stylesheets + DAPS no longer uses the SUSE stylesheets as a default. It even no + longer contains the SUSE stylesheets - they are now available as a + separate package (suse-xsl-stylesheets in Documentation:Tools). + + - By default DAPS uses the generic DocBook stylesheets now + - Custom stylesheets such as the SUSE stylesheets can be used by + specifying up to four parameters on the command line/the config + files: + * Styleroot: + Directory containing the custom stylesheets. Must have the same + directory structure as the original DocBook stylesheet root + directory. Does _not_ need to contain stylesheets for all output + formats. If stylesheets are not found, DAPS will automatically + fall back to the DocBook stylesheets. + - Variable: STYLEROOT + - Parameter: --styleroot + - Value: absolute path to directory + * Fallback styleroot + Custom fallback styleroot. If DAPS cannot find styles for the ++++ 91 more lines (skipped) ++++ between /work/SRC/openSUSE:Factory/daps/daps.changes ++++ and /work/SRC/openSUSE:Factory/.daps.new/daps.changes Old: ---- daps-0.9.2.tar.bz2 New: ---- daps-1.0.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ daps.spec ++++++ --- /var/tmp/diff_new_pack.RmPN6F/_old 2012-05-08 12:26:30.000000000 +0200 +++ /var/tmp/diff_new_pack.RmPN6F/_new 2012-05-08 12:26:30.000000000 +0200 @@ -1,163 +1,145 @@ # # spec file for package daps # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. +# Copyright (c) 2012 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 +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# + Name: daps -Version: 0.9.2 +Version: 1.0.2 +Release: 0 -%define dtdversion 1.0 -%define dtdname novdoc %define docbuilddir %{_datadir}/daps %define regcat %{_bindir}/sgml-register-catalog %define fontdir %{_datadir}/fonts/truetype %define dbstyles %{_datadir}/xml/docbook/stylesheet/nwalsh/current -%define root_catalog for-catalog-%{dtdname}-%{dtdversion}.xml -%define daps_catalog for-catalog-%{name}-%{version}.xml +%define daps_catalog for-catalog-%{name}.xml -Release: 1 Summary: DocBook Authoring and Publishing Suite License: GPL-2.0 or GPL-3.0 Group: Productivity/Publishing/XML -URL: http://sourceforge.net/p/daps +Url: http://sourceforge.net/p/daps Source0: %{name}-%{version}.tar.bz2 Source1: %{name}.rpmlintrc Source2: %{name}-fetch-source BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch +BuildRequires: bash >= 4.0 BuildRequires: dia -BuildRequires: docbook_4 BuildRequires: docbook-xsl-stylesheets >= 1.75 -BuildRequires: python-xml +BuildRequires: docbook_4 %if 0%{?suse_version} > 1140 BuildRequires: perl-Image-ExifTool %else BuildRequires: exiftool %endif +%if 0%{?suse_version} >= 1220 +BuildRequires: libxml2-tools +%endif +BuildRequires: ImageMagick BuildRequires: fam BuildRequires: fdupes -BuildRequires: ImageMagick BuildRequires: inkscape BuildRequires: libxslt +BuildRequires: openSUSE-release BuildRequires: optipng +BuildRequires: python-xml BuildRequires: sgml-skel +BuildRequires: suse-xsl-stylesheets BuildRequires: svg-dtd -BuildRequires: trang BuildRequires: transfig -BuildRequires: unzip -BuildRequires: xorg-x11-devel # 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: freefont BuildRequires: ghostscript-library -BuildRequires: java BuildRequires: liberation-fonts -BuildRequires: LinuxLibertine BuildRequires: mplus-fonts -BuildRequires: opensp BuildRequires: poppler-tools -BuildRequires: xalan-j2 -BuildRequires: xml-commons-resolver BuildRequires: xmlformat -BuildRequires: xmlstarlet -BuildRequires: zip %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 -BuildRequires: fop >= 0.94 -BuildRequires: xerces-j2 -%if 0%{?suse_version} == 1130 -BuildRequires: xml-commons-jaxp-1.3-apis -%endif -%if 0%{?suse_version} < 1130 -BuildRequires: xml-commons-apis-bootstrap -%endif -%endif -%if 0%{?suse_version} < 1120 -BuildRequires: python-xml %endif - PreReq: libxml2 PreReq: sgml-skel +Requires: ImageMagick +Requires: LinuxLibertine +Requires: bash >= 4.0 Requires: dejavu Requires: dia -Requires: docbook_4 Requires: docbook-xsl-stylesheets >= 1.75 +Requires: docbook_4 Requires: exiftool Requires: fam Requires: freefont Requires: ghostscript-library -Requires: ImageMagick Requires: inkscape -Requires: java -Requires: libxslt Requires: liberation-fonts -Requires: LinuxLibertine +Requires: libxslt Requires: make Requires: mplus-fonts -Requires: opensp Requires: optipng Requires: poppler-tools Requires: sgml-skel Requires: svg-dtd Requires: transfig -Requires: unzip -Requires: xalan-j2 -Requires: xml-commons-resolver -Requires: xmlformat -Requires: xmlstarlet -Requires: zip %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 -Requires: fop >= 0.94 -Requires: xerces-j2 -%if 0%{?suse_version} == 1130 -Requires: xml-commons-jaxp-1.3-apis -%endif -%if 0%{?suse_version} < 1130 -Requires: xml-commons-apis-bootstrap -%endif -%endif -%if 0%{?suse_version} < 1120 -BuildRequires: python-xml %endif +Requires: python-xml Recommends: agfa-fonts -Recommends: aspell aspell-en aspell-en-huge +Recommends: aspell aspell-en +# Only works only for openSUSE 11.4 and below +%if 0%{?suse_version} < 1210 +Recommends: aspell-en-huge +%endif 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: jing Recommends: remake # needed to create ePUBs Recommends: ruby # Japanese Fonts: Recommends: sazanami-fonts +Recommends: suse-xsl-stylesheets # Chinese Recommends: ttf-arphic # Korean Fonts: @@ -168,7 +150,6 @@ #Obsoletes: susedoc <= 4.3.27 Provides: susedoc < 4.4 - %description DocBook Authoring and Publishing Suite (DAPS) @@ -193,51 +174,28 @@ #-------------------------------------------------------------------------- %build -# specifying VERSION is manadatory!! -%__make %{?_smp_mflags} VERSION=%{version} +%configure --docdir=%{_defaultdocdir}/%{name} --disable-edit-rootcatalog +%__make %{?_smp_mflags} #-------------------------------------------------------------------------- %install -# specifying VERSION is manadatory!! -make install DESTDIR=$RPM_BUILD_ROOT VERSION=%{version} - -# make_install macro does not have a DESTDIR in 11.1/SLE 11 !! -#%#make_install VERSION=%{version} +make install DESTDIR=$RPM_BUILD_ROOT # create symlinks: %fdupes -s $RPM_BUILD_ROOT/%{_datadir} #---------------------- %post -# SGM CATALOG # -if [ -x %{regcat} ]; then - for CATALOG in CATALOG.%{dtdname}-%{dtdversion}; do - %{regcat} -a %{_datadir}/sgml/$CATALOG >/dev/null 2>&1 || true - done -fi -# XML Catalog +# XML Catalog entries for daps profiling # # remove existing entries first (if existing) - needed for # zypper in, since it does not call postun # -# The first two ones are only there for campatibility reasons and -# can be removed in the future -# -edit-xml-catalog --group --catalog /etc/xml/suse-catalog.xml \ - --del %{dtdname}-%{version} -edit-xml-catalog --group --catalog /etc/xml/suse-catalog.xml \ - --del %{dtdname}xslt-%{version} -# -# These two entries need to stay +# delete ... edit-xml-catalog --group --catalog /etc/xml/suse-catalog.xml \ - --del %{dtdname}-%{dtdversion} -edit-xml-catalog --group --catalog /etc/xml/suse-catalog.xml \ - --del %{name}-%{version} -# -# now add new entries -edit-xml-catalog --group --catalog /etc/xml/suse-catalog.xml \ - --add /etc/xml/%{root_catalog} + --del %{name} +# ... and add it again edit-xml-catalog --group --catalog /etc/xml/suse-catalog.xml \ --add /etc/xml/%{daps_catalog} @@ -246,44 +204,29 @@ #---------------------- %postun -if [ ! -f %{_sysconfdir}/xml/%{root_catalog} -a -x /usr/bin/edit-xml-catalog ] ; then - for c in CATALOG.%{dtdname}-%{dtdversion}; do - %{regcat} -r %{_datadir}/sgml/$c >/dev/null 2>&1 - done -# XML Catalog -# -# The first two ones are only there for campatibility reasons and -# can be removed in the future -# -edit-xml-catalog --group --catalog /etc/xml/suse-catalog.xml \ - --del %{dtdname}-%{version} -edit-xml-catalog --group --catalog /etc/xml/suse-catalog.xml \ - --del %{dtdname}xslt-%{version} # -# These two entries need to stay -edit-xml-catalog --group --catalog /etc/xml/suse-catalog.xml \ - --del %{dtdname}-%{dtdversion} -edit-xml-catalog --group --catalog /etc/xml/suse-catalog.xml \ - --del %{name}-%{version} +# 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 +if [ -x /usr/bin/edit-xml-catalog ] ; then + edit-xml-catalog --group --catalog /etc/xml/suse-catalog.xml \ + --del %{name} fi %run_suseconfig_fonts +fi exit 0 - #---------------------- %files %defattr(-,root,root) %dir %{fontdir} %dir %{_sysconfdir}/%{name} -%dir %{_datadir}/xml/%{dtdname} -%dir %{_datadir}/xml/%{dtdname}/schema -%dir %{_datadir}/xml/%{dtdname}/schema/* -%dir %{_datadir}/xml/%{dtdname}/schema/*/1.0 %dir %{_defaultdocdir}/%{name} -%config /var/lib/sgml/CATALOG.* %config %{_sysconfdir}/xml/*.xml %config %{_sysconfdir}/%{name}/* @@ -291,12 +234,12 @@ %doc %{_defaultdocdir}/%{name}/* %{_bindir}/* -%{_datadir}/sgml/CATALOG.* %{_datadir}/emacs/site-lisp/docbook_macros.el %{fontdir}/* %{docbuilddir} -%{_datadir}/xml/%{dtdname}/schema/dtd/%{dtdversion}/* -%{_datadir}/xml/%{dtdname}/schema/rng/%{dtdversion}/* + +%exclude %{_defaultdocdir}/%{name}/INSTALL #---------------------- + %changelog ++++++ daps-0.9.2.tar.bz2 -> daps-1.0.2.tar.bz2 ++++++ ++++ 125466 lines of diff (skipped) ++++++ daps-fetch-source ++++++ --- /var/tmp/diff_new_pack.RmPN6F/_old 2012-05-08 12:26:31.000000000 +0200 +++ /var/tmp/diff_new_pack.RmPN6F/_new 2012-05-08 12:26:31.000000000 +0200 @@ -9,12 +9,12 @@ # Frank Sundermeyer <fsundermeyer at opensuse dot org> # -set -x +#set -x NAME=daps VERSION= SPECFILE=${NAME}.spec -SVNPATH=https://svn.code.sf.net/p/daps/svn/trunk/daps +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 @@ -47,7 +47,7 @@ # # Export daps from SVN # -svn export $SVNPATH ${TMPDIR}/${NAME} || exit_on_error "SVN export failed" +svn export -q $SVNPATH ${TMPDIR}/${NAME} || exit_on_error "SVN export failed" # # Get the version number @@ -62,11 +62,13 @@ # Create the tarball # export BZIP2=--best -tar cvjhf ${NAME}-${VERSION}.tar.bz2 -C ${TMPDIR} \ +tar chf ${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." +bzip2 -9f ${NAME}-${VERSION}.tar -echo "Successfully created ${NAME}-${VERSION}.tar.bz2" - +echo "Successfully wrote source tarball ${NAME}-${VERSION}.tar.bz2" # # Copy the spec file if necessary # ++++++ daps.rpmlintrc ++++++ --- /var/tmp/diff_new_pack.RmPN6F/_old 2012-05-08 12:26:31.000000000 +0200 +++ /var/tmp/diff_new_pack.RmPN6F/_new 2012-05-08 12:26:31.000000000 +0200 @@ -1,5 +1,9 @@ addFilter("explicit-lib-dependency libxml2") addFilter("explicit-lib-dependency libxslt") addFilter("explicit-lib-dependency liberation-fonts") -#addFilter("non-executable-script .*/bin/create_dm_docu.py") -#addFilter("non-executable-script .*/bin/dm/test_dm.py") +addFilter("non-executable-script .*/daps/lib/daps_functions") +# migration script for old susedoc projects, no man page needed +addFilter("no-manual-page-for-binary daps-envconvert") +# internally used only, no man page needed +addFilter("no-manual-page-for-binary daps-susespell") +addFilter("no-manual-page-for-binary daps-xmlformat") -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
