From a586cdea8f302b6575ef3d8d7b43bbb6d899171a Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Jul 26 2017 10:08:06 +0000 Subject: Update to 3.25.4 - Rebase distro-logo.patch --- diff --git a/.gitignore b/.gitignore index 85edd16..4f13f70 100644 --- a/.gitignore +++ b/.gitignore @@ -118,3 +118,4 @@ gnome-control-center-2.31.6.tar.bz2 /gnome-control-center-3.24.0.tar.xz /gnome-control-center-3.24.1.tar.xz /gnome-control-center-3.24.2.tar.xz +/gnome-control-center-3.25.4.tar.xz diff --git a/control-center.spec b/control-center.spec index 5810d43..0c8bd9f 100644 --- a/control-center.spec +++ b/control-center.spec @@ -1,21 +1,22 @@ %define gettext_package gnome-control-center-2.0 -%define glib2_version 2.44.0 +%define glib2_version 2.53.0 %define gtk3_version 3.22.0 %define gsd_version 3.23.90 %define gnome_desktop_version 3.21.2 %define gsettings_desktop_schemas_version 3.21.4 +%define gnome_online_accounts_version 3.25.3 %define gnome_bluetooth_version 3.18.2 Name: control-center Epoch: 1 -Version: 3.24.2 -Release: 3%{?dist} +Version: 3.25.4 +Release: 1%{?dist} Summary: Utilities to configure the GNOME desktop License: GPLv2+ and GFDL URL: http://www.gnome.org -Source0: https://download.gnome.org/sources/gnome-control-center/3.24/gnome-control-center-%{version}.tar.xz +Source0: https://download.gnome.org/sources/gnome-control-center/3.25/gnome-control-center-%{version}.tar.xz # https://bugzilla.gnome.org/show_bug.cgi?id=695691 Patch0: distro-logo.patch @@ -32,7 +33,7 @@ BuildRequires: pkgconfig(gdk-wayland-3.0) BuildRequires: pkgconfig(gio-2.0) >= %{glib2_version} BuildRequires: pkgconfig(gnome-desktop-3.0) >= %{gnome_desktop_version} BuildRequires: pkgconfig(gnome-settings-daemon) >= %{gsd_version} -BuildRequires: pkgconfig(goa-1.0) +BuildRequires: pkgconfig(goa-1.0) >= %{gnome_online_accounts_version} BuildRequires: pkgconfig(goa-backend-1.0) BuildRequires: pkgconfig(grilo-0.3) BuildRequires: pkgconfig(gsettings-desktop-schemas) >= %{gsettings_desktop_schemas_version} @@ -74,6 +75,7 @@ Requires: gnome-desktop3 >= %{gnome_desktop_version} Requires: dbus-x11 Requires: control-center-filesystem = %{epoch}:%{version}-%{release} Requires: glib2%{?_isa} >= %{glib2_version} +Requires: gnome-online-accounts%{?_isa} >= %{gnome_online_accounts_version} Requires: gsettings-desktop-schemas%{?_isa} >= %{gsettings_desktop_schemas_version} Requires: gtk3%{?_isa} >= %{gtk3_version} %ifnarch s390 s390x @@ -219,6 +221,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %changelog +* Wed Jul 26 2017 Kalev Lember - 1:3.25.4-1 +- Update to 3.25.4 +- Rebase distro-logo.patch + * Wed Jul 26 2017 Fedora Release Engineering - 1:3.24.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild diff --git a/distro-logo.patch b/distro-logo.patch index 3f6fc18..25370d9 100644 --- a/distro-logo.patch +++ b/distro-logo.patch @@ -1,4 +1,4 @@ -From e4ce92aa930cdefab24122dfa47997d4805e7741 Mon Sep 17 00:00:00 2001 +From adba2ebc116bc5baf5bb0793e323e173340d11c9 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sun, 31 Mar 2013 20:28:19 -0400 Subject: [PATCH] info: Switch around GNOME and distro information @@ -8,276 +8,92 @@ information in the small print. https://bugzilla.gnome.org/show_bug.cgi?id=695691 --- - panels/info/cc-info-panel.c | 55 +++++++++++++++++--------------- - panels/info/info.ui | 77 ++++++++++++++++++++++++++++++++------------- - 2 files changed, 84 insertions(+), 48 deletions(-) + panels/info/cc-info-overview-panel.c | 7 ++----- + panels/info/info-overview.ui | 14 ++++++++------ + 2 files changed, 10 insertions(+), 11 deletions(-) -diff --git a/panels/info/cc-info-panel.c b/panels/info/cc-info-panel.c -index 3ce8b5749..7ec29e663 100644 ---- a/panels/info/cc-info-panel.c -+++ b/panels/info/cc-info-panel.c -@@ -491,42 +491,23 @@ static char * - get_os_type (void) +diff --git a/panels/info/cc-info-overview-panel.c b/panels/info/cc-info-overview-panel.c +index 7a5879c6b..ce15e92d0 100644 +--- a/panels/info/cc-info-overview-panel.c ++++ b/panels/info/cc-info-overview-panel.c +@@ -446,7 +446,7 @@ static char * + get_os_name (void) { GHashTable *os_info; -- gchar *name, *result, *build_id; -- int bits; -+ gchar *name, *result, *version; +- gchar *name, *version_id, *pretty_name, *build_id; ++ gchar *name, *version_id, *build_id; + gchar *result = NULL; + g_autofree gchar *name_version = NULL; - os_info = get_os_info (); +@@ -457,12 +457,9 @@ get_os_name (void) - if (!os_info) - return NULL; + name = g_hash_table_lookup (os_info, "NAME"); + version_id = g_hash_table_lookup (os_info, "VERSION_ID"); +- pretty_name = g_hash_table_lookup (os_info, "PRETTY_NAME"); + build_id = g_hash_table_lookup (os_info, "BUILD_ID"); -- name = g_hash_table_lookup (os_info, "PRETTY_NAME"); -- build_id = g_hash_table_lookup (os_info, "BUILD_ID"); -+ name = g_hash_table_lookup (os_info, "NAME"); -+ version = g_hash_table_lookup (os_info, "VERSION_ID"); - -- if (GLIB_SIZEOF_VOID_P == 8) -- bits = 64; -- else -- bits = 32; -- -- if (build_id) -+ if (name && version) - { -- if (name) -- /* translators: This is the name of the OS, followed by the type -- * of architecture and the build id, for example: -- * "Fedora 18 (Spherical Cow) 64-bit (Build ID: xyz)" or -- * "Ubuntu (Oneric Ocelot) 32-bit (Build ID: jki)" */ -- result = g_strdup_printf (_("%s %d-bit (Build ID: %s)"), name, bits, build_id); -- else -- result = g_strdup_printf (_("%d-bit (Build ID: %s)"), bits, build_id); -+ result = g_strconcat (name, " ", version, NULL); - } -- else -+ else if (name) - { -- if (name) -- /* translators: This is the name of the OS, followed by the type -- * of architecture, for example: -- * "Fedora 18 (Spherical Cow) 64-bit" or "Ubuntu (Oneric Ocelot) 32-bit" */ -- result = g_strdup_printf (_("%s %d-bit"), name, bits); -- else -- result = g_strdup_printf (_("%d-bit"), bits); -+ result = g_strdup (name); - } - - g_clear_pointer (&os_info, g_hash_table_destroy); -@@ -534,6 +515,23 @@ get_os_type (void) - return result; - } - -+static char * -+get_os_description (void) -+{ -+ int bits; -+ gchar *result; -+ -+ if (GLIB_SIZEOF_VOID_P == 8) -+ bits = 64; -+ else -+ bits = 32; -+ -+ /* translators: This is the the type of OS architecture, eg: "64-bit" or "32-bit" */ -+ result = g_strdup_printf (_("%d-bit"), bits); -+ -+ return result; -+} -+ - static void - query_done (GFile *file, - GAsyncResult *res, -@@ -1520,6 +1518,11 @@ info_panel_setup_overview (CcInfoPanel *self) - gtk_label_set_text (GTK_LABEL (widget), text ? text : ""); - g_free (text); - -+ widget = WID ("os_description_label"); -+ text = get_os_description (); -+ gtk_label_set_text (GTK_LABEL (widget), text ? text : ""); -+ g_free (text); -+ - get_primary_disc_info (self); - - widget = WID ("graphics_label"); -diff --git a/panels/info/info.ui b/panels/info/info.ui -index 1967fdf18..0bdfc1a86 100644 ---- a/panels/info/info.ui -+++ b/panels/info/info.ui -@@ -199,13 +199,14 @@ - - True - False -- 18 -+ 6 - vertical - - - True - False -- /org/gnome/control-center/info/GnomeLogoVerticalMedium.svg -+ 128 -+ fedora-logo-icon - - - False -@@ -214,11 +215,12 @@ - - - -- -+ - True - False - Version 3.0 - True -+ 24 - - - -@@ -282,19 +284,35 @@ - - - -+ -+ True -+ False -+ 1 -+ OS Type -+ os_description_label -+ -+ -+ -+ 3 -+ 4 -+ -+ -+ - - True - False - 1 -- Base system -- os_type_label -+ GNOME -+ version_label - - - -- 4 -- 5 -+ 5 -+ 6 - - - -@@ -309,8 +327,8 @@ - - - -- 6 -- 7 -+ 7 -+ 8 - - - -@@ -354,7 +372,7 @@ - - - -- -+ - True - False - 0 -@@ -364,8 +382,23 @@ - - 1 - 2 -- 4 -- 5 -+ 3 -+ 4 -+ -+ -+ -+ -+ True -+ False -+ 0 -+ Unknown -+ True -+ -+ -+ 1 -+ 2 -+ 5 -+ 6 - - - -@@ -379,8 +412,8 @@ - - 1 - 2 -- 6 -- 7 -+ 7 -+ 8 - - - -@@ -462,8 +495,8 @@ - - - -- 3 -- 4 -+ 4 -+ 5 - - - -@@ -491,8 +524,8 @@ - - 1 - 2 -- 3 -- 4 -+ 4 -+ 5 - - - -@@ -510,8 +543,8 @@ - - - -- 5 -- 6 -+ 6 -+ 7 - - - -@@ -525,8 +558,8 @@ - - 1 - 2 -- 5 -- 6 -+ 6 -+ 7 - - - +- if (pretty_name) +- name_version = g_strdup (pretty_name); +- else if (name && version_id) ++ if (name && version_id) + name_version = g_strdup_printf ("%s %s", name, version_id); + else + name_version = g_strdup (_("Unknown")); +diff --git a/panels/info/info-overview.ui b/panels/info/info-overview.ui +index 3478d6e60..b35e5189b 100644 +--- a/panels/info/info-overview.ui ++++ b/panels/info/info-overview.ui +@@ -9,13 +9,14 @@ + + True + False +- 18 ++ 6 + vertical + + + True + False +- /org/gnome/control-center/info/GnomeLogoVerticalMedium.svg ++ 128 ++ fedora-logo-icon + + + False +@@ -24,11 +25,12 @@ + + + +- ++ + True + False + Version 3.0 + True ++ 24 + + + +@@ -115,8 +117,8 @@ + True + False + 1 +- OS name +- os_name_label ++ GNOME ++ version_label + +@@ -225,7 +227,7 @@ + + + +- ++ + True + False + 0 -- -2.12.0 +2.13.0 diff --git a/sources b/sources index b3f1cbd..808734e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gnome-control-center-3.24.2.tar.xz) = 5041d4907cba0ea188663ad574ddaac6c341ec22b69f7a3d6332b8ae0a572fe33eb19eed758f3d593fe6224d793f2ecc3677584ebf0971f3ae145363a1769cc0 +SHA512 (gnome-control-center-3.25.4.tar.xz) = d8e6ebadf664140b94e05c4fee1734d3273db7fea5f92573fb17f0ccb44b0894c153c65b6bc8a57e5903a1827a81a024bf53b01f3d480ab7f0930c9012bfd029