rpms/control-center/devel control-center.spec, 1.449, 1.450 polkit1.patch, 1.1, 1.2
Matthias Clasen
mclasen at fedoraproject.org
Fri Jun 12 18:44:17 UTC 2009
Author: mclasen
Update of /cvs/pkgs/rpms/control-center/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28498
Modified Files:
control-center.spec polkit1.patch
Log Message:
Adapt to GConf changes
Index: control-center.spec
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.449
retrieving revision 1.450
diff -u -p -r1.449 -r1.450
--- control-center.spec 9 Jun 2009 17:46:37 -0000 1.449
+++ control-center.spec 12 Jun 2009 18:43:47 -0000 1.450
@@ -23,7 +23,7 @@
Summary: Utilities to configure the GNOME desktop
Name: control-center
Version: 2.26.0
-Release: 8%{?dist}
+Release: 9%{?dist}
Epoch: 1
License: GPLv2+ and GFDL
Group: User Interface/Desktops
@@ -60,7 +60,8 @@ Patch35: gnome-control-center-2.26.0-sup
# http://bugzilla.gnome.org/show_bug.cgi?id=578572
Patch36: display-capplet-mnemonics.patch
-# https://bugzilla.redhat.com/show_bug.cgi?id=498365
+# http://bugzilla.redhat.com/show_bug.cgi?id=498365
+# http://bugzilla.gnome.org/show_bug.cgi?id=536531
Patch37: polkit1.patch
# call the Fedora/RHEL graphical passwd changing apps
@@ -132,7 +133,6 @@ BuildRequires: hal-devel >= 0.5.6
BuildRequires: dbus-devel >= 0.90
BuildRequires: dbus-glib-devel >= 0.70
BuildRequires: scrollkeeper
-BuildRequires: PolicyKit-gnome-devel
BuildRequires: libcanberra-devel
Requires(preun): GConf2
@@ -364,6 +364,9 @@ fi
%dir %{_datadir}/gnome-control-center/keybindings
%changelog
+* Fri Jun 12 2009 Matthias Clasen <mclasen at redhat.com> - 2.26.0-9
+- Adapt to changes in GConf
+
* Mon Jun 9 2009 Matthias Clasen <mclasen at redhat.com> - 2.26.0-8
- Port to PolicyKit 1
polkit1.patch:
Index: polkit1.patch
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/devel/polkit1.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- polkit1.patch 9 Jun 2009 17:46:37 -0000 1.1
+++ polkit1.patch 12 Jun 2009 18:43:47 -0000 1.2
@@ -1,6 +1,6 @@
diff -up gnome-control-center-2.26.0/capplets/about-me/gnome-about-me.c.polkit1 gnome-control-center-2.26.0/capplets/about-me/gnome-about-me.c
---- gnome-control-center-2.26.0/capplets/about-me/gnome-about-me.c.polkit1 2009-05-11 22:54:13.917355711 -0400
-+++ gnome-control-center-2.26.0/capplets/about-me/gnome-about-me.c 2009-05-11 22:54:13.933355351 -0400
+--- gnome-control-center-2.26.0/capplets/about-me/gnome-about-me.c.polkit1 2009-06-09 13:45:16.935332926 -0400
++++ gnome-control-center-2.26.0/capplets/about-me/gnome-about-me.c 2009-06-09 13:45:17.007312663 -0400
@@ -36,10 +36,6 @@
#define GNOME_DESKTOP_USE_UNSTABLE_API
#include <libgnomeui/gnome-desktop-thumbnail.h>
@@ -62,8 +62,8 @@ diff -up gnome-control-center-2.26.0/cap
g_signal_connect (me->enable_fingerprint_button, "clicked",
G_CALLBACK (about_me_fingerprint_button_clicked_cb), me);
diff -up gnome-control-center-2.26.0/capplets/about-me/Makefile.am.polkit1 gnome-control-center-2.26.0/capplets/about-me/Makefile.am
---- gnome-control-center-2.26.0/capplets/about-me/Makefile.am.polkit1 2009-05-11 22:54:13.921378826 -0400
-+++ gnome-control-center-2.26.0/capplets/about-me/Makefile.am 2009-05-11 22:54:13.932381403 -0400
+--- gnome-control-center-2.26.0/capplets/about-me/Makefile.am.polkit1 2009-06-09 13:45:16.942317965 -0400
++++ gnome-control-center-2.26.0/capplets/about-me/Makefile.am 2009-06-09 13:45:17.009313427 -0400
@@ -26,7 +26,7 @@ gnome_about_me_SOURCES = \
if BUILD_ABOUTME
bin_PROGRAMS = gnome-about-me
@@ -82,8 +82,8 @@ diff -up gnome-control-center-2.26.0/cap
-DDATADIR="\"$(datadir)\"" \
-DGNOMECC_DATA_DIR="\"$(pkgdatadir)\"" \
diff -up gnome-control-center-2.26.0/capplets/appearance/appearance-desktop.c.polkit1 gnome-control-center-2.26.0/capplets/appearance/appearance-desktop.c
---- gnome-control-center-2.26.0/capplets/appearance/appearance-desktop.c.polkit1 2009-05-11 22:54:13.928355424 -0400
-+++ gnome-control-center-2.26.0/capplets/appearance/appearance-desktop.c 2009-05-12 14:18:32.590345296 -0400
+--- gnome-control-center-2.26.0/capplets/appearance/appearance-desktop.c.polkit1 2009-06-09 13:45:16.982323819 -0400
++++ gnome-control-center-2.26.0/capplets/appearance/appearance-desktop.c 2009-06-12 13:05:41.315839883 -0400
@@ -33,7 +33,6 @@
#include <libgnomeui/gnome-bg.h>
@@ -154,9 +154,9 @@ diff -up gnome-control-center-2.26.0/cap
+ DBusGProxy *proxy;
+ DBusGConnection *connection;
+ GError *error;
-+ gboolean result;
++ guint result;
+
-+ result = FALSE;
++ result = 0;
+
+ error = NULL;
+ connection = dbus_g_bus_get (DBUS_BUS_SYSTEM, &error);
@@ -179,7 +179,7 @@ diff -up gnome-control-center-2.26.0/cap
+ &error,
+ G_TYPE_STRV, background_keys,
+ G_TYPE_INVALID,
-+ G_TYPE_BOOLEAN, &result,
++ G_TYPE_UINT, &result,
+ G_TYPE_INVALID)) {
+ g_warning ("error calling CanSetSystem: %s\n", error->message);
+ g_error_free (error);
@@ -189,7 +189,7 @@ diff -up gnome-control-center-2.26.0/cap
+ g_object_unref (proxy);
+
+out:
-+ gtk_action_set_visible (action, result);
++ gtk_action_set_visible (action, result != 0);
+}
+
void
@@ -235,8 +235,8 @@ diff -up gnome-control-center-2.26.0/cap
g_signal_connect (action, "activate", G_CALLBACK (set_background), data);
diff -up gnome-control-center-2.26.0/capplets/appearance/Makefile.am.polkit1 gnome-control-center-2.26.0/capplets/appearance/Makefile.am
---- gnome-control-center-2.26.0/capplets/appearance/Makefile.am.polkit1 2009-05-11 22:54:13.928355424 -0400
-+++ gnome-control-center-2.26.0/capplets/appearance/Makefile.am 2009-05-11 22:54:13.934355141 -0400
+--- gnome-control-center-2.26.0/capplets/appearance/Makefile.am.polkit1 2009-06-09 13:45:16.996323092 -0400
++++ gnome-control-center-2.26.0/capplets/appearance/Makefile.am 2009-06-09 13:45:17.012313001 -0400
@@ -44,8 +44,7 @@ gnome_appearance_properties_LDADD = \
$(top_builddir)/capplets/common/libcommon.la \
$(GNOMECC_CAPPLETS_LIBS) \
@@ -256,8 +256,8 @@ diff -up gnome-control-center-2.26.0/cap
-DGNOMECC_DATA_DIR="\"$(pkgdatadir)\"" \
-DGNOMECC_GLADE_DIR="\"$(gladedir)\"" \
diff -up gnome-control-center-2.26.0/configure.in.polkit1 gnome-control-center-2.26.0/configure.in
---- gnome-control-center-2.26.0/configure.in.polkit1 2009-05-11 22:54:13.922355708 -0400
-+++ gnome-control-center-2.26.0/configure.in 2009-05-11 22:54:13.931382241 -0400
+--- gnome-control-center-2.26.0/configure.in.polkit1 2009-06-09 13:45:16.943314331 -0400
++++ gnome-control-center-2.26.0/configure.in 2009-06-09 13:45:17.014319004 -0400
@@ -102,7 +102,6 @@ PKG_CHECK_MODULES(METACITY, libmetacity-
PKG_CHECK_MODULES(TYPING, glib-2.0 > 2.11 gconf-2.0 gtk+-2.0)
PKG_CHECK_MODULES(GSD_DBUS, gnome-settings-daemon)
More information about the fedora-extras-commits
mailing list