rpms/sgml-common/devel sgml-common.spec, 1.29, 1.30 sgml-common-0.6.3-docdir.patch, 1.2, NONE sgml-common-automake.patch, 1.3, NONE

[Ondrej Vasik]

Author: ovasik

Update of /cvs/pkgs/rpms/sgml-common/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29119

Modified Files:
	sgml-common.spec 
Removed Files:
	sgml-common-0.6.3-docdir.patch sgml-common-automake.patch 
Log Message:
 Merge review #226415: remove unapplied patches, remove versioned BR


Index: sgml-common.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sgml-common/devel/sgml-common.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- sgml-common.spec	11 Nov 2009 11:20:02 -0000	1.29
+++ sgml-common.spec	15 Jan 2010 13:37:50 -0000	1.30
@@ -1,6 +1,6 @@
 Name: sgml-common
 Version: 0.6.3
-Release: 31%{?dist}
+Release: 32%{?dist}
 Group: Applications/Text
 
 Summary: Common SGML catalog and DTD files
@@ -25,10 +25,8 @@ Source4: html.soc
 Patch0: sgml-common-umask.patch
 Patch1: sgml-common-xmldir.patch
 Patch2: sgml-common-quotes.patch
-Patch3: sgml-common-automake.patch
-Patch4: sgml-common-0.6.3-docdir.patch
 
-BuildRequires: libxml2 >= 2.4.8-2
+BuildRequires: libxml2
 BuildRequires: automake14
 Requires: /bin/basename
 
@@ -53,10 +51,6 @@ but that don't need to be included in ma
 %patch0 -p1 -b .umask
 %patch1 -p1 -b .xmldir
 %patch2 -p1 -b .quotes
-#patch 3 and patch4 not applied but still shipped with SRPM
-#(see #226415 MergeReview)
-#%patch3 -p1 -b .automake
-#%patch4 -p1 -b .docdir
 
 # replace bogus links with files
 for file in COPYING INSTALL install-sh missing mkinstalldirs; do
@@ -144,6 +138,10 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_datadir}/xml
 
 %changelog
+* Fri Jan 14 2010 Ondrej Vasik <ovasik at redhat.com> 0.6.3-32
+- Merge review #226415: remove unapplied patches, remove
+  versioned BR
+
 * Wed Nov 11 2009 Ondrej Vasik <ovasik at redhat.com> 0.6.3-31
 - apply quotes patch once again (accidently deleted in Nov07-#533058)
 


--- sgml-common-0.6.3-docdir.patch DELETED ---


--- sgml-common-automake.patch DELETED ---