rpms/docbook-dtds/devel docbook-dtds.spec,1.35,1.36

[Ondrej Vasik]

Author: ovasik

Update of /cvs/pkgs/rpms/docbook-dtds/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27935

Modified Files:
	docbook-dtds.spec 
Log Message:
fix Merge Review comments (#225700) - unversion requires,  fix buildroot


Index: docbook-dtds.spec
===================================================================
RCS file: /cvs/pkgs/rpms/docbook-dtds/devel/docbook-dtds.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- docbook-dtds.spec	17 Dec 2009 15:01:06 -0000	1.35
+++ docbook-dtds.spec	3 Mar 2010 15:59:04 -0000	1.36
@@ -3,7 +3,7 @@
 
 Name: docbook-dtds
 Version: 1.0
-Release: 50%{?dist}
+Release: 51%{?dist}
 Group: Applications/Text
 
 Summary: SGML and XML document type definitions for DocBook
@@ -33,21 +33,13 @@ Provides: docbook-dtd44-xml = %{version}
 Provides: docbook-dtd45-sgml = %{version}-%{release}
 Provides: docbook-dtd45-xml = %{version}-%{release}
 
-Requires(post): libxml2 >= 2.4.8
-Requires(postun): libxml2 >= 2.4.8
-# If upgrading, the old package's postun scriptlet may use install-catalog
-# to remove its entries.  xmlcatalog (which this package uses) adds quotes
-# to the catalog files, and install-catalog only handles this in 0.6.3-4 or
-# later.
+Requires(post): libxml2
+Requires(postun): libxml2
 Requires(post): /bin/chmod
-Requires: sgml-common >= 0.6.3-4
-# We provide the directory layout expected by 0.6.3-5 or later of
-# xml-common.  Earlier versions won't understand. Additionally
-# require xml-common >= 0.6.3-24 to workaround issue with F9
-# install+update and empty xmlcatalog
-Requires: xml-common >= 0.6.3-24
+Requires: sgml-common
+Requires: xml-common
 
-BuildRoot: %{_tmppath}/%{name}-%{version}
+BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildArch: noarch
 Source0: http://www.oasis-open.org/docbook/sgml/3.0/docbk30.zip
@@ -92,25 +84,25 @@ eval mkdir %{version_list}
 # DocBook V3.0
 cd 3.0-sgml
 unzip %{SOURCE0}
-patch -b docbook.cat %{PATCH0}
+%patch0 -p0 -b docbook.cat
 cd ..
 
 # DocBook V3.1
 cd 3.1-sgml
 unzip %{SOURCE1}
-patch -b docbook.cat %{PATCH1}
+%patch1 -p0 -b docbook.cat
 cd ..
 
 # DocBook V4.0
 cd 4.0-sgml
 unzip %{SOURCE2}
-patch -b docbook.cat %{PATCH2}
+%patch2 -p0 -b docbook.cat
 cd ..
 
 # DocBook V4.1
 cd 4.1-sgml
 unzip %{SOURCE3}
-patch -b docbook.cat %{PATCH3}
+%patch3 -p0 -b docbook.cat
 cd ..
 
 # DocBook XML V4.1.2
@@ -121,7 +113,7 @@ cd ..
 # DocBook V4.2
 cd 4.2-sgml
 unzip %{SOURCE5}
-patch -b docbook.cat %{PATCH4}
+%patch4 -p0 -b docbook.cat
 cd ..
 
 # DocBook XML V4.2
@@ -408,6 +400,10 @@ do
 done
 
 %changelog
+* Wed Mar 03 2010 Ondrej Vasik <ovasik at redhat.com> - 1.0-51
+- fix Merge Review comments (#225700) - unversion requires,
+  fix buildroot
+
 * Thu Dec 17 2009 Ondrej Vasik <ovasik at redhat.com> - 1.0-50
 - comment patches
 - License: Copyright only