From 8ef6e7076cfdc191c9cd9d617a73776b87a00471 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@fedoraproject.org>
Date: May 03 2006 03:48:13 +0000
Subject: 2.11.0


---

diff --git a/.cvsignore b/.cvsignore
index acd3167..4a21abf 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,36 +1 @@
-glib-2.4.6.tar.bz2
-glib-2.4.7.tar.bz2
-glib-2.4.8.tar.bz2
-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
-glib-2.7.0.tar.bz2
-glib-2.7.1.tar.bz2
-glib-2.7.2.tar.bz2
-glib-2.7.3.tar.bz2
-glib-2.7.4.tar.bz2
-glib-2.7.5.tar.bz2
-glib-2.7.6.tar.bz2
-glib-2.8.0.tar.bz2
-glib-2.8.1.tar.bz2
-glib-2.8.2.tar.bz2
-glib-2.8.3.tar.bz2
-glib-2.8.4.tar.bz2
-glib-2.9.0.tar.bz2
-glib-2.9.1.cvs20051202.tar.bz2
-glib-2.9.1.cvs20051202-1.tar.bz2
-glib-2.9.1.cvs20051202_1.tar.bz2
-glib-2.9.1.cvs20051202_2.tar.bz1
-glib-2.9.1.cvs20051202_2.tar.bz2
-glib-2.9.1.tar.bz2
-glib-2.9.2.tar.gz
-glib-2.9.2.tar.bz2
-glib-2.9.3.tar.bz2
-glib-2.9.4.tar.bz2
-glib-2.9.5.tar.bz2
-glib-2.9.6.tar.bz2
-glib-2.10.0.tar.bz2
-glib-2.10.1.tar.bz2
-glib-2.10.2.tar.bz2
+glib-2.11.0.tar.bz2
diff --git a/glib2.spec b/glib2.spec
index c42700a..c55d93d 100644
--- a/glib2.spec
+++ b/glib2.spec
@@ -1,7 +1,7 @@
 Summary: A library of handy utility functions
 Name: glib2
-Version: 2.10.2
-Release: 2
+Version: 2.11.0
+Release: 1
 License: LGPL
 Group: System Environment/Libraries
 Source: glib-%{version}.tar.bz2
@@ -14,8 +14,6 @@ BuildRequires: gettext
 Obsoletes: glib-gtkbeta
 URL: http://www.gtk.org
 
-Patch0: glib-2.10.2-test.patch
-
 %description 
 GLib is the low-level core library that forms the basis
 for projects such as GTK+ and GNOME. It provides data structure
@@ -30,7 +28,7 @@ Summary: The GIMP ToolKit (GTK+) and GIMP Drawing Kit (GDK) support library
 Group: Development/Libraries
 Obsoletes: glib-gtkbeta-devel
 Requires: pkgconfig >= 1:0.8
-Requires: %{name} = %{version}
+Requires: %{name} = %{version}-%{release}
 Conflicts: glib-devel <= 1:1.2.8
 
 %description devel
@@ -39,14 +37,13 @@ version 2 of the GLib library.
 
 %prep
 %setup -q -n glib-%{version}
-%patch0 -p1 -b .test
 
 %build
 
 for i in config.guess config.sub ; do
 	test -f /usr/share/libtool/$i && cp /usr/share/libtool/$i .
 done
-%configure --disable-gtk-doc --enable-static
+%configure --disable-gtk-doc --disable-static
 make
 # http://bugzilla.gnome.org/show_bug.cgi?id=320463 
 LANG=en_US.UTF8
@@ -63,7 +60,7 @@ mkdir -p $RPM_BUILD_ROOT%{_bindir}
 install -m 755 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
 install -m 755 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
 
-rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
+rm -f $RPM_BUILD_ROOT%{_libdir}/*.{a,la}
 
 %find_lang glib20
 
@@ -88,7 +85,6 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-, root, root)
 
 %{_libdir}/lib*.so
-%{_libdir}/lib*.a
 %{_libdir}/glib-2.0
 %{_includedir}/*
 %{_datadir}/aclocal/*
@@ -99,6 +95,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/*
 
 %changelog
+* Tue May 2 2006 Matthias Clasen <mclasen@redhat.com> - 2.11.0-1
+- Update to 2.11.0
+
 * Fri Apr 7 2006 Matthias Clasen <mclasen@redhat.com> - 2.10.2-2
 - Update to 2.10.2
 
diff --git a/sources b/sources
index 826eb20..60a17c0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-718961161ee1692c216a2d542196a04a  glib-2.10.2.tar.bz2
+5cbfb9d8279d7bf26d13b3ca52c9a570  glib-2.11.0.tar.bz2