[libnotify: 3/3] merge from F-16

[Peter Robinson]

commit dd73b8629d1d1bfcd4500da6cc2bb5e0e22132e5
Merge: e7fb510 57155e6
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Mon Mar 5 14:08:35 2012 +0000

    merge from F-16

 .gitignore     |    7 +------
 libnotify.spec |   13 +++++++------
 sources        |    2 +-
 3 files changed, 9 insertions(+), 13 deletions(-)
---
diff --cc .gitignore
index db61fae,009600c..1d92523
--- a/.gitignore
+++ b/.gitignore
@@@ -1,6 -1,7 +1,1 @@@
--libnotify-0.5.1.tar.bz2
--/libnotify-0.6.0.tar.bz2
--/libnotify-0.7.0.tar.bz2
--/libnotify-0.7.1.tar.bz2
--/libnotify-0.7.2.tar.bz2
--/libnotify-0.7.3.tar.bz2
 -/libnotify-0.7.4.tar.xz
++/libnotify-0.*.tar.xz
diff --cc libnotify.spec
index 64bb3d3,1b43a78..e08fbf9
--- a/libnotify.spec
+++ b/libnotify.spec
@@@ -3,10 -3,10 +3,10 @@@
  
  Summary: Desktop notification library
  Name: libnotify
- Version: 0.7.3
+ Version: 0.7.4
 -Release: 1%{?dist}
 +Release: 2%{?dist}
  URL: http://library.gnome.org/devel/notification-spec/
- Source0: http://download.gnome.org/sources/%{name}/0.7/%{name}-%{version}.tar.bz2
+ Source0: http://download.gnome.org/sources/%{name}/0.7/%{name}-%{version}.tar.xz
  License: LGPLv2+
  Group: System Environment/Libraries
  BuildRequires: libtool
@@@ -74,8 -72,8 +72,11 @@@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.
  %{_datadir}/gir-1.0/Notify-0.7.gir
  
  %changelog
- * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.7.3-2
- - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
++* Sun Mar  4 2012 Peter Robinson <pbrobinson at fedoraproject.org> - 0.7.4-2
++- Merge newer F-16 version into rawhide
++
+ * Tue Aug 30 2011 Matthias Clasen <mclasen at redhat.com> - 0.7.4-1
+ - Update to 0.7.4
  
  * Wed May 11 2011 Tomas Bzatek <tbzatek at redhat.com> - 0.7.3-1
  - Update to 0.7.3