[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

rpms/docbook-utils/F-7 docbook-utils-2ndspaces.patch, NONE, 1.1 docbook-utils.spec, 1.22, 1.23



Author: ovasik

Update of /cvs/extras/rpms/docbook-utils/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28348/F-7

Modified Files:
	docbook-utils.spec 
Added Files:
	docbook-utils-2ndspaces.patch 
Log Message:
patch from upstream - another spaces in directory name fix

docbook-utils-2ndspaces.patch:

--- NEW FILE docbook-utils-2ndspaces.patch ---
--- Original/backends/dvi	2003-01-13 18:14:10.000000000 +0100
+++ Changes/backends/dvi	2007-05-21 14:10:42.000000000 +0200
@@ -6,31 +6,31 @@
 export TEXINPUTS
 
 # Convert to TeX
-$SGML_JADE -t tex -o ${SGML_FILE_NAME}.tex $SGML_ARGUMENTS
+$SGML_JADE -t tex -o "${SGML_FILE_NAME}.tex" $SGML_ARGUMENTS "$SGML_FILE"
 if [ $? -ne 0 ]
 then exit 1
 fi
 
 # Convert from TeX to DVI
-jadetex ${SGML_FILE_NAME}.tex >${SGML_FILE_NAME}.tmp
+jadetex "${SGML_FILE_NAME}.tex" > "${SGML_FILE_NAME}.tmp"
 if [ $? -ne 0 ]
 then
-  cat ${SGML_FILE_NAME}.tmp
-  rm ${SGML_FILE_NAME}.tmp
-  rm ${SGML_FILE_NAME}.tex
+  cat "${SGML_FILE_NAME}.tmp"
+  rm "${SGML_FILE_NAME}.tmp"
+  rm "${SGML_FILE_NAME}.tex"
   exit 2
 fi
-rm ${SGML_FILE_NAME}.tmp
+rm "${SGML_FILE_NAME}.tmp"
 
 # If there are unresolved references, re-run jadetex, twice 
-if egrep '^LaTeX Warning: There were undefined references.$' ${SGML_FILE_NAME}.log >/dev/null 2>&1
+if egrep '^LaTeX Warning: There were undefined references.$' "${SGML_FILE_NAME}.log" >/dev/null 2>&1
 then
-    jadetex ${SGML_FILE_NAME}.tex >/dev/null
-    jadetex ${SGML_FILE_NAME}.tex >/dev/null
+    jadetex "${SGML_FILE_NAME}.tex" >/dev/null
+    jadetex "${SGML_FILE_NAME}.tex" >/dev/null
 fi
-rm ${SGML_FILE_NAME}.log
-rm ${SGML_FILE_NAME}.aux
-rm ${SGML_FILE_NAME}.tex
-rm ${SGML_FILE_NAME}.out
+rm "${SGML_FILE_NAME}.log"
+rm "${SGML_FILE_NAME}.aux"
+rm "${SGML_FILE_NAME}.tex"
+rm "${SGML_FILE_NAME}.out"
 
 exit 0
--- Original/backends/html	2000-07-21 20:15:22.000000000 +0200
+++ Changes/backends/html	2007-05-21 14:11:32.000000000 +0200
@@ -3,7 +3,7 @@
 # This program is under GPL license. See LICENSE file for details.
 
 # Convert to HTML
-$SGML_JADE -t sgml $SGML_ARGUMENTS
+$SGML_JADE -t sgml $SGML_ARGUMENTS "$SGML_FILE"
 if [ $? -ne 0 ]
 then exit 1
 fi
--- Original/backends/pdf	2003-03-17 18:47:11.000000000 +0100
+++ Changes/backends/pdf	2007-05-21 14:13:58.000000000 +0200
@@ -6,26 +6,26 @@
 export TEXINPUTS
 
 # Convert to TeX
-$SGML_JADE -t tex -o ${SGML_FILE_NAME}.tex $SGML_ARGUMENTS
+$SGML_JADE -t tex -o "${SGML_FILE_NAME}.tex" $SGML_ARGUMENTS "$SGML_FILE"
 if [ $? -ne 0 ]
 then exit 1
 fi
 
 # Convert from TeX to PDF
-pdfjadetex ${SGML_FILE_NAME}.tex >${SGML_FILE_NAME}.tmp
+pdfjadetex "${SGML_FILE_NAME}.tex" > "${SGML_FILE_NAME}.tmp"
 if [ $? -ne 0 ]
 then
-  cat ${SGML_FILE_NAME}.tmp
-  rm ${SGML_FILE_NAME}.tmp
-  rm ${SGML_FILE_NAME}.tex
+  cat "${SGML_FILE_NAME}.tmp"
+  rm "${SGML_FILE_NAME}.tmp"
+  rm "${SGML_FILE_NAME}.tex"
   exit 2
 fi
-rm ${SGML_FILE_NAME}.tmp
+rm "${SGML_FILE_NAME}.tmp"
 
 # Unconditionally re-run pdfjadetex, twice 
-pdfjadetex ${SGML_FILE_NAME}.tex >/dev/null
-pdfjadetex ${SGML_FILE_NAME}.tex >/dev/null
-rm -f ${SGML_FILE_NAME}.log ${SGML_FILE_NAME}.aux \
-      ${SGML_FILE_NAME}.tex ${SGML_FILE_NAME}.out
+pdfjadetex "${SGML_FILE_NAME}.tex" >/dev/null
+pdfjadetex "${SGML_FILE_NAME}.tex" >/dev/null
+rm -f "${SGML_FILE_NAME}.log" "${SGML_FILE_NAME}.aux" \
+      "${SGML_FILE_NAME}.tex" "${SGML_FILE_NAME}.out"
 
 exit 0
--- Original/backends/ps	2003-03-17 18:51:48.000000000 +0100
+++ Changes/backends/ps	2007-05-21 14:16:51.000000000 +0200
@@ -6,30 +6,30 @@
 export TEXINPUTS
 
 # Convert to TeX
-$SGML_JADE -t tex -o ${SGML_FILE_NAME}.tex $SGML_ARGUMENTS
+$SGML_JADE -t tex -o "${SGML_FILE_NAME}.tex" $SGML_ARGUMENTS "$SGML_FILE"
 if [ $? -ne 0 ]
 then exit 1
 fi
 
 # Convert from TeX to DVI
-jadetex ${SGML_FILE_NAME}.tex >${SGML_FILE_NAME}.tmp
+jadetex "${SGML_FILE_NAME}.tex" > "${SGML_FILE_NAME}.tmp"
 if [ $? -ne 0 ]
 then
-  cat ${SGML_FILE_NAME}.tmp
-  rm ${SGML_FILE_NAME}.tmp
-  rm ${SGML_FILE_NAME}.tex
+  cat "${SGML_FILE_NAME}.tmp"
+  rm "${SGML_FILE_NAME}.tmp"
+  rm "${SGML_FILE_NAME}.tex"
   exit 2
 fi
-rm ${SGML_FILE_NAME}.tmp
+rm "${SGML_FILE_NAME}.tmp"
 
 # If there are unresolved references, re-run jadetex, twice 
-if egrep '^LaTeX Warning: There were undefined references.$' ${SGML_FILE_NAME}.log >/dev/null 2>&1
+if egrep '^LaTeX Warning: There were undefined references.$' "${SGML_FILE_NAME}.log" >/dev/null 2>&1
 then
-    jadetex ${SGML_FILE_NAME}.tex >/dev/null
-    jadetex ${SGML_FILE_NAME}.tex >/dev/null
+    jadetex "${SGML_FILE_NAME}.tex" >/dev/null
+    jadetex "${SGML_FILE_NAME}.tex" >/dev/null
 fi
-rm -f ${SGML_FILE_NAME}.log ${SGML_FILE_NAME}.aux \
-	${SGML_FILE_NAME}.tex ${SGML_FILE_NAME}.out
+rm -f "${SGML_FILE_NAME}.log" "${SGML_FILE_NAME}.aux" \
+	"${SGML_FILE_NAME}.tex" "${SGML_FILE_NAME}.out"
 
 # Convert from DVI to PostScript
 PAPERSIZE="-t letter"
@@ -38,12 +38,12 @@
   PAPERSIZE="-t a4"
 fi
 
-dvips -R -q $PAPERSIZE ${SGML_FILE_NAME}.dvi -o ${SGML_FILE_NAME}.ps
+dvips -R -q $PAPERSIZE "${SGML_FILE_NAME}.dvi" -o "${SGML_FILE_NAME}.ps"
 if [ $? -ne 0 ]
 then
-  rm ${SGML_FILE_NAME}.dvi
+  rm "${SGML_FILE_NAME}.dvi"
   exit 3
 fi
-rm ${SGML_FILE_NAME}.dvi
+rm "${SGML_FILE_NAME}.dvi"
 
 exit 0
--- Original/backends/rtf	2000-07-21 20:15:22.000000000 +0200
+++ Changes/backends/rtf	2007-05-21 14:18:37.000000000 +0200
@@ -3,7 +3,7 @@
 # This program is under GPL license. See LICENSE file for details.
 
 # Convert to RTF
-$SGML_JADE -t rtf -o ${SGML_FILE_NAME}.rtf $SGML_ARGUMENTS
+$SGML_JADE -t rtf -o "${SGML_FILE_NAME}.rtf" $SGML_ARGUMENTS "$SGML_FILE"
 if [ $? -ne 0 ]
 then exit 1
 fi
--- Original/backends/tex	2000-07-21 20:15:22.000000000 +0200
+++ Changes/backends/tex	2007-05-21 14:21:12.000000000 +0200
@@ -3,7 +3,7 @@
 # This program is under GPL license. See LICENSE file for details.
 
 # Convert to TeX
-$SGML_JADE -t tex -o ${SGML_FILE_NAME}.tex $SGML_ARGUMENTS
+$SGML_JADE -t tex -o "${SGML_FILE_NAME}.tex" $SGML_ARGUMENTS "$SGML_FILE"
 if [ $? -ne 0 ]
 then exit 1
 fi
--- Original/backends/txt	2004-02-11 14:58:03.000000000 +0100
+++ Changes/backends/txt	2007-05-21 14:22:33.000000000 +0200
@@ -23,7 +23,7 @@
 trap 'rm -f "$HTML"; exit' 0 1 2 3 7 13 15
 
 # Convert to HTML
-$SGML_JADE -V nochunks -t sgml ${SGML_ARGUMENTS} >${HTML}
+$SGML_JADE -V nochunks -t sgml ${SGML_ARGUMENTS} "$SGML_FILE" >${HTML}
 if [ $? -ne 0 ]
 then exit 1
 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
@@ -270,14 +270,14 @@
   echo -e $SGML_HELP_MESSAGE >&2
   exit 1
 fi
-if [ ! -s $SGML_FILE ]
+if [ ! -s "$SGML_FILE" ]
 then
   echo "`basename $0`: Cannot open \"$SGML_FILE\"." >&2
   exit 3
 fi
 
 # Separate the file name and the extension (if any)
-SGML_FILE_NAME=`basename $SGML_FILE`
+SGML_FILE_NAME=`basename "$SGML_FILE"`
 SGML_FILE_NAME=${SGML_FILE_NAME%.*}
 
 # Determine if we are in an XML file
@@ -416,7 +416,7 @@
 fi
 
 # Prepare the parser's arguments
-SGML_ARGUMENTS="$SGML_INCLUDE -i $SGML_TYPE -d $SGML_STYLESHEET $SGML_OPTIONS $SGML_WARNINGS $SGML_DECL $SGML_FILE"
+SGML_ARGUMENTS="$SGML_INCLUDE -i $SGML_TYPE -d $SGML_STYLESHEET $SGML_OPTIONS $SGML_WARNINGS $SGML_DECL"
 
 # Call the backend
 echo "Using catalogs: `echo $SGML_CATALOG_FILES | sed 's/:/, /g'`"
@@ -430,7 +430,7 @@
 then
 	sh $SGML_BACKEND
 else
-	sh $SGML_BACKEND >$SGML_FILE_NAME.html
+	sh $SGML_BACKEND >"$SGML_FILE_NAME.html"
 fi
 SGML_RETURN=$?
 cd "$SGML_CURRENT_DIRECTORY"


Index: docbook-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/docbook-utils/F-7/docbook-utils.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- docbook-utils.spec	24 Apr 2007 14:49:26 -0000	1.22
+++ docbook-utils.spec	24 May 2007 11:02:53 -0000	1.23
@@ -1,6 +1,6 @@
 Name: docbook-utils
 Version: 0.6.14
-Release: 7%{?dist}
+Release: 8%{?dist}
 Group: Applications/Text
 
 Summary: Shell scripts for managing DocBook documents.
@@ -27,6 +27,7 @@
 
 Patch0: docbook-utils-spaces.patch
 Patch1: docbook-utils-funcsynopsis.patch
+Patch2: docbook-utils-2ndspaces.patch
 
 %Description
 This package contains scripts are for easy conversion from DocBook
@@ -51,6 +52,7 @@
 %setup -q
 %patch0 -p1 -b .spaces
 %patch1 -p1 -b .0
+%patch2 -p1 -b .2ndspaces
 
 %build
 ./configure --prefix=%{_prefix} --mandir=%{_mandir}
@@ -118,6 +120,11 @@
 %{_mandir}/*/docbook2ps.*
 
 %changelog
+* Mon May 21 2007 Ondrej Vasik <ovasik redhat com> 0.6.14-8
+- Added more fixes for handling spaces in directory name
+- SGML_FILE variable is factored out of SGML_ARGUMENTS
+- (changes taken from upstream)
+
 * Tue Apr 24 2007 Petr Mejzlik <pmejzlik redhat com> 0.6.14-7
 - add missing dist tag, bump release
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]