From 0d21fbf125008ab571454d553cd32f5fca3ee6ed Mon Sep 17 00:00:00 2001
From: Ondrej Vasik <ovasik@fedoraproject.org>
Date: Mon, 5 Nov 2007 17:47:44 +0000
Subject: [PATCH] merge review(#225705), spec cleanup to follow guidelines

---
 docbook-utils.spec | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/docbook-utils.spec b/docbook-utils.spec
index eb84ad5..4a0b23b 100644
--- a/docbook-utils.spec
+++ b/docbook-utils.spec
@@ -1,6 +1,6 @@
 Name: docbook-utils
 Version: 0.6.14
-Release: 11%{?dist}
+Release: 12%{?dist}
 Group: Applications/Text
 
 Summary: Shell scripts for managing DocBook documents
@@ -14,7 +14,7 @@ Requires: perl-SGMLSpm >= 1.03ii
 Requires: which
 Requires: text-www-browser
 
-BuildRoot: %{_tmppath}/%{name}-%{version}
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: perl-SGMLSpm, openjade, docbook-style-dsssl
 
 BuildArch: noarch
@@ -57,11 +57,11 @@ PDF format.
 
 %build
 ./configure --prefix=%{_prefix} --mandir=%{_mandir} --libdir=%{_libdir}
-make
+make %{?_smp_mflags}
 
 %install
 export DESTDIR=$RPM_BUILD_ROOT
-rm -rf $DESTDIR
+rm -rf $RPM_BUILD_ROOT
 make install prefix=%{_prefix} mandir=%{_mandir} docdir=/tmp
 for util in dvi html pdf ps rtf
 do
@@ -70,8 +70,8 @@ do
 done
 # db2html is not just a symlink, as it has to create the output directory
 rm -f $RPM_BUILD_ROOT%{_bindir}/db2html
-install -c -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/db2html
-install -c -m 644 %{SOURCE2} $RPM_BUILD_ROOT/usr/share/sgml/docbook/utils-%{version}/docbook-utils.dsl
+install -p -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/db2html
+install -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/sgml/docbook/utils-%{version}/docbook-utils.dsl
 
 rm -rf $RPM_BUILD_ROOT/tmp
 
@@ -80,7 +80,7 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %files
-%defattr (-,root,root)
+%defattr (-,root,root,-)
 %doc README COPYING TODO
 %{_bindir}/jw
 %{_bindir}/docbook2html
@@ -92,7 +92,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(0755,root,root) %{_bindir}/db2html
 %{_bindir}/db2rtf
 %{_bindir}/sgmldiff
-/usr/share/sgml/docbook/utils-%{version}
+%{_datadir}/sgml/docbook/utils-%{version}
 %{_mandir}/*/db2dvi.*
 %{_mandir}/*/db2html.*
 %{_mandir}/*/db2ps.*
@@ -107,7 +107,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/*/*-spec.*
 
 %files pdf
-%defattr (-,root,root)
+%defattr (-,root,root,-)
 %{_bindir}/docbook2pdf
 %{_bindir}/docbook2dvi
 %{_bindir}/docbook2ps
@@ -120,6 +120,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/*/docbook2ps.*
 
 %changelog 
+* Tue Nov 05 2007 Ondrej Vasik <ovasik@redhat.com> 0.6.14-12
+- Merge Review(#225705)
+- corrected some other packaging guidelines issues
+
 * Thu Nov 01 2007 Ondrej Vasik <ovasik@redhat.com> 0.6.14-11
 - rpmlint check
 - fixed: dist tag, summary ended with dot, license tag,