[control-center] Update to 3.4.1
Kalev Lember
kalev at fedoraproject.org
Mon Apr 16 23:07:32 UTC 2012
commit 399b8858e82a7141fecadfa7af7fe190b234eec4
Author: Richard Hughes <richard at hughsie.com>
Date: Mon Apr 16 16:53:53 2012 +0100
Update to 3.4.1
.gitignore | 1 +
control-center.spec | 7 +++++--
printers-firewalld1-api.patch | 16 ++++++++--------
sources | 2 +-
4 files changed, 15 insertions(+), 11 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a2d07eb..50a6d02 100644
--- a/.gitignore
+++ b/.gitignore
@@ -34,3 +34,4 @@ gnome-control-center-2.31.6.tar.bz2
/gnome-control-center-3.3.91.tar.xz
/gnome-control-center-3.3.92.tar.xz
/gnome-control-center-3.4.0.tar.xz
+/gnome-control-center-3.4.1.tar.xz
diff --git a/control-center.spec b/control-center.spec
index d93cca4..74a51c0 100644
--- a/control-center.spec
+++ b/control-center.spec
@@ -16,8 +16,8 @@
Summary: Utilities to configure the GNOME desktop
Name: control-center
-Version: 3.4.0
-Release: 2%{?dist}
+Version: 3.4.1
+Release: 1%{?dist}
Epoch: 1
License: GPLv2+ and GFDL
Group: User Interface/Desktops
@@ -237,6 +237,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || :
%changelog
+* Mon Apr 16 2012 Richard Hughes <hughsient at gmail.com> - 1:3.4.1-1
+- Update to 3.4.1
+
* Thu Apr 12 2012 Marek Kasik <mkasik at redhat.com> - 3.4.0-2
- Add support for FirewallD1 API
- Resolves: #802381
diff --git a/printers-firewalld1-api.patch b/printers-firewalld1-api.patch
index 992503e..def5923 100644
--- a/printers-firewalld1-api.patch
+++ b/printers-firewalld1-api.patch
@@ -32,7 +32,7 @@ index 0b21502..0427683 100644
static void
devices_get_cb (GObject *source_object,
GAsyncResult *res,
-@@ -565,10 +581,7 @@ devices_get_cb (GObject *source_object,
+@@ -567,10 +583,7 @@ devices_get_cb (GObject *source_obj
if (error)
{
@@ -44,7 +44,7 @@ index 0b21502..0427683 100644
g_warning ("Install system-config-printer which provides \
DBus method \"GroupPhysicalDevices\" to group duplicates in device list.");
-@@ -756,96 +769,115 @@ line_split (gchar *line)
+@@ -758,96 +771,115 @@ line_split (gchar *line)
return result;
}
@@ -196,7 +196,7 @@ index 0b21502..0427683 100644
bus = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, &error);
if (!bus)
-@@ -856,36 +888,298 @@ service_enabled (gchar *service_name)
+@@ -858,36 +890,298 @@ service_enabled (gchar *service_name)
}
output = g_dbus_connection_call_sync (bus,
@@ -508,7 +508,7 @@ index 0b21502..0427683 100644
}
static gboolean
-@@ -928,8 +1222,7 @@ dbus_method_available (gchar *name,
+@@ -930,8 +1224,7 @@ dbus_method_available (gchar *name,
}
else
{
@@ -518,7 +518,7 @@ index 0b21502..0427683 100644
result = FALSE;
else
result = TRUE;
-@@ -1315,7 +1608,11 @@ populate_devices_list (PpNewPrinterDialog *pp)
+@@ -1317,7 +1610,11 @@ populate_devices_list (PpNewPrinterDialo
actualize_devices_list (pp);
@@ -531,8 +531,8 @@ index 0b21502..0427683 100644
FIREWALLD_PATH,
FIREWALLD_IFACE,
"getServices"))
-@@ -1858,10 +2155,14 @@ new_printer_add_button_cb (GtkButton *button,
- }
+@@ -1772,10 +2069,14 @@ new_printer_add_button_cb (GtkButton *bu
+ printer_set_default_media_size (pp->devices[device_id].display_name);
if (pp->devices[device_id].device_uri &&
- dbus_method_available (FIREWALLD_BUS,
@@ -550,7 +550,7 @@ index 0b21502..0427683 100644
{
if (g_str_has_prefix (pp->devices[device_id].device_uri, "dnssd:") ||
g_str_has_prefix (pp->devices[device_id].device_uri, "mdns:"))
-@@ -1942,9 +2243,7 @@ new_printer_add_button_cb (GtkButton *button,
+@@ -1856,9 +2157,7 @@ new_printer_add_button_cb (GtkButton *bu
if (bus == NULL ||
(error &&
diff --git a/sources b/sources
index 7c2b0e9..b051709 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-31163fa739846929043ae4963bd4f8fa gnome-control-center-3.4.0.tar.xz
+f9a65550e82dcd55ca23ceaa5a1489f6 gnome-control-center-3.4.1.tar.xz
More information about the scm-commits
mailing list