rpms/docbook-utils/F-10 docbook-utils-papersize.patch, NONE, 1.1 docbook-utils-rtfmanpage.patch, NONE, 1.1 docbook-utils-sgmlinclude.patch, NONE, 1.1 docbook-utils-2ndspaces.patch, 1.1, 1.2 docbook-utils.spec, 1.30, 1.31 docbook2man-spec.pl, 1.1, 1.2
Ondrej Vasik
ovasik at fedoraproject.org
Mon Oct 12 09:41:52 UTC 2009
Author: ovasik
Update of /cvs/extras/rpms/docbook-utils/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30458
Modified Files:
docbook-utils-2ndspaces.patch docbook-utils.spec
docbook2man-spec.pl
Added Files:
docbook-utils-papersize.patch docbook-utils-rtfmanpage.patch
docbook-utils-sgmlinclude.patch
Log Message:
Cumulative update from Rawhide
docbook-utils-papersize.patch:
jw.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE docbook-utils-papersize.patch ---
diff -urNp docbook-utils-0.6.14-orig/bin/jw.in docbook-utils-0.6.14/bin/jw.in
--- docbook-utils-0.6.14-orig/bin/jw.in 2009-10-07 14:41:19.000000000 +0200
+++ docbook-utils-0.6.14/bin/jw.in 2009-10-07 14:45:22.000000000 +0200
@@ -368,7 +368,7 @@ case "$SGML_OPTIONS" in
fi
if [ -n "$papersize" ]
then
- SGML_OPTIONS="-V paper-type=$papersize $SGML_OPTIONS"
+ SGML_OPTIONS="-V %paper-type%=$papersize $SGML_OPTIONS"
fi
;;
esac
docbook-utils-rtfmanpage.patch:
jw.1 | 5 +++++
1 file changed, 5 insertions(+)
--- NEW FILE docbook-utils-rtfmanpage.patch ---
diff -urNp docbook-utils-0.6.14-orig/doc/man/jw.1 docbook-utils-0.6.14/doc/man/jw.1
--- docbook-utils-0.6.14-orig/doc/man/jw.1 2004-02-11 15:16:21.000000000 +0100
+++ docbook-utils-0.6.14/doc/man/jw.1 2009-08-13 10:44:03.000000000 +0200
@@ -192,6 +192,11 @@ by calling \fBJade\fR or
\fBOpenJade\fR\&. The resulting file can
then be inported into \fBMS Word\fR
or one of its Linux replacement programs.
+
+\fBNote\fR - The original picture must be
+present when RTF document is viewed, because
+the RTF documents created by \fBOpenJade\fR
+includes pictures by reference.
.TP
\fB\fItex\fB\fR
Converts to TeX by calling \fBJade\fR or
docbook-utils-sgmlinclude.patch:
backends/man.in | 2 +-
bin/jw.in | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
--- NEW FILE docbook-utils-sgmlinclude.patch ---
diff -urNp docbook-utils-0.6.14-orig/backends/man.in docbook-utils-0.6.14/backends/man.in
--- docbook-utils-0.6.14-orig/backends/man.in 2009-07-24 15:17:42.000000000 +0200
+++ docbook-utils-0.6.14/backends/man.in 2009-07-24 15:20:57.000000000 +0200
@@ -7,7 +7,7 @@ HELPER=$SGML_BASE_DIR/docbook/utils- at VER
TMPDIR=`mktemp -d /tmp/man.XXXXXX` || \
{ echo >&2 "man backend: could not create secure temporary directory"; exit 1;}
trap 'rm -rf "${TMPDIR}"' EXIT
-nsgmls "$SGML_FILE" > "${TMPDIR}/nsgmls.tmp"
+nsgmls "$SGML_INCLUDE" "$SGML_FILE" > "${TMPDIR}/nsgmls.tmp"
sgmlspl $HELPER <"${TMPDIR}/nsgmls.tmp" 2>"${TMPDIR}/errs"
if [ $? -ne 0 ]
then
diff -urNp docbook-utils-0.6.14-orig/bin/jw.in docbook-utils-0.6.14/bin/jw.in
--- docbook-utils-0.6.14-orig/bin/jw.in 2009-07-24 15:17:42.000000000 +0200
+++ docbook-utils-0.6.14/bin/jw.in 2009-07-24 15:18:51.000000000 +0200
@@ -423,7 +423,7 @@ echo "Using catalogs: `echo $SGML_CATALO
echo "Using stylesheet: $SGML_STYLESHEET"
echo "Working on: $SGML_FILE"
cd "$SGML_OUTPUT_DIRECTORY"
-export SGML_JADE SGML_FILE_NAME SGML_ARGUMENTS
+export SGML_JADE SGML_FILE_NAME SGML_ARGUMENTS SGML_INCLUDE
export SGML_CATALOG_FILES SGML_BASE_DIR SGML_FILE SGML_STYLESHEET
NOCHUNKS=`echo $SGML_OPTIONS | grep nochunks`
if [ -z "$NOCHUNKS" ]
docbook-utils-2ndspaces.patch:
backends/dvi | 26 +++++++++++++-------------
backends/html | 2 +-
backends/pdf | 20 ++++++++++----------
backends/ps | 28 ++++++++++++++--------------
backends/rtf | 2 +-
backends/tex | 2 +-
backends/txt | 2 +-
bin/jw.in | 10 +++++-----
docbook-utils-0.6.14/backends/man.in | 2 +-
docbook-utils-0.6.14/backends/texi.in | 2 +-
10 files changed, 48 insertions(+), 48 deletions(-)
Index: docbook-utils-2ndspaces.patch
===================================================================
RCS file: /cvs/extras/rpms/docbook-utils/F-10/docbook-utils-2ndspaces.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- docbook-utils-2ndspaces.patch 24 May 2007 11:02:58 -0000 1.1
+++ docbook-utils-2ndspaces.patch 12 Oct 2009 09:41:51 -0000 1.2
@@ -190,6 +190,15 @@
fi
--- Original/bin/jw.in 2003-04-30 18:21:49.000000000 +0200
+++ Changes/bin/jw.in 2007-05-21 14:28:58.000000000 +0200
+@@ -246,7 +246,7 @@ then
+ echo -e $SGML_HELP_MESSAGE >&2
+ exit 1
+ fi
+-if [ ! -s $SGML_FRONTEND ]
++if [ ! -s "$SGML_FRONTEND" ]
+ then
+ echo "`basename $0`: There is no frontend called \"$SGML_FRONTEND\"." >&2
+ exit 2
@@ -270,14 +270,14 @@
echo -e $SGML_HELP_MESSAGE >&2
exit 1
@@ -225,3 +234,27 @@
fi
SGML_RETURN=$?
cd "$SGML_CURRENT_DIRECTORY"
+diff -urNp docbook-utils-0.6.14-orig/backends/man.in docbook-utils-0.6.14/backends/man.in
+--- docbook-utils-0.6.14-orig/backends/man.in 2003-02-11 13:56:23.000000000 +0100
++++ docbook-utils-0.6.14/backends/man.in 2009-07-24 15:07:04.000000000 +0200
+@@ -7,7 +7,7 @@ HELPER=$SGML_BASE_DIR/docbook/utils- at VER
+ TMPDIR=`mktemp -d /tmp/man.XXXXXX` || \
+ { echo >&2 "man backend: could not create secure temporary directory"; exit 1;}
+ trap 'rm -rf "${TMPDIR}"' EXIT
+-nsgmls $SGML_FILE > "${TMPDIR}/nsgmls.tmp"
++nsgmls "$SGML_FILE" > "${TMPDIR}/nsgmls.tmp"
+ sgmlspl $HELPER <"${TMPDIR}/nsgmls.tmp" 2>"${TMPDIR}/errs"
+ if [ $? -ne 0 ]
+ then
+diff -urNp docbook-utils-0.6.14-orig/backends/texi.in docbook-utils-0.6.14/backends/texi.in
+--- docbook-utils-0.6.14-orig/backends/texi.in 2002-08-05 23:20:56.000000000 +0200
++++ docbook-utils-0.6.14/backends/texi.in 2009-07-24 15:08:02.000000000 +0200
+@@ -3,7 +3,7 @@
+ # This program is under GPL license. See LICENSE file for details.
+
+ # Convert to texinfo
+-nsgmls $SGML_FILE | sgmlspl $SGML_BASE_DIR/docbook/utils- at VERSION@/helpers/docbook2texi-spec.pl >$SGML_FILE_NAME.texi
++nsgmls "$SGML_FILE" | sgmlspl $SGML_BASE_DIR/docbook/utils- at VERSION@/helpers/docbook2texi-spec.pl >$SGML_FILE_NAME.texi
+ if [ $? -ne 0 ]
+ then exit 1
+ fi
Index: docbook-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/docbook-utils/F-10/docbook-utils.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- docbook-utils.spec 28 Nov 2008 10:51:40 -0000 1.30
+++ docbook-utils.spec 12 Oct 2009 09:41:51 -0000 1.31
@@ -1,10 +1,10 @@
Name: docbook-utils
Version: 0.6.14
-Release: 15%{?dist}
+Release: 16%{?dist}
Group: Applications/Text
Summary: Shell scripts for managing DocBook documents
-URL: ftp://sources.redhat.com/pub/docbook-tools/new-trials/
+URL: http://sources.redhat.com/docbook-tools/
License: GPLv2+
@@ -25,13 +25,16 @@ Source2: gdp-both.dsl
#You could check it at http://sourceforge.net/projects/docbook2x/
Source3: docbook2man-spec.pl
-Obsoletes: stylesheets <= %{version}-%{release}
+Obsoletes: stylesheets <= %{version}-%{release}
Provides: stylesheets = %{version}-%{release}
Patch0: docbook-utils-spaces.patch
Patch1: docbook-utils-2ndspaces.patch
Patch2: docbook-utils-w3mtxtconvert.patch
Patch3: docbook-utils-grepnocolors.patch
+Patch4: docbook-utils-sgmlinclude.patch
+Patch5: docbook-utils-rtfmanpage.patch
+Patch6: docbook-utils-papersize.patch
%description
This package contains scripts are for easy conversion from DocBook
@@ -41,13 +44,13 @@ for comparing SGML files.
%package pdf
Requires: jadetex >= 2.5
Requires: docbook-utils = %{version}
-Requires: tetex-dvips
+Requires: tex(dvips)
License: GPL+
Group: Applications/Text
Obsoletes: stylesheets-db2pdf <= %{version}-%{release}
Provides: stylesheets-db2pdf = %{version}-%{release}
Summary: A script for converting DocBook documents to PDF format
-URL: ftp://sources.redhat.com/pub/docbook-tools/new-trials/
+URL: http://sources.redhat.com/docbook-tools/
%description pdf
This package contains a script for converting DocBook documents to
@@ -59,6 +62,9 @@ PDF format.
%patch1 -p1 -b .2ndspaces
%patch2 -p1 -b .w3mtxtconvert
%patch3 -p1 -b .grepnocolors
+%patch4 -p1 -b .sgmlinclude
+%patch5 -p1 -b .rtfman
+%patch6 -p1 -b .papersize
%build
./configure --prefix=%{_prefix} --mandir=%{_mandir} --libdir=%{_libdir}
@@ -73,6 +79,7 @@ do
ln -s docbook2$util $RPM_BUILD_ROOT%{_bindir}/db2$util
ln -s jw.1.gz $RPM_BUILD_ROOT/%{_mandir}/man1/db2$util.1
done
+ln -s jw.1.gz $RPM_BUILD_ROOT/%{_mandir}/man1/docbook2txt.1
# db2html is not just a symlink, as it has to create the output directory
rm -f $RPM_BUILD_ROOT%{_bindir}/db2html
install -p -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/db2html
@@ -108,6 +115,7 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/*/docbook2man.*
%{_mandir}/*/docbook2tex.*
%{_mandir}/*/docbook2texi.*
+%{_mandir}/*/docbook2txt.*
%{_mandir}/*/jw.*
%{_mandir}/*/sgmldiff.*
%{_mandir}/*/*-spec.*
@@ -126,6 +134,17 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/*/docbook2ps.*
%changelog
+* Mon Oct 12 2009 Ondrej Vasik <ovasik at redhat.com> 0.6.14-17
+- fix locale-based papersize selection (#527395)
+- provide symlink manpage for docbook2txt
+- add note about openjade limitation in rtf section of jw
+ manpage(#516942)
+- another quoted variable fixes for spaces in filenames
+- use SGML_INCLUDE in man backend(upstream)
+- change upstream URL to something useful
+- escape dots and single quotes in column 1 in docbook2man-spec.pl
+- fix pdf subpackage requires(to match TeXLive2008 provides)
+
* Fri Nov 28 2008 Ondrej Vasik <ovasik at redhat.com> 0.6.14-15
- require grep,gawk, fix jw script to find SGML_BASE_DIR even
with grep with colors(#473278), finish funcsynopsis patch
Index: docbook2man-spec.pl
===================================================================
RCS file: /cvs/extras/rpms/docbook-utils/F-10/docbook2man-spec.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- docbook2man-spec.pl 8 Sep 2008 18:34:27 -0000 1.1
+++ docbook2man-spec.pl 12 Oct 2009 09:41:51 -0000 1.2
@@ -1499,6 +1499,11 @@ sgml('cdata', sub
# Escape backslashes
$_[0] =~ s/\\/\\\\/g;
+ # Escape dots and single quotes in column 1
+ $_[0] =~ s/^[ \t]*\./\\\&\./;
+ $_[0] =~ s/^[ \t]*\'/\\\&\'/;
+
+
# In non-'pre'-type elements:
if(!$nocollapse_whitespace) {
# Change tabs to spaces
More information about the fedora-extras-commits
mailing list