From 69cafd6e312008725e2fc162d75c48fd101f096f Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@fedoraproject.org>
Date: Fri, 21 Dec 2007 04:38:40 +0000
Subject: [PATCH] 2.15.0

---
 .cvsignore |  2 +-
 glib2.spec | 13 ++++++++++---
 sources    |  2 +-
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index b9b8fb8..0ce4c59 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-glib-2.14.2.tar.bz2
+glib-2.15.0.tar.bz2
diff --git a/glib2.spec b/glib2.spec
index 9acf67f..b653c02 100644
--- a/glib2.spec
+++ b/glib2.spec
@@ -2,16 +2,17 @@
 
 Summary: A library of handy utility functions
 Name: glib2
-Version: 2.14.4
+Version: 2.15.0
 Release: 1%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gtk.org
-Source: http://download.gnome.org/sources/glib/2.14/glib-%{version}.tar.bz2
+Source: http://download.gnome.org/sources/glib/2.15/glib-%{version}.tar.bz2
 Source2: glib2.sh
 Source3: glib2.csh
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: pkgconfig >= 1:0.14
+BuildRequires: gamin-devel
 BuildRequires: gettext
 
 %description 
@@ -69,7 +70,7 @@ make install DESTDIR=$RPM_BUILD_ROOT
 # the devel stuff) in /lib
 ./mkinstalldirs $RPM_BUILD_ROOT/%{_lib}
 pushd $RPM_BUILD_ROOT%{_libdir}
-for name in glib gobject gmodule gthread; do
+for name in glib gobject gmodule gthread gio; do
   mv lib${name}-2.0.so.* ../../%{_lib}
   ln -sf ../../%{_lib}/lib${name}-2.0.so.*.* lib${name}-2.0.so
 done
@@ -81,6 +82,7 @@ install -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
 install -p -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
 
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
+rm -f $RPM_BUILD_ROOT%{_libdir}/gio/modules/*.{a,la}
 
 %find_lang glib20
 
@@ -98,7 +100,9 @@ rm -rf $RPM_BUILD_ROOT
 %{libdir}/libgthread-2.0.so.*
 %{libdir}/libgmodule-2.0.so.*
 %{libdir}/libgobject-2.0.so.*
+%{libdir}/libgio-2.0.so.*
 %{_sysconfdir}/profile.d/*
+{_libdir}/gio/modules/libgiofam.so
 
 %files devel
 %defattr(-, root, root, -)
@@ -117,6 +121,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/lib*.a
 
 %changelog
+* Thu Dec 20 2007 Matthias Clasen <mclasen@redhat.com> - 2.15.0-1
+- Update to 2.15.0
+
 * Sat Nov 24 2007 Matthias Clasen <mclasen@redhat.com> - 2.14.4-1
 - Update to 2.14.4
 
diff --git a/sources b/sources
index f069835..f4837b8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7ee7874108cbe9ea7fff1f4ab3389ce8  glib-2.14.4.tar.bz2
+52536475a3f301842cf3448f19af094c  glib-2.15.0.tar.bz2