Hello community,
here is the log from the commit of package susedoc
checked in at Fri Aug 31 15:30:35 CEST 2007.
--------
--- susedoc/susedoc.changes 2007-08-20 13:41:17.000000000 +0200
+++ /mounts/work_src_done/NOARCH/susedoc/susedoc.changes 2007-08-30 17:19:26.000000000 +0200
@@ -1,0 +2,16 @@
+Thu Aug 30 15:29:25 CEST 2007 - toms@suse.de
+
+- Corrected Requires keywords and added version numbers for openSUSE
+ Build Server
+- Corrected behavior of checking xml-commons-resolver (actually it is
+ provided by two packages: xerces-j2 and xml-commons-resolver)
+ Also a bug with JAVACMD in suse-fop, found by Marcus Schäfer
+
+-------------------------------------------------------------------
+Thu Aug 30 10:47:01 CEST 2007 - toms@suse.de
+
+- Fixed xsl:preserve-space for titles (xslt/fo/docbook.xsl)
+- Fixed index title in xslt/fo/index.xsl
+- Support for optipng
+
+-------------------------------------------------------------------
Old:
----
susedoc-4.2_20070817.tar.bz2
New:
----
susedoc-4.2_20070830.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ susedoc.spec ++++++
--- /var/tmp/diff_new_pack.F21166/_old 2007-08-31 15:22:06.000000000 +0200
+++ /var/tmp/diff_new_pack.F21166/_new 2007-08-31 15:22:06.000000000 +0200
@@ -15,10 +15,15 @@
%define packageversion 4.2
%define dtdname novdoc
%define docbuilddir /usr/share/susedoc
+%if %suse_version >= 1030
+Requires: svg-schema optipng exiftool
+%else
+Requires: svg-dtd
+%endif
%if 0%{?opensuse_bs}
-Requires: inkscape transfig ImageMagick java xml-commons-resolver docbook-xsl-stylesheets svg-dtd freefont fop >= svn482585
+Requires: libxml2 libxslt inkscape ImageMagick java xml-commons-resolver docbook-xsl-stylesheets freefont fop >= 0.93 transfig >= 3.2.5 dia >= 0.96
%else
-Requires: inkscape transfig ImageMagick java xml-commons-resolver docbook-xsl-stylesheets svg-dtd freefont agfa-fonts fop >= svn482585
+Requires: libxml2 libxslt inkscape ImageMagick java xml-commons-resolver docbook-xsl-stylesheets freefont agfa-fonts fop transfig dia
%endif
%if %suse_version >= 1000
BuildRequires: sgml-skel
@@ -27,12 +32,12 @@
License: GPL v2 or later
Group: Productivity/Publishing/XML
Autoreqprov: on
-Version: %{packageversion}_20070817
+Version: %{packageversion}_20070830
Release: 1
Summary: XML Build Mechanics for Novell, SUSE, and openSUSE Documentation
# Needs to be fixed to openSUSE build server:
Url: http://www.opensuse.org/Documentation_Team
-Source0: susedoc-4.2_20070817.tar.bz2
+Source0: susedoc-4.2_20070830.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
%define regcat /usr/bin/sgml-register-catalog
@@ -188,6 +193,16 @@
%{docbuilddir}
%changelog
+* Thu Aug 30 2007 - toms@suse.de
+- Corrected Requires keywords and added version numbers for openSUSE
+ Build Server
+- Corrected behavior of checking xml-commons-resolver (actually it is
+ provided by two packages: xerces-j2 and xml-commons-resolver)
+ Also a bug with JAVACMD in suse-fop, found by Marcus Schäfer
+* Thu Aug 30 2007 - toms@suse.de
+- Fixed xsl:preserve-space for titles (xslt/fo/docbook.xsl)
+- Fixed index title in xslt/fo/index.xsl
+- Support for optipng
* Mon Aug 20 2007 - toms@suse.de
- Corrected FOP font issue. Configuration file of FOP and fo/fonts.xsl
contained different font names (actually, they are aliases).
++++++ susedoc-4.2_20070817.tar.bz2 -> susedoc-4.2_20070830.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/susedoc/bin/suse-fop new/susedoc/bin/suse-fop
--- old/susedoc/bin/suse-fop 2007-08-17 09:54:10.000000000 +0200
+++ new/susedoc/bin/suse-fop 2007-08-30 17:08:23.000000000 +0200
@@ -1,5 +1,5 @@
#!/bin/sh
-__VERSION__="$Id: suse-fop 18205 2007-03-06 07:57:37Z toms $"
+__VERSION__="$Id: suse-fop 24232 2007-08-30 15:07:45Z toms $"
#
# Configuring variables
@@ -88,7 +88,7 @@
# echo "CLASSPATH (local): $CP"
-if rpm -q xml-commons-resolver 1>/dev/null ; then
+if [ -s /etc/alternatives/xml-commons-resolver ]; then
echo -e "\033[34m* FOP has catalog support\033[m\017"
fop_exec_command="exec $JAVA_HOME/bin/java \
$LOGCHOICE $LOGLEVEL \
@@ -101,7 +101,7 @@
# $FOP_OPTS \
else
echo -e "\033[31m* FOP WARNING: No Catalog Support!\033[m\017"
-fop_exec_command="exec \"$JAVACMD\" $LOGCHOICE $LOGLEVEL -classpath \"$LOCALCLASSPATH\" $FOP_OPTS org.apache.fop.cli.Main $@"
+fop_exec_command="exec $JAVA_HOME/bin/java $LOGCHOICE $LOGLEVEL -classpath \"$LOCALCLASSPATH\" $FOP_OPTS org.apache.fop.cli.Main $@"
fi
# echo "----------------------"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/susedoc/bin/suse-xep new/susedoc/bin/suse-xep
--- old/susedoc/bin/suse-xep 2007-08-17 09:54:10.000000000 +0200
+++ new/susedoc/bin/suse-xep 2007-08-30 17:08:23.000000000 +0200
@@ -7,7 +7,7 @@
# * Pointer to the license file
# * Pointer to the "file not found" image
#
-__VERSION__="$Id: suse-xep 17836 2007-02-27 14:57:11Z toms $"
+__VERSION__="$Id: suse-xep 24232 2007-08-30 15:07:45Z toms $"
#
# Configuring variables
@@ -82,7 +82,7 @@
echo -e "\033[34m* XEP using configuration file »$XEP_CONFIG_FILE«\033[m\017"
echo -e "\033[34m* XEP-License: »$XEP_LICENSE«\033[m\017"
-if rpm -q xml-commons-resolver 1>/dev/null ; then
+if [ -s /etc/alternatives/xml-commons-resolver ]; then
echo -e "\033[34m* XEP has catalog support\033[m\017"
$JAVA_HOME/bin/java \
$XEP_MEMORY $XEP_STACK \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/susedoc/etc/system-profile new/susedoc/etc/system-profile
--- old/susedoc/etc/system-profile 2007-08-17 09:54:12.000000000 +0200
+++ new/susedoc/etc/system-profile 2007-08-30 17:08:25.000000000 +0200
@@ -53,6 +53,12 @@
unset COMMON
fi
+# use exiftool and optipng if available
+EXIFTOOL=$(type -p exiftool || echo /bin/true)
+export EXIFTOOL
+
+OPTIPNG=$(type -p optipng || echo /bin/true)
+export OPTIPNG
numprocs=`egrep -c ^cpu[0-9]+ /proc/stat || :`
if [ "$numprocs" = "0" ]; then
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/susedoc/make/common.mk new/susedoc/make/common.mk
--- old/susedoc/make/common.mk 2007-08-17 09:54:12.000000000 +0200
+++ new/susedoc/make/common.mk 2007-08-30 17:08:26.000000000 +0200
@@ -687,8 +687,12 @@
.PHONY: optipng
optipng:
- optipng -o8 $(addprefix images/src/png/,$(USED_PNG))
- exiftool -Comment=optipng -overwrite_original -P $(addprefix images/src/png/, $(USED_PNG))
+ exiftool -Comment=optipng -overwrite_original -P \
+ $(shell for i in $(addprefix images/src/png/,$(USED_PNG)); do \
+ exiftool -Comment $$i | grep optipng > /dev/null || \
+ optipng -o8 $$i > /dev/null; \
+ echo "$$i "; \
+ done )
warn-images:
@if test "$(DOUBLEIMG)"; then \
@@ -728,10 +732,10 @@
rm -f $@; \
fi
inkscape $(INK_OPTIONS) -e $@ -f $<
- optipng -o8 $@
+ $(OPTIPNG) -o8 $@ >& /dev/null
images/online/%.png: images/src/png/%.png
- $(EXIFTOOL) -Comment $< | grep optipng > /dev/null || \
+ @$(EXIFTOOL) -Comment $< | grep optipng > /dev/null || \
echo -en "\033[31m";\
echo "Warning: $< not optimized. ";\
echo "Run make optipng and check in the modified pictures"; \
@@ -743,7 +747,7 @@
rm -f $@; \
fi
inkscape $(INK_OPTIONS) -e $@ -f $<
- optipng -o8 $@
+ $(OPTIPNG) -o8 $@ >& /dev/null
tmp/%.svg: images/src/fig/%.fig
fig2dev -L svg $< $@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/susedoc/xslt/ChangeLog new/susedoc/xslt/ChangeLog
--- old/susedoc/xslt/ChangeLog 2007-08-17 09:54:03.000000000 +0200
+++ new/susedoc/xslt/ChangeLog 2007-08-30 17:08:14.000000000 +0200
@@ -1,3 +1,40 @@
+2007-08-29 Thomas Schraitle
+ * xslt/fo/index.xsl: (r24187)
+ index.titlepage.recto: Added test for $indexfile != ''
+ and used normal title generation in case of the test fails
+
+
+2007-08-22 Thomas Schraitle
+ * xslt/desktop/docbook.xsl: (r24095, r24098)
+ - Added xsl:preserve-space for titles
+ - create.directory: Fixed bug for title (mainly in Quick Starts, see
+ #299605
+ - Fixed: Empty language code in Name[...] and Comment[...] fixed
+ with XPath expression:
+ (@lang|
+ ancestor-or-self::article/@lang |
+ ancestor-or-self::book/@lang |
+ ancestor-or-self::set/@lang)[1]
+ - Removed suse:lang parameter as it is calculated in
+ suse:keyvalue for each node
+
+
+2007-07-17 Thomas Schraitle
+ * xslt/common/l10n/: (r23744)
+ Added gentext templates for using font settings in language files
+
+
+2007-07-17 Thomas Schraitle
+ * xslt/flyer/fonts.xsl, xslt/fo/fonts.xsl: (r23710, r23723)
+ Added gentext template for using font settings in language files
+
+
+2007-07-20 Thomas Schraitle
+ * xslt/fo/fonts.xsl: (r23710),
+ * /trunk/novdoc/xslt/common/l10n/*.xml: (r23744)
+ Added gentext template for using font settings in language files
+
+
2007-07-20 Thomas Schraitle
* xslt/desktop/docbook.xsl: (r22372)
- Corrected article generation; implemented article/sect1 desktop
@@ -7,6 +44,7 @@
- Handling of filenames with extension .html or .desktop
consolidated
+
2007-07-19 Thomas Schraitle
* xslt/desktop/docbook.xsl, xslt/desktop/filename.xsl,
xslt/desktop/write.text.chunk.xsl: (r22318)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/susedoc/xslt/common/l10n/cs.xml new/susedoc/xslt/common/l10n/cs.xml
--- old/susedoc/xslt/common/l10n/cs.xml 2007-08-17 09:53:58.000000000 +0200
+++ new/susedoc/xslt/common/l10n/cs.xml 2007-08-30 17:08:06.000000000 +0200
@@ -17,6 +17,22 @@
+ <!-- WARNING:
+ Change the following lines only, if you know what you are do!
+ -->
+
+
+
+
+
+
+
+
+
+
+
+ <!-- /WARNING -->
+
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/susedoc/xslt/common/l10n/da.xml new/susedoc/xslt/common/l10n/da.xml
--- old/susedoc/xslt/common/l10n/da.xml 2007-08-17 09:53:58.000000000 +0200
+++ new/susedoc/xslt/common/l10n/da.xml 2007-08-30 17:08:06.000000000 +0200
@@ -23,6 +23,22 @@
+ <!-- WARNING:
+ Change the following lines only, if you know what you are do!
+ -->
+
+
+
+
+
+
+
+
+
+
+
+ <!-- /WARNING -->
+
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/susedoc/xslt/common/l10n/de.xml new/susedoc/xslt/common/l10n/de.xml
--- old/susedoc/xslt/common/l10n/de.xml 2007-08-17 09:53:58.000000000 +0200
+++ new/susedoc/xslt/common/l10n/de.xml 2007-08-30 17:08:06.000000000 +0200
@@ -17,6 +17,22 @@
+ <!-- WARNING:
+ Change the following lines only, if you know what you are do!
+ -->
+
+
+
+
+
+
+
+
+
+
+
+ <!-- /WARNING -->
+
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/susedoc/xslt/common/l10n/es.xml new/susedoc/xslt/common/l10n/es.xml
--- old/susedoc/xslt/common/l10n/es.xml 2007-08-17 09:53:58.000000000 +0200
+++ new/susedoc/xslt/common/l10n/es.xml 2007-08-30 17:08:06.000000000 +0200
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- $Id: es.xml 22211 2007-07-17 12:49:28Z toms $ -->
+<!-- $Id: es.xml 23744 2007-08-17 09:38:34Z toms $ -->
http://docbook.sourceforge.net/xmlns/l10n/1.0"
language="es"
english-language-name="Spanish">
@@ -20,6 +20,22 @@
+ <!-- WARNING:
+ Change the following lines only, if you know what you are do!
+ -->
+
+
+
+
+
+
+
+
+
+
+
+ <!-- /WARNING -->
+
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/susedoc/xslt/common/l10n/fi.xml new/susedoc/xslt/common/l10n/fi.xml
--- old/susedoc/xslt/common/l10n/fi.xml 2007-08-17 09:53:58.000000000 +0200
+++ new/susedoc/xslt/common/l10n/fi.xml 2007-08-30 17:08:06.000000000 +0200
@@ -18,6 +18,22 @@
+ <!-- WARNING:
+ Change the following lines only, if you know what you are do!
+ -->
+
+
+
+
+
+
+
+
+
+
+
+ <!-- /WARNING -->
+
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/susedoc/xslt/common/l10n/fr.xml new/susedoc/xslt/common/l10n/fr.xml
--- old/susedoc/xslt/common/l10n/fr.xml 2007-08-17 09:53:58.000000000 +0200
+++ new/susedoc/xslt/common/l10n/fr.xml 2007-08-30 17:08:06.000000000 +0200
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- $Id: fr.xml 22211 2007-07-17 12:49:28Z toms $ -->
+<!-- $Id: fr.xml 23744 2007-08-17 09:38:34Z toms $ -->
http://docbook.sourceforge.net/xmlns/l10n/1.0"
language="fr"
english-language-name="French">
@@ -21,6 +21,22 @@
+ <!-- WARNING:
+ Change the following lines only, if you know what you are do!
+ -->
+
+
+
+
+
+
+
+
+
+
+
+ <!-- /WARNING -->
+
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/susedoc/xslt/common/l10n/hu.xml new/susedoc/xslt/common/l10n/hu.xml
--- old/susedoc/xslt/common/l10n/hu.xml 2007-08-17 09:53:58.000000000 +0200
+++ new/susedoc/xslt/common/l10n/hu.xml 2007-08-30 17:08:06.000000000 +0200
@@ -19,6 +19,22 @@
+ <!-- WARNING:
+ Change the following lines only, if you know what you are do!
+ -->
+
+
+
+
+
+
+
+
+
+
+
+ <!-- /WARNING -->
+
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/susedoc/xslt/common/l10n/it.xml new/susedoc/xslt/common/l10n/it.xml
--- old/susedoc/xslt/common/l10n/it.xml 2007-08-17 09:53:58.000000000 +0200
+++ new/susedoc/xslt/common/l10n/it.xml 2007-08-30 17:08:06.000000000 +0200
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- $Id: it.xml 22211 2007-07-17 12:49:28Z toms $ -->
+<!-- $Id: it.xml 23744 2007-08-17 09:38:34Z toms $ -->
http://docbook.sourceforge.net/xmlns/l10n/1.0"
language="it"
english-language-name="Italian">
@@ -16,6 +16,22 @@
+ <!-- WARNING:
+ Change the following lines only, if you know what you are do!
+ -->
+
+
+
+
+
+
+
+
+
+
+
+ <!-- /WARNING -->
+
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/susedoc/xslt/common/l10n/ko.xml new/susedoc/xslt/common/l10n/ko.xml
--- old/susedoc/xslt/common/l10n/ko.xml 2007-08-17 09:53:58.000000000 +0200
+++ new/susedoc/xslt/common/l10n/ko.xml 2007-08-30 17:08:06.000000000 +0200
@@ -11,6 +11,22 @@
+ <!-- WARNING:
+ Change the following lines only, if you know what you are do!
+ -->
+
+
+
+
+
+
+
+
+
+
+
+ <!-- /WARNING -->
+
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/susedoc/xslt/common/l10n/nl.xml new/susedoc/xslt/common/l10n/nl.xml
--- old/susedoc/xslt/common/l10n/nl.xml 2007-08-17 09:53:58.000000000 +0200
+++ new/susedoc/xslt/common/l10n/nl.xml 2007-08-30 17:08:06.000000000 +0200
@@ -25,6 +25,22 @@
+ <!-- WARNING:
+ Change the following lines only, if you know what you are do!
+ -->
+
+
+
+
+
+
+
+
+
+
+
+ <!-- /WARNING -->
+
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/susedoc/xslt/common/l10n/no.xml new/susedoc/xslt/common/l10n/no.xml
--- old/susedoc/xslt/common/l10n/no.xml 2007-08-17 09:53:58.000000000 +0200
+++ new/susedoc/xslt/common/l10n/no.xml 2007-08-30 17:08:06.000000000 +0200
@@ -17,6 +17,22 @@
+ <!-- WARNING:
+ Change the following lines only, if you know what you are do!
+ -->
+
+
+
+
+
+
+
+
+
+
+
+ <!-- /WARNING -->
+
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/susedoc/xslt/common/l10n/pl.xml new/susedoc/xslt/common/l10n/pl.xml
--- old/susedoc/xslt/common/l10n/pl.xml 2007-08-17 09:53:58.000000000 +0200
+++ new/susedoc/xslt/common/l10n/pl.xml 2007-08-30 17:08:06.000000000 +0200
@@ -9,6 +9,22 @@
+ <!-- WARNING:
+ Change the following lines only, if you know what you are do!
+ -->
+
+
+
+
+
+
+
+
+
+
+
+ <!-- /WARNING -->
+
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/susedoc/xslt/common/l10n/pt_br.xml new/susedoc/xslt/common/l10n/pt_br.xml
--- old/susedoc/xslt/common/l10n/pt_br.xml 2007-08-17 09:53:58.000000000 +0200
+++ new/susedoc/xslt/common/l10n/pt_br.xml 2007-08-30 17:08:06.000000000 +0200
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- $Id: pt_br.xml 22211 2007-07-17 12:49:28Z toms $ -->
+<!-- $Id: pt_br.xml 23744 2007-08-17 09:38:34Z toms $ -->
http://docbook.sourceforge.net/xmlns/l10n/1.0" language="pt_br" english-language-name="Portuguese (Brazil)">
@@ -16,6 +16,22 @@
+ <!-- WARNING:
+ Change the following lines only, if you know what you are do!
+ -->
+
+
+
+
+
+
+
+
+
+
+
+ <!-- /WARNING -->
+
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/susedoc/xslt/common/l10n/sv.xml new/susedoc/xslt/common/l10n/sv.xml
--- old/susedoc/xslt/common/l10n/sv.xml 2007-08-17 09:53:58.000000000 +0200
+++ new/susedoc/xslt/common/l10n/sv.xml 2007-08-30 17:08:06.000000000 +0200
@@ -17,6 +17,22 @@
+ <!-- WARNING:
+ Change the following lines only, if you know what you are do!
+ -->
+
+
+
+
+
+
+
+
+
+
+
+ <!-- /WARNING -->
+
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/susedoc/xslt/desktop/docbook.xsl new/susedoc/xslt/desktop/docbook.xsl
--- old/susedoc/xslt/desktop/docbook.xsl 2007-08-17 09:54:03.000000000 +0200
+++ new/susedoc/xslt/desktop/docbook.xsl 2007-08-30 17:08:14.000000000 +0200
@@ -11,6 +11,7 @@
+
@@ -69,29 +44,6 @@
ERROR: Neither FOP1 nor XEP used.
-
-
@@ -110,27 +62,6 @@
ERROR: Neither FOP1 nor XEP used.
-
-
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/susedoc/xslt/fo/index.xsl new/susedoc/xslt/fo/index.xsl
--- old/susedoc/xslt/fo/index.xsl 2007-08-17 09:54:02.000000000 +0200
+++ new/susedoc/xslt/fo/index.xsl 2007-08-30 17:08:13.000000000 +0200
@@ -322,7 +322,7 @@
<!-- Titlepages -->
- xsl:messageindex.titlepage
+ <!--<xsl:message>index.titlepage</xsl:message>-->
fo:block
@@ -384,18 +384,29 @@
- xsl:messageindex.titlepage.recto
-
- <!-- Moved generation of title to make-index to span over -->
-
+
+
+
xsl:choose