Hello community,
here is the log from the commit of package daps for openSUSE:12.1:Update:Test
checked in at 2012-01-19 18:05:01
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:12.1:Update:Test/daps (Old)
and /work/SRC/openSUSE:12.1:Update:Test/.daps.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "daps", Maintainer is ""
Changes:
--------
New Changes file:
--- /dev/null 2010-08-26 16:28:41.000000000 +0200
+++ /work/SRC/openSUSE:12.1:Update:Test/.daps.new/daps.changes 2012-01-19
18:05:02.000000000 +0100
@@ -0,0 +1,545 @@
+-------------------------------------------------------------------
+Mon Jan 9 15:30:47 UTC 2012 - t...@suse.de
+
+- Really fixed bnc#739213,
+- Added COPYING-{2.0,3.0} files
+
+-------------------------------------------------------------------
+Wed Dec 28 11:48:06 UTC 2011 - k...@suse.de
+
+- Remove fetch_source.
+
+-------------------------------------------------------------------
+Wed Dec 28 08:39:57 UTC 2011 - k...@suse.de
+
+- BuildRequire exiftool that's now available as a subpackage on
+ Factory.
+
+-------------------------------------------------------------------
+Thu Dec 15 14:07:13 UTC 2011 - fsunderme...@opensuse.org
+
+New version 0.9.2
+
+- BUGFIXES:
+ * fixed misspelled variablename in fo generating target
+ * remarks in HTML and PDF builds were only shown when comments
+ were turned on, too. This had been fixed earlier but the fix
+ seems to have been reverted by mistake. Re-enabled the fix in
+ the inline.xslt stxlesheets for fo and html
+- -r/--remarls now implies draft mode
+- -m/--meta now implies draft mode but does not imply remarks
+ anymore
+
+-------------------------------------------------------------------
+Thu Dec 15 10:39:31 UTC 2011 - k...@suse.de
+
+- Set license to GPL-2.0+.
+
+-------------------------------------------------------------------
+Thu Dec 15 06:49:50 UTC 2011 - k...@suse.de
+
+- On 12.1, BuildRequire perl-Image-ExifTool.
+
+-------------------------------------------------------------------
+Fri Dec 9 11:53:10 UTC 2011 - fsunderme...@opensuse.org
+
+- BUGFIX: Misspelled variable name in fo generation for FOP
+- Styleshhet changes:
+ * added first draft of release notes stylesheets
+
+-------------------------------------------------------------------
+Wed Dec 7 13:54:43 UTC 2011 - fsunderme...@opensuse.org
+
+- Stylesheet changes:
+ Fixed bugs:
+ * bnc#573835: pdf-color: title in PDF properties too general
+ * bnc#703483: FOP: No Hyphenation?
+ * bnc#706452: FOP: Too much Whitespace Behind <ulink> and <filename>
+ * bnc#711526: Layout: sect3 can not be distinguished from a sect4
+ * bnc#719848: daps stylesheets: Make metadata for PDF draft mode optional
+
+- Program changes:
+ * New version 0.9.1
+ * NEW FEATURES:
+ - "daps -h <subcommand>" now shows help for subcommand
+ - New config option XSLTPARAM / cmdline switch --xsltparam:
+ can be used to overwrite one or more stylesheet
+ parameters. Using that option/switch it is possible to change
+ the pagesize, pageformat, alignment, margins, etc. etc.
+ without having to rewrite the stylesheets directly
+ - subcommand getimages can now be run with a rootid or a filename
+ - subcommands getimages and checklink can now be invoked without
+ a filename or a rootid - in this case the rootid provided by
+ the ENV-file is used
+ - new general command line switch --version
+ - new switch -m/--meta for pdf builds (adds same functionality as
+ for the html builds)
+ * completely rewrote lib/daps_functions:
+ - now has a generic option parser
+ - functions setup_builddir and format_options have been
+ combined into one function called init_env
+ - one single function that invokes make: call_make
+ - logging can be turned on/off within each function invoking
+ call_make by setting WRITE_LOG to 1/0 (default: 1 (on))
+ - the make command is now set up here rather than in bin/daps
+ - getimages now uses make to create the image list (rather than
+ using /usr/bin/xml)
+ - new function no_opts for subcommands that have no command line
+ switches
+ * pretty printing has been moved from lib/daps_functions into the
+ makefiles
+ * BUGFIXES:
+ - We now do an early! check whether a subcommand is correct
+ or not function run_subcmds has therefore been replaced by an
+ associative hash; the hash's key/value pairs can be eval'd to
+ call the function
+ - .fo files will always be regenerated by using PHONY targets
+ This also keeps the .fo file, which is desireable for debugging
+ purposes
+
+-------------------------------------------------------------------
+Fri Oct 7 12:28:15 UTC 2011 - fsunderme...@opensuse.org
+
+- Bugfixes on .document and .desktop file generation
+
+-------------------------------------------------------------------
+Fri Oct 7 08:13:54 UTC 2011 - t...@suse.de
+
+- Updated Quick Start/Flyer design
+
+-------------------------------------------------------------------
+Thu Oct 6 11:59:03 UTC 2011 - fsunderme...@opensuse.org
+
+- Bugfix: image copying on static html builds
+
+-------------------------------------------------------------------
+Thu Oct 6 10:39:58 UTC 2011 - fsunderme...@opensuse.org
+
+- Bugfix: css file was not properly copied when using --static on
+ HTML builds
+
+-------------------------------------------------------------------
+Fri Sep 30 22:25:08 UTC 2011 - fsunderme...@opensuse.org
+
+- Bugfixing HTML generation. Copying/linking images and CSS made
+ problems when old builöds were present. This fix ensures images/css
+ files get removed before trying to create them
+
+-------------------------------------------------------------------
+Fri Sep 30 14:48:36 UTC 2011 - fsunderme...@opensuse.org
+
+Beta 8:
+
+- new option "--static" for html builds copies images and css files
+ rather than linking them (which is the default)
+- document-files-html / document-files-pdf / desktop-files now only
+ generate the desktop files rather than creating tarballs
+ * tarballs are generated with dist-document-files-html, dist-...
+ * document-files-dir-name, desktop-files-dir-name show the
+ directory names for the generated desktop files
+- new file names for PDFs:
+ color: ($BOOK|$ROOTID)_$LANG.pdf
+ print: ($BOOK|$ROOTID)-print_$LANG.pdf
+- new option --def-file=DEFFILE for target package-src. If specified
+ also adds all ENV files referenced in the DEF-file to the tarball
+- new option --def-file=DEFFILE for target locdrop adds the DEF-file
+ to the notrans tarball
+- Bugfix:
+ * get name targets (pdf-name, html-dir-name,...) now support
+ options --name, --rootid, -cdr
+
+-------------------------------------------------------------------
+Mon Sep 26 15:36:46 UTC 2011 - fsunderme...@opensuse.org
+
+- spec file changes so daps builds for SLE 11 / 11.1:
+ * checkbot is a recommendation for SLE
+ * require python-xml for < 1120
+ * replace make_install macro with a literal make install call,
+ since 11.1/SLE 11 do not have the macro
+- use the tar option --transform instead of --xform in order to be
+ compatible with older tar versions
+- Bugfix Makefile: global option -d has been replaced with --debug
+
+-------------------------------------------------------------------
+Mon Sep 26 11:45:24 UTC 2011 - fsunderme...@opensuse.org
+
+- target validate now also warns about missing graphics
+- Bugfix: verbosity switch -v works correctly now
+
+-------------------------------------------------------------------
+Tue Sep 20 11:53:36 UTC 2011 - fsunderme...@opensuse.org
+
+- verbosity can now also be set to "0" on the command line (needed
+ for scripting)
+- renamed "--verbose" switch to "--verbosity"
+- Specfile: Requires: fam
+
+-------------------------------------------------------------------
+Mon Sep 19 11:52:50 UTC 2011 - fsunderme...@opensuse.org
+
+- Specfile: fixed %{ext_man}
+- fetch_source now also copies the spec file if needed
+
+-------------------------------------------------------------------
+Mon Sep 19 10:46:07 UTC 2011 - fsunderme...@opensuse.org
+
+- Completely rewrote the verbosity stuff:
+ * Verbosity none: only display on line with result (default)
+ * Verbosity 1 (-v, --verbose=1): print the most important target results
+ * Verbosity 2 (-vv --verbose=2): print all commands called by make
+ * Default verbosity level can be overwritten in ~/.daps/config via
+ VERBOSITY=(0|1|2)
+- General option -d is no longer supported to avoid confusion with
+ subcommand option -d (draft mode) - use --debug instead
+- Replaced target clean-book with clean-results
+- Updated BUGS and TODO
+- Stylesheets:
+ * fixed bnc#573835 (PDF metadata)
++++ 348 more lines (skipped)
++++ between /dev/null
++++ and /work/SRC/openSUSE:12.1:Update:Test/.daps.new/daps.changes
New:
----
daps-0.9.2.tar.bz2
daps-fetch-source
daps.changes
daps.rpmlintrc
daps.spec
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ daps.spec ++++++
#
# 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.
#
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
#
Name: daps
Version: 0.9.2
%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
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
Source0: %{name}-%{version}.tar.bz2
Source1: %{name}.rpmlintrc
Source2: %{name}-fetch-source
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
BuildRequires: dia
BuildRequires: docbook_4
BuildRequires: docbook-xsl-stylesheets >= 1.75
BuildRequires: python-xml
%if 0%{?suse_version} > 1140
BuildRequires: perl-Image-ExifTool
%else
BuildRequires: exiftool
%endif
BuildRequires: fam
BuildRequires: fdupes
BuildRequires: ImageMagick
BuildRequires: inkscape
BuildRequires: libxslt
BuildRequires: optipng
BuildRequires: sgml-skel
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: 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
%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: dejavu
Requires: dia
Requires: docbook_4
Requires: docbook-xsl-stylesheets >= 1.75
Requires: exiftool
Requires: fam
Requires: freefont
Requires: ghostscript-library
Requires: ImageMagick
Requires: inkscape
Requires: java
Requires: libxslt
Requires: liberation-fonts
Requires: LinuxLibertine
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
%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
Recommends: agfa-fonts
Recommends: aspell aspell-en aspell-en-huge
Recommends: daps-docmanager
Recommends: emacs psgml
# Split of ttf-founder-simplified and ttf-founder-traditional
Recommends: FZFangSong FZHeiTi FZSongTi
Recommends: fifth-leg-font
Recommends: remake
# needed to create ePUBs
Recommends: ruby
# Japanese Fonts:
Recommends: sazanami-fonts
# Chinese
Recommends: ttf-arphic
# Korean Fonts:
Recommends: unfonts
# Internal XEP package:
Recommends: xep
#Obsoletes: susedoc <= 4.3.27
Provides: susedoc < 4.4
%description
DocBook Authoring and Publishing Suite (DAPS)
DAPS contains a set of stylesheets, scripts and makefiles that enable
you to create HTML, PDF, EPUB and other formats from DocBook XML with a
single command. It also contains tools to generate profiled source
tarballs for distributing your XML sources for translation or review.
DAPS also includes tools that assist you when writing DocBook XML:
linkchecker, validator, spellchecker, editor macros and stylesheets for
converting DocBook XML.
DAPS is the successor of susedoc. See
/usr/share/doc/packages/daps/README.upgrade_from_susedoc_4.x
for upgrade instructions.
#--------------------------------------------------------------------------
%prep
%setup -q -n %{name}
#%%patch1 -p1
#--------------------------------------------------------------------------
%build
# specifying VERSION is manadatory!!
%__make %{?_smp_mflags} VERSION=%{version}
#--------------------------------------------------------------------------
%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}
# 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
#
# 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
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}
edit-xml-catalog --group --catalog /etc/xml/suse-catalog.xml \
--add /etc/xml/%{daps_catalog}
%run_suseconfig_fonts
exit 0
#----------------------
%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}
fi
%run_suseconfig_fonts
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}/*
%doc %{_mandir}/man1/*.1%{ext_man}
%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}/*
#----------------------
%changelog
++++++ daps-fetch-source ++++++
#!/bin/bash
#
#
# Create DAPS source tarball from SVN
#
# Copyright (C) 2004 - 2011 SUSE Linux Products GmbH
#
# Author:
# Frank Sundermeyer <fsundermeyer at opensuse dot org>
#
set -x
NAME=daps
VERSION=
SPECFILE=${NAME}.spec
SVNPATH=https://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
#----------
# Functions
#----------
# exit on error
#
function exit_on_error {
echo -e "$1"
rm -rf $TMPDIR
exit 1
}
#-----
# MAIN
#-----
#
# This script needs to be called from the daps osc checkout directory, so
# lets check whethter we are in the correct directory
#
if [[ ! -s daps.spec && ! -d .osc ]]; then
echo "Looks like you are not in the daps checkout directory."
read -p "Continue anyway (y/n) [n]: " CONT
if [[ n = $CONT || N = $CONT ]]; then
exit_on_error "Aborted by user."
fi
fi
#
# Export daps from SVN
#
svn export $SVNPATH ${TMPDIR}/${NAME} || exit_on_error "SVN export failed"
#
# Get the version number
#
VERSION=$(egrep "^Version:\s*" ${TMPDIR}/${NAME}/packaging/$SPECFILE | sed
's/^Version:\s*//')
if [[ -z $VERSION ]]; then
exit_on_error "Couldn't get version number from spec-file."
fi
#
# Create the tarball
#
export BZIP2=--best
tar cvjhf ${NAME}-${VERSION}.tar.bz2 -C ${TMPDIR} \
--exclude-from=$EXCLUDES ${NAME} || exit_on_error "Failed to create the
tarball."
echo "Successfully created ${NAME}-${VERSION}.tar.bz2"
#
# Copy the spec file if necessary
#
diff -q $SPECFILE ${TMPDIR}/${NAME}/packaging/$SPECFILE >/dev/null
if [[ 0 = $? ]]; then
echo "spec file is up-to-date"
else
cp ${TMPDIR}/${NAME}/packaging/$SPECFILE . || exit_on_error "Failed to copy
the specfile."
echo "Successfully updated the spec file."
fi
rm -rf ${TMPDIR}
exit 0
++++++ daps.rpmlintrc ++++++
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")
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
