[docbook-utils/f16] fix the sgmlinclude patch (#797120)

[Ondrej Vasik]

commit 19a79978a8c8c24a5d3bc4e882bcbee0241ea0c5
Author: Ondřej Vašík <ovasik at redhat.com>
Date:   Wed Dec 12 08:12:11 2012 +0100

    fix the sgmlinclude patch (#797120)

 docbook-utils-sgmlinclude.patch |    2 +-
 docbook-utils.spec              |    9 ++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)
---
diff --git a/docbook-utils-sgmlinclude.patch b/docbook-utils-sgmlinclude.patch
index a4958e0..4275b6b 100644
--- a/docbook-utils-sgmlinclude.patch
+++ b/docbook-utils-sgmlinclude.patch
@@ -6,7 +6,7 @@ diff -urNp docbook-utils-0.6.14-orig/backends/man.in docbook-utils-0.6.14/backen
   { 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"
++nsgmls ${SGML_INCLUDE} "$SGML_FILE" > "${TMPDIR}/nsgmls.tmp"
  sgmlspl $HELPER <"${TMPDIR}/nsgmls.tmp" 2>"${TMPDIR}/errs"
  if [ $? -ne 0 ]
  then
diff --git a/docbook-utils.spec b/docbook-utils.spec
index 10fa6a9..3976466 100644
--- a/docbook-utils.spec
+++ b/docbook-utils.spec
@@ -1,6 +1,6 @@
 Name: docbook-utils
 Version: 0.6.14
-Release: 30%{?dist}
+Release: 31%{?dist}
 Group: Applications/Text
 
 Summary: Shell scripts for managing DocBook documents
@@ -14,7 +14,6 @@ Requires: perl-SGMLSpm >= 1.03ii
 Requires: which grep gawk
 Requires: text-www-browser
 
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: perl-SGMLSpm, openjade, docbook-style-dsssl
 
 BuildArch: noarch
@@ -76,7 +75,6 @@ make %{?_smp_mflags}
 
 %install
 export DESTDIR=$RPM_BUILD_ROOT
-rm -rf $RPM_BUILD_ROOT
 make install prefix=%{_prefix} mandir=%{_mandir} docdir=/tmp
 for util in dvi html pdf ps rtf
 do
@@ -93,8 +91,6 @@ install -p -m 755 %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/sgml/docbook/utils-%{ver
 rm -rf $RPM_BUILD_ROOT/tmp
 
 %clean
-rm -rf $RPM_BUILD_ROOT
-
 
 %files
 %defattr (-,root,root,-)
@@ -138,6 +134,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/*/docbook2ps.*
 
 %changelog
+* Wed Dec 12 2012 Ondrej Vasik <ovasik at redhat.com> 0.6.14-31
+- fix the sgmlinclude patch (#797120)
+
 * Wed May 30 2012 Ondrej Vasik <ovasik at redhat.com> 0.6.14-30
 - fix escaping of double-quotes in docbook2man (#826139)
 - fix the wrong format of C-style functions in docbook2man (#662869)