[meego-panel-pasteboard: 2/2] Fix merge

[Peter Robinson]

commit 01e6deae58f7029d518178fd897c1a25f5734021
Merge: 3842746 cd82529
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Fri Dec 23 15:48:14 2011 +0000

    Fix merge

 meego-panel-pasteboard.spec |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)
---
diff --cc meego-panel-pasteboard.spec
index f14e43c,f1ae2de..38ce85e
--- a/meego-panel-pasteboard.spec
+++ b/meego-panel-pasteboard.spec
@@@ -5,7 -5,7 +5,7 @@@
  
  Name:          meego-panel-pasteboard
  Version:       0.0.8
--Release:       4%{?dist}
++Release:       5%{?dist}
  Summary:       MeeGo Panel for Paste Board
  
  Group:         User Interface/Desktops
@@@ -15,7 -15,7 +15,7 @@@ Source0:       %{tarfile
  
  BuildRequires: clutter-devel
  BuildRequires: dbus-glib-devel
--BuildRequires: gtk3-devel
++BuildRequires: gtk2-devel
  BuildRequires: libmx-devel
  BuildRequires: mutter-meego-devel
  BuildRequires: intltool
@@@ -50,12 -50,12 +50,15 @@@ make install DESTDIR=%{buildroot} INSTA
  %{_libexecdir}/meego-panel-pasteboard
  %{_datadir}/dbus-1/services/com.meego.UX.Shell.Panels.pasteboard.service
  %{_datadir}/%{name}
 -%{_datadir}/mutter-meego/panels/meego-panel-pasteboard.desktop
 +%{_datadir}/mutter-netbook/panels/meego-panel-pasteboard.desktop
  
  %changelog
- * Fri Dec 23 2011 Peter Robinson <pbrobinson at fedoraproject.org> - 0.0.8-4
++* Fri Dec 23 2011 Peter Robinson <pbrobinson at fedoraproject.org> - 0.0.8-5
 +- Fix build
 +
+ * Tue Dec 06 2011 Adam Jackson <ajax at redhat.com> - 0.0.8-4
+ - Rebuild for new libpng
+ 
  * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.0.8-3
  - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild