docs-common/bin fdp-functions,1.1,1.2 insert-changelog,1.3,1.4

[Paul W. Frields (pfrields)]

Author: pfrields

Update of /cvs/docs/docs-common/bin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28296/docs-common/bin

Modified Files:
	fdp-functions insert-changelog 
Log Message:
Use xmlformat-fdp.conf options properly in functions


Index: fdp-functions
===================================================================
RCS file: /cvs/docs/docs-common/bin/fdp-functions,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fdp-functions	15 Jan 2006 22:32:26 -0000	1.1
+++ fdp-functions	15 Jan 2006 23:26:25 -0000	1.2
@@ -9,7 +9,9 @@
 FDPPKGDIR="${FDPDIR}/docs-common/packaging"
 RPMINFO=${RPMINFO:-"rpm-info.xml"}
 XSLTPROC=${XSLTPROC:-xsltproc}
-XMLFORMAT=${XMLFORMAT:-"${FDPBINDIR}/xmlformat" -f "${FDPBINDIR}/xmlformat-fdp.conf"}
+XMLFORMAT=${XMLFORMAT:-"${FDPBINDIR}/xmlformat"}
+XMLFOPTS=${XMLFOPTS:-"-f ${FDPBINDIR}/xmlformat-fdp.conf"}
+
 
 get_all_workers()
 {


Index: insert-changelog
===================================================================
RCS file: /cvs/docs/docs-common/bin/insert-changelog,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- insert-changelog	15 Jan 2006 22:57:40 -0000	1.3
+++ insert-changelog	15 Jan 2006 23:26:25 -0000	1.4
@@ -5,7 +5,6 @@
 
 . "$(dirname $0)/fdp-functions"
 
-RPMINFO="rpm-info.xml"
 OUTPUT="${1:-${PWD}/$RPMINFO.clog$$}"
 
 echo -n "Change to [r]pm package or [d]ocument source? [r/D] "
@@ -62,5 +61,5 @@
     --stringparam date "$REVDATE" \
     --stringparam detail "$DETAILS" \
     ../docs-common/packaging/insert-changelog.xsl "$RPMINFO" | \
-    ${XMLFORMAT} > ${OUTPUT}
+    ${XMLFORMAT} ${XMLFOPTS} > ${OUTPUT}
 echo "New $RPMINFO written to $OUTPUT"