From 03481c563295400d3feb69f73095c661f1f0d0a9 Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@gmail.com>
Date: Dec 30 2012 13:01:28 +0000
Subject: fix merge


---

diff --git a/.gitignore b/.gitignore
index 32e0682..05acfe7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,10 +1 @@
-/libcanberra-*.src.rpm
-/.build-*.log
-/libcanberra-0.25.tar.gz
-/libcanberra-0.26.tar.gz
-/libcanberra-0.27.tar.gz
-/x86_64
-/libcanberra-0.28.tar.gz
-/libcanberra-0.*/
-/libcanberra-0.29.tar.xz
-/libcanberra-0.30.tar.xz
+/libcanberra-*.tar.xz
diff --git a/libcanberra.spec b/libcanberra.spec
index 991d6cb..114d0ca 100644
--- a/libcanberra.spec
+++ b/libcanberra.spec
@@ -1,6 +1,6 @@
 Name: libcanberra
 Version: 0.30
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Portable Sound Event Library
 Group: System Environment/Libraries
 Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.xz
@@ -14,6 +14,7 @@ BuildRequires: libvorbis-devel
 BuildRequires: libtool-ltdl-devel
 BuildRequires: gtk-doc
 BuildRequires: pulseaudio-libs-devel >= 0.9.15
+BuildRequires: gstreamer1-devel
 BuildRequires: libtdb-devel
 BuildRequires: gettext-devel
 BuildRequires: systemd-devel
@@ -138,10 +139,13 @@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README
 %{_datadir}/vala/vapi/libcanberra.vapi
 
 %changelog
-* Mon Oct 29 2012 Matthias Clasen <mclasen@redhat.com> - 0.30-1
+* Mon Oct 29 2012 Matthias Clasen <mclasen@redhat.com> - 0.30-2
 - Update to 0.30
 - Add %%{_isa} as required to fix multilib issues
 
+* Tue Sep 25 2012 Lennart Poettering <lpoetter@redhat.com> - 0.30-1
+- New upstream release
+
 * Mon Sep 24 2012 Bastien Nocera <bnocera@redhat.com> 0.29-6
 - Disable the GStreamer backend, it's not used in Fedora