rpms/docbook-utils/devel docbook-utils.spec,1.26,1.27
Ondrej Vasik (ovasik)
fedora-extras-commits at redhat.com
Mon Nov 5 17:48:18 UTC 2007
Author: ovasik
Update of /cvs/extras/rpms/docbook-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11326
Modified Files:
docbook-utils.spec
Log Message:
merge review(#225705), spec cleanup to follow guidelines
Index: docbook-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/docbook-utils/devel/docbook-utils.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- docbook-utils.spec 1 Nov 2007 13:46:54 -0000 1.26
+++ docbook-utils.spec 5 Nov 2007 17:47:44 -0000 1.27
@@ -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: 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 @@
%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 @@
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 @@
%files
-%defattr (-,root,root)
+%defattr (-,root,root,-)
%doc README COPYING TODO
%{_bindir}/jw
%{_bindir}/docbook2html
@@ -92,7 +92,7 @@
%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 @@
%{_mandir}/*/*-spec.*
%files pdf
-%defattr (-,root,root)
+%defattr (-,root,root,-)
%{_bindir}/docbook2pdf
%{_bindir}/docbook2dvi
%{_bindir}/docbook2ps
@@ -120,6 +120,10 @@
%{_mandir}/*/docbook2ps.*
%changelog
+* Tue Nov 05 2007 Ondrej Vasik <ovasik at redhat.com> 0.6.14-12
+- Merge Review(#225705)
+- corrected some other packaging guidelines issues
+
* Thu Nov 01 2007 Ondrej Vasik <ovasik at redhat.com> 0.6.14-11
- rpmlint check
- fixed: dist tag, summary ended with dot, license tag,
More information about the fedora-extras-commits
mailing list