Merge branch 'f15'

Conflicts:
	.gitignore
	sources
	totem-pl-parser.spec

.gitignore

@@ -1,7 +1 @@
-totem-pl-parser-2.30.1.tar.bz2
-/totem-pl-parser-2.30.3.tar.bz2
-/totem-pl-parser-2.31.92.tar.bz2
-/totem-pl-parser-2.32.0.tar.bz2
-/totem-pl-parser-2.32.1.tar.bz2
-/totem-pl-parser-2.32.2.tar.bz2
-/totem-pl-parser-2.32.3.tar.bz2
+/totem-pl-parser-2.32.4.tar.bz2

0001-Fix-libquvi-version-dependency.patch

@@ -1,26 +0,0 @@
-From eb18ad0f249cfbcac117a8423bc38e2d94396fc6 Mon Sep 17 00:00:00 2001
-From: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
-Date: Sun, 30 Jan 2011 19:02:18 -0600
-Subject: [PATCH] Fix libquvi version dependency
-
-https://bugzilla.gnome.org/show_bug.cgi?id=640987
----
- configure.in |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/configure.in b/configure.in
-index 840bf8c..b128de5 100644
---- a/configure.in
-+++ b/configure.in
-@@ -40,7 +40,7 @@ AC_PATH_PROG([GLIB_MKENUMS],[glib-mkenums])
- # Requirements
- GLIB_REQS=2.21.6
- GIO_REQS=2.24.0
--QUVI_REQS=2.11
-+QUVI_REQS=0.2.11
- 
- # Before making a release, the PLPARSER_LT_VERSION string should be modified.
- # The string is of the form C:R:A.
--- 
-1.7.3.5
-

sources

@@ -1 +1 @@
-ff934dc35a90689cf4d25bf5c7c23c2e  totem-pl-parser-2.32.3.tar.bz2
+c57ceea5cb8cb54963ff438baf1dd6ba  totem-pl-parser-2.32.4.tar.bz2

totem-pl-parser.spec

@@ -1,5 +1,5 @@
 Name:		totem-pl-parser
-Version:	2.32.3
+Version:	2.32.4
 Release:	1%{?dist}
 Summary:	Totem Playlist Parser library
 
@@ -67,6 +67,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 %{_datadir}/gir-1.0/*.gir
 
 %changelog
+* Mon Mar 21 2011 Bastien Nocera <bnocera@redhat.com> 2.32.4-1
+- Update to 2.32.4
+
 * Mon Feb 21 2011 Bastien Nocera <bnocera@redhat.com> 2.32.3-1
 - Update to 2.32.3