[libwnck: 2/2] merge

[Matthias Clasen]

commit a93af2d664b44b74384231b8ce850d22e7c44b47
Merge: f367754 70a1c20
Author: Matthias Clasen <mclasen at redhat.com>
Date:   Wed Sep 29 23:23:30 2010 -0400

    merge

 libwnck.spec |   55 ++++++++++++++++++++-----------------------------------
 1 files changed, 20 insertions(+), 35 deletions(-)
---
diff --cc libwnck.spec
index 99e4bc8,ddaf18b..a35aa26
--- a/libwnck.spec
+++ b/libwnck.spec
@@@ -1,12 -1,7 +1,7 @@@
- %define glib2_version 2.16.0
- %define gtk2_version 2.11.3
- %define pango_version 1.8.0
- %define startup_notification_version 0.5
- 
  Summary: Window Navigator Construction Kit
  Name: libwnck
 -Version: 2.30.3
 -Release: 4%{?dist}
 +Version: 2.30.4
 +Release: 1%{?dist}
  URL: http://download.gnome.org/sources/libwnck/
  #VCS: git:git://git.gnome.org/libwnck
  Source0: http://download.gnome.org/sources/libwnck/2.30/%{name}-%{version}.tar.bz2
@@@ -88,9 -67,12 +67,15 @@@ find $RPM_BUILD_ROOT -name '*.la' -exe
  %doc %{_datadir}/gtk-doc
  
  %changelog
 +* Wed Sep 29 2010 Matthias Clasen <mclasen at redhat.com> - 2.30.4-1
 +- Update to 2.30.4
 +
+ * Wed Sep 29 2010 jkeating - 2.30.3-4
+ - Rebuilt for gcc bug 634757
+ 
+ * Sat Sep 11 2010 Parag Nemade <paragn AT fedoraproject.org> 2.30.3-3
+ - Merge-review cleanup (#226059)
+ 
  * Mon Aug 23 2010 Matthias Clasen <mclasen at redhat.com> - 2.30.3-2
  - Co-own /usr/share/gtk-doc (#604398)