From a78845933a7924ae832abbf50abaa6f84464c4e6 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@fedoraproject.org>
Date: Wed, 30 Aug 2006 13:24:47 +0000
Subject: [PATCH] 2.12.3

---
 .cvsignore | 2 +-
 glib2.spec | 9 +++++----
 sources    | 2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 13cd406..83d1b08 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-glib-2.12.2.tar.bz2
+glib-2.12.3.tar.bz2
diff --git a/glib2.spec b/glib2.spec
index 63af2ea..1444160 100644
--- a/glib2.spec
+++ b/glib2.spec
@@ -2,7 +2,7 @@
 
 Summary: A library of handy utility functions
 Name: glib2
-Version: 2.12.2
+Version: 2.12.3
 Release: 2%{?dist}
 License: LGPL
 Group: System Environment/Libraries
@@ -10,8 +10,6 @@ Source: glib-%{version}.tar.bz2
 Source2: glib2.sh
 Source3: glib2.csh
 Patch0: glib-2.11.1-libdir.patch
-# fixed in upstream cvs
-Patch1: glib-2.12.2-monotonic-timer.patch
 
 Conflicts: libgnomeui <= 2.2.0
 BuildRoot: %{_tmppath}/glib-%{PACKAGE_VERSION}-root
@@ -46,7 +44,6 @@ version 2 of the GLib library.
 %prep
 %setup -q -n glib-%{version}
 %patch0 -p1 -b .libdir
-%patch1 -p1 -b .monotonic-timer
 
 %build
 
@@ -108,6 +105,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/*
 
 %changelog
+* Wed Aug 30 2006 Matthias Clasen <mclasen@redhat.com> - 2.12.3-1.fc6
+- Update to 2.12.3
+- Drop upstreamed patch
+
 * Sun Aug 27 2006 Matthias Clasen <mclasen@redhat.com> - 2.12.2-2.fc6
 - Use Posix monotonic timers for GTimer
 
diff --git a/sources b/sources
index a7549dd..7b942d3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-45471ca86af288b7a48116ab2b498d0c  glib-2.12.2.tar.bz2
+cbf663f8bc733e2f6c90599942f6616a  glib-2.12.3.tar.bz2