rpms/moblin-panel-people/devel mpp-mc5-port.patch, NONE, 1.1 moblin-panel-people.spec, 1.1, 1.2

[Bastien Nocera]

Author: hadess

Update of /cvs/pkgs/rpms/moblin-panel-people/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2871

Modified Files:
	moblin-panel-people.spec 
Added Files:
	mpp-mc5-port.patch 
Log Message:
* Mon Sep 28 2009 Bastien Nocera <bnocera at redhat.com> 0.0.1-2
- Add patch to port to new Mission Control


mpp-mc5-port.patch:
 configure.ac           |    2 +-
 src/mnb-people-panel.c |    7 +------
 2 files changed, 2 insertions(+), 7 deletions(-)

--- NEW FILE mpp-mc5-port.patch ---
commit 51b916b3dbf79f6729591f7567c34e1ac2aef98d
Author: Jonny Lamb <jonny.lamb at collabora.co.uk>
Date:   Mon Sep 28 15:41:46 2009 +0100

    configure.ac: add a versioned depends on anerley
    
    Signed-off-by: Jonny Lamb <jonny.lamb at collabora.co.uk>

diff --git a/configure.ac b/configure.ac
index 930e188..2687e21 100644
--- a/configure.ac
+++ b/configure.ac
@@ -25,7 +25,7 @@ CFLAGS="$CFLAGS -Wall"
 
 PKG_CHECK_MODULES(MPL, moblin-panel)
 PKG_CHECK_MODULES(PEOPLE,
-                  anerley
+                  anerley >= 0.1.3
                   gtk+-2.0 >= 2.14
                   nbtk-1.2
                   gio-2.0

commit 90ccb81fd3c13c22410f19943fc8b725cbedb821
Author: Jonny Lamb <jonny.lamb at collabora.co.uk>
Date:   Fri Sep 18 13:33:00 2009 +0100

    mnb-people-panel: update to new anerley API
    
    Signed-off-by: Jonny Lamb <jonny.lamb at collabora.co.uk>

diff --git a/src/mnb-people-panel.c b/src/mnb-people-panel.c
index f7ea2ff..3f3bd5e 100644
--- a/src/mnb-people-panel.c
+++ b/src/mnb-people-panel.c
@@ -524,9 +524,7 @@ mnb_people_panel_init (MnbPeoplePanel *self)
   MnbPeoplePanelPrivate *priv = GET_PRIVATE (self);
   NbtkWidget *hbox, *label;
   NbtkWidget *scroll_view;
-  MissionControl *mc;
   AnerleyFeed *feed, *tp_feed, *ebook_feed;
-  DBusGConnection *conn;
   EBook *book;
   GError *error = NULL;
 
@@ -581,12 +579,9 @@ mnb_people_panel_init (MnbPeoplePanel *self)
                     (GCallback)_entry_text_changed_cb,
                     self);
 
-  conn = dbus_g_bus_get (DBUS_BUS_SESSION, NULL);
-  mc = mission_control_new (conn);
-
   feed = anerley_aggregate_feed_new ();
 
-  tp_feed = anerley_aggregate_tp_feed_new (mc);
+  tp_feed = anerley_aggregate_tp_feed_new ();
   anerley_aggregate_feed_add_feed (ANERLEY_AGGREGATE_FEED (feed),
                                    tp_feed);
 


Index: moblin-panel-people.spec
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-panel-people/devel/moblin-panel-people.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- moblin-panel-people.spec	26 Aug 2009 22:37:59 -0000	1.1
+++ moblin-panel-people.spec	28 Sep 2009 21:37:23 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           moblin-panel-people
 Version:        0.0.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Moblin Panel for People
 
 Group:          System Environment/Libraries
@@ -21,6 +21,11 @@ BuildRequires: intltool
 BuildRequires: libtool
 BuildRequires: gnome-common
 
+# Generated with:
+# git show -p 51b916b3dbf79f6729591f7567c34e1ac2aef98d~2..
+# On the mc5 branch of git://git.collabora.co.uk/git/user/jonny/moblin-panel-people.git
+Patch0:        mpp-mc5-port.patch
+
 Requires: dbus
 
 %description
@@ -28,6 +33,7 @@ The Moblin mutter panel for managing and
 
 %prep
 %setup -q
+%patch0 -p1 -b .mc5
 
 # run autogen.sh until we have a proper release, but don't run configure twice.
 NOCONFIGURE=true ./autogen.sh
@@ -53,5 +59,8 @@ rm -rf %{buildroot}
 %{_datadir}/%{name}
 
 %changelog
+* Mon Sep 28 2009 Bastien Nocera <bnocera at redhat.com> 0.0.1-2
+- Add patch to port to new Mission Control
+
 * Wed Aug 19 2009 Peter Robinson <pbrobinson at gmail.com> 0.0.1-1
 - Initial packaging