From 0491831084854f2cf65bccc42bf7c024c642c349 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@fedoraproject.org>
Date: Apr 06 2005 16:06:59 +0000
Subject: Update to 2.6.4


---

diff --git a/.cvsignore b/.cvsignore
index da055b2..b667a59 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -5,3 +5,4 @@ glib-2.6.0.tar.bz2
 glib-2.6.1.tar.bz2
 glib-2.6.2.tar.bz2
 glib-2.6.3.tar.bz2
+glib-2.6.4.tar.bz2
diff --git a/glib2.spec b/glib2.spec
index 85fd409..f9b6ce8 100644
--- a/glib2.spec
+++ b/glib2.spec
@@ -1,15 +1,12 @@
 Summary: A library of handy utility functions.
 Name: glib2
-Version: 2.6.3
-Release: 4
+Version: 2.6.4
+Release: 1
 License: LGPL
 Group: System Environment/Libraries
 Source: glib-%{version}.tar.bz2
 Source2: glib2.sh
 Source3: glib2.csh
-Patch0: glib-2.6.3-gcc4.patch
-# upstream in 2.6.4
-Patch1: glib-2.6.3-c++.patch
 Conflicts: libgnomeui <= 2.2.0
 BuildRoot: %{_tmppath}/glib-%{PACKAGE_VERSION}-root
 BuildRequires: pkgconfig >= 0.8
@@ -39,8 +36,6 @@ version 2 of the GLib library.
 
 %prep
 %setup -q -n glib-%{version}
-%patch0 -p1 -b .gcc4
-%patch1 -p1 -b .c++
 
 %build
 
@@ -103,6 +98,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/*
 
 %changelog
+* Wed Apr  6 2005 Matthias Clasen <mclasen@redhat.com> - 2.6.4-1
+- Update to 2.6.4
+- Drop upstreamed patches
+
 * Fri Mar 11 2005 Matthias Clasen <mclasen@redhat.com> - 2.6.3-4
 - Fix #150817
 
diff --git a/sources b/sources
index 2f6cb39..8b123e6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8f69ad5387197114b356efc64ce88d77  glib-2.6.3.tar.bz2
+af7eeb8aae764ff763418471ed6eb93d  glib-2.6.4.tar.bz2