[libcanberra: 4/4] fix merge

[Peter Robinson]

commit 03481c563295400d3feb69f73095c661f1f0d0a9
Merge: a9d23b5 c169ed0
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Sun Dec 30 13:01:28 2012 +0000

    fix merge

 .gitignore       |   11 +----------
 libcanberra.spec |    8 ++++++--
 2 files changed, 7 insertions(+), 12 deletions(-)
---
diff --cc .gitignore
index 32e0682,32e0682..05acfe7
--- a/.gitignore
+++ b/.gitignore
@@@ -1,10 -1,10 +1,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 --cc libcanberra.spec
index 991d6cb,f41f953..114d0ca
--- a/libcanberra.spec
+++ b/libcanberra.spec
@@@ -138,10 -140,12 +139,13 @@@ rm $RPM_BUILD_ROOT%{_docdir}/libcanberr
  %{_datadir}/vala/vapi/libcanberra.vapi
  
  %changelog
- * Mon Oct 29 2012 Matthias Clasen <mclasen at redhat.com> - 0.30-1
+ * Mon Oct 29 2012 Matthias Clasen <mclasen at redhat.com> - 0.30-2
 +- Update to 0.30
  - Add %%{_isa} as required to fix multilib issues
  
+ * Tue Sep 25 2012 Lennart Poettering <lpoetter at redhat.com> - 0.30-1
+ - New upstream release
+ 
  * Mon Sep 24 2012 Bastien Nocera <bnocera at redhat.com> 0.29-6
  - Disable the GStreamer backend, it's not used in Fedora