From 05a525806b523c46ca0818f4c4e56b6447bbb087 Mon Sep 17 00:00:00 2001
From: Daniel Veillard <veillard@fedoraproject.org>
Date: Sun, 13 Mar 2005 18:47:30 +0000
Subject: [PATCH] Upstream release of 2.6.18, Daniel

---
 .cvsignore   |  1 +
 libxml2.spec | 16 +++++-----------
 sources      |  1 +
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 8b9cb9c..b4696a6 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -3,3 +3,4 @@ libxml2-2.6.14.tar.gz
 libxml2-2.6.15.tar.gz
 libxml2-2.6.16.tar.gz
 libxml2-2.6.17.tar.gz
+libxml2-2.6.18.tar.gz
diff --git a/libxml2.spec b/libxml2.spec
index a56f4ef..d15f6bf 100644
--- a/libxml2.spec
+++ b/libxml2.spec
@@ -1,7 +1,7 @@
 Summary: Library providing XML and HTML support
 Name: libxml2
-Version: 2.6.17
-Release: 6
+Version: 2.6.18
+Release: 1
 License: MIT
 Group: Development/Libraries
 Source: ftp://xmlsoft.org/libxml2-%{version}.tar.gz
@@ -10,7 +10,6 @@ BuildRequires: python python-devel zlib-devel
 URL: http://xmlsoft.org/
 Prefix: %{_prefix}
 Docdir: %{_docdir}
-Patch0: gcc4.patch
 
 %description
 This library allows to manipulate XML files. It includes support 
@@ -59,7 +58,6 @@ at parse time or later once the document has been modified.
 
 %prep
 %setup -q
-%patch0 -p0
 
 %build
 #
@@ -67,7 +65,7 @@ at parse time or later once the document has been modified.
 # initial test spec. This really doesn't work okay for most tests done.
 #
 GCC_VERSION=`gcc --version | grep "^gcc" | awk '{ print $3 }' | sed 's+\([0-9]\)\.\([0-9]\)\..*+\1\2+'`
-if [ $GCC_VERSION -eq 34 ]
+if [ $GCC_VERSION -ge 34 ]
 then
     PROF_GEN='-fprofile-generate'
     PROF_USE='-fprofile-use'
@@ -150,12 +148,8 @@ rm -fr %{buildroot}
 %doc doc/python.html
 
 %changelog
-* Wed Mar  2 2005 Daniel Veillard <veillard@redhat.com> 2.6.17-6
-- fix for the aliasing error breaking up on s390 and gcc4
-* Wed Mar  2 2005 Daniel Veillard <veillard@redhat.com> 2.6.17-5
-- rebuilt for gcc4
-* Sun Jan 16 2005 Daniel Veillard <veillard@redhat.com>
-- upstream release 2.6.17 see http://xmlsoft.org/news.html
+* Sun Mar 13 2005 Daniel Veillard <veillard@redhat.com>
+- upstream release 2.6.18 see http://xmlsoft.org/news.html
 
 * Thu Jan  2 2003 Daniel Veillard <veillard@redhat.com>
 - integrated drv_libxml2 xml.sax driver from Stéphane Bidoul
diff --git a/sources b/sources
index e0932e9..f597300 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
 a678d37e68d98788ef51b6f913cdc868  libxml2-2.6.17.tar.gz
+ee5c76a8be34772ccec3f566dc154936  libxml2-2.6.18.tar.gz