rpms/gnome-control-center
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Refresh distro logo patch

Browse Source
This commit is contained in:
Michael Catanzaro 2021-03-10 14:12:23 -06:00
parent 5accafcca6
commit 6646c56e2d
2 changed files with 196 additions and 374 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

551
distro-logo.patch
View File

@ -1,386 +1,195 @@
From 649943e98848e8b4ee147c81cfdfda0f55c70420 Mon Sep 17 00:00:00 2001
From 4369e31ec541172e1c0d7c64645c7990e413bbca Mon Sep 17 00:00:00 2001
From: Michael Catanzaro <mcatanzaro@gnome.org>
Date: Mon, 16 Mar 2020 13:37:29 -0500
Subject: [PATCH] Replace GNOME logo with Fedora vertical logo
Date: Tue, 9 Mar 2021 14:51:54 -0600
Subject: [PATCH 1/3] info-overview: add build option to control distributor
logo
This replaces our previous branding patch that used the Fedora logo from
the system icon theme. That's no longer good enough because we want to
display the "Fedora" text underneath our logo now, and we probably don't
want to add that version of the logo to the system icon theme, since
text does not work well in icons.
Currently, we display a 256x256 version of the OS icon from
/etc/os-release. This is too big for my taste, and it's also not
sufficient for distros that want to display a logo that is not an icon.
For instance, because we no longer display the operating system name
immediately beneath the logo, it may be desirable to use a logo variant
that includes text. This patch adds a meson build option that
distributions can use to override the logo.
There was also a proposal to get the logo from /etc/os-release, but that
has a similar problem. We have several different versions of the logo,
and only one can go there.
https://pagure.io/fedora-workstation/issue/135
https://bugzilla.gnome.org/show_bug.cgi?id=695691
Because the logo might include text, distributions may want to vary the
logo used in dark mode. A subsequent commit will add a second option for
this.
---
.../info-overview/GnomeLogoVerticalMedium.svg | 134 ------------------
panels/info-overview/cc-info-overview-panel.c | 17 ---
.../info-overview/cc-info-overview-panel.ui | 1 +
panels/info-overview/fedora_vertical.png | Bin 0 -> 6979 bytes
.../info-overview/info-overview.gresource.xml | 2 +-
panels/info-overview/meson.build | 2 +-
6 files changed, 3 insertions(+), 153 deletions(-)
delete mode 100644 panels/info-overview/GnomeLogoVerticalMedium.svg
create mode 100644 panels/info-overview/fedora_vertical.png
meson.build | 6 ++++++
meson_options.txt | 1 +
panels/info-overview/cc-info-overview-panel.c | 4 ++++
3 files changed, 11 insertions(+)
diff --git a/panels/info-overview/GnomeLogoVerticalMedium.svg b/panels/info-overview/GnomeLogoVerticalMedium.svg
deleted file mode 100644
index b697f06a5..000000000
--- a/panels/info-overview/GnomeLogoVerticalMedium.svg
+++ /dev/null
@@ -1,134 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- version="1.0"
- width="97.966095"
- height="138.95122"
- id="svg1903"
- inkscape:version="0.48.1 r9760"
- sodipodi:docname="GnomeLogoVerticalMedium.svg">
- <metadata
- id="metadata24">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <sodipodi:namedview
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1"
- objecttolerance="10"
- gridtolerance="10"
- guidetolerance="10"
- inkscape:pageopacity="0"
- inkscape:pageshadow="2"
- inkscape:window-width="818"
- inkscape:window-height="738"
- id="namedview22"
- showgrid="false"
- inkscape:zoom="2.0645911"
- inkscape:cx="6.1022513"
- inkscape:cy="68.392751"
- inkscape:window-x="460"
- inkscape:window-y="26"
- inkscape:window-maximized="0"
- inkscape:current-layer="svg1903"
- fit-margin-top="0"
- fit-margin-left="0"
- fit-margin-right="0"
- fit-margin-bottom="0" />
- <defs
- id="defs1905">
- <inkscape:perspective
- sodipodi:type="inkscape:persp3d"
- inkscape:vp_x="0 : 244.11613 : 1"
- inkscape:vp_y="0 : 1000 : 0"
- inkscape:vp_z="401.74014 : 244.11613 : 1"
- inkscape:persp3d-origin="200.87007 : 162.74409 : 1"
- id="perspective26" />
- </defs>
- <g
- transform="matrix(0.30686102,0,0,0.30686102,-57.94673,-76.524295)"
- id="layer1">
- <g
- transform="translate(925.8326,120.8762)"
- id="g3963">
- <g
- transform="matrix(2.914897,0,0,2.914897,-717.5904,128.5015)"
- style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
- id="g3771">
- <g
- style="fill:#000000;fill-opacity:1"
- id="g3773">
- <path
- d="M 86.068,0 C 61.466,0 56.851,35.041 70.691,35.041 84.529,35.041 110.671,0 86.068,0 z"
- style="fill:#000000;fill-opacity:1"
- id="path3775"
- inkscape:connector-curvature="0" />
- <path
- d="M 45.217,30.699 C 52.586,31.149 60.671,2.577 46.821,4.374 32.976,6.171 37.845,30.249 45.217,30.699 z"
- style="fill:#000000;fill-opacity:1"
- id="path3777"
- inkscape:connector-curvature="0" />
- <path
- d="M 11.445,48.453 C 16.686,46.146 12.12,23.581 3.208,29.735 -5.7,35.89 6.204,50.759 11.445,48.453 z"
- style="fill:#000000;fill-opacity:1"
- id="path3779"
- inkscape:connector-curvature="0" />
- <path
- d="M 26.212,36.642 C 32.451,35.37 32.793,9.778 21.667,14.369 10.539,18.961 19.978,37.916 26.212,36.642 l 0,0 z"
- style="fill:#000000;fill-opacity:1"
- id="path3781"
- inkscape:connector-curvature="0" />
- <path
- d="m 58.791,93.913 c 1.107,8.454 -6.202,12.629 -13.36,7.179 C 22.644,83.743 83.16,75.088 79.171,51.386 75.86,31.712 15.495,37.769 8.621,68.553 3.968,89.374 27.774,118.26 52.614,118.26 c 12.22,0 26.315,-11.034 28.952,-25.012 C 83.58,82.589 57.867,86.86 58.791,93.913 l 0,0 z"
- style="fill:#000000;fill-opacity:1"
- id="path3783"
- inkscape:connector-curvature="0" />
- </g>
- </g>
- <g
- transform="matrix(1.098291,0,0,1.098291,41.06056,-50.07504)"
- id="g3956">
- <path
- d="m -565.99523,509.46063 c -8.08731,0.21792 -14.47394,3.12448 -19.17071,8.69866 -4.86385,5.80101 -7.31024,13.81651 -7.31024,24.03862 0,10.19394 2.44651,18.18745 7.31024,23.98846 4.88761,5.801 11.59815,8.69866 20.15764,8.69866 8.5831,0 15.3105,-2.89766 20.17436,-8.69866 4.86373,-5.80101 7.29358,-13.79452 7.29353,-23.98846 -5e-5,-10.22211 -2.4298,-18.23761 -7.29353,-24.03862 -4.86386,-5.80075 -11.59131,-8.69866 -20.17436,-8.69866 -0.33434,0 -0.6582,-0.009 -0.98693,0 z m 0.60221,11.77669 c 0.12927,-0.003 0.25357,0 0.38472,0 4.21998,0 7.48996,1.8261 9.8028,5.48697 2.31266,3.66086 3.47944,8.82788 3.47949,15.47362 0,6.61757 -1.16692,11.74604 -3.47949,15.40691 -2.31274,3.66086 -5.58286,5.50352 -9.8028,5.50352 -4.19632,0 -7.43983,-1.84266 -9.75257,-5.50352 -2.31274,-3.66087 -3.47944,-8.78934 -3.47949,-15.40691 0,-6.64574 1.16684,-11.81276 3.47949,-15.47362 2.24035,-3.54647 5.35963,-5.37604 9.36785,-5.48697 z"
- style="font-size:148.699646px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
- id="path3787"
- inkscape:connector-curvature="0" />
- <path
- d="m -657.35432,568.97161 c -7.12362,5.98235 -17.72219,5.91366 -22.13752,5.91366 -8.8932,0 -15.93855,-2.92879 -21.13613,-8.78612 -5.19765,-5.88525 -7.7964,-13.85456 -7.7964,-23.90791 0,-10.16578 2.64646,-18.16325 7.93945,-23.99241 5.293,-5.82892 12.54098,-8.74363 21.74413,-8.74363 3.55245,0 6.94991,0.39433 10.19254,1.18273 3.26638,0.78841 6.34203,1.95706 9.22697,3.50595 l -3.70487,10.9527 c -1.62185,-0.88773 -3.4788,-1.76286 -5.20022,-2.37807 -2.93262,-0.98557 -5.87712,-1.47823 -8.83351,-1.47823 -5.48379,0 -9.71581,1.81623 -12.69601,5.44892 -2.95649,3.60454 -4.4347,8.7718 -4.4347,15.50204 0,6.67415 1.4305,11.82733 4.29167,15.46003 2.86099,3.6327 7.16068,5.44892 12.19522,5.44892 5.11476,0 8.28269,-1.28922 9.97226,-2.64762 l 0,-10.91144 -11.08087,0 0,-10.89809 21.45799,0"
- style="font-size:148.699646px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
- id="path3789"
- inkscape:connector-curvature="0" />
- <path
- d="m -528.50252,510.59568 17.5241,0 12.15952,39.37066 12.23105,-39.37066 14.81181,0 6.69132,63.06461 -13.01787,0 -4.0148,-39.4349 -12.30257,39.62391 -8.72628,0 -12.30263,-40.9623 -4.01479,40.77329 -13.05365,0 6.69132,-63.06461"
- style="font-size:148.699646px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
- id="path3793"
- inkscape:connector-curvature="0" />
- <path
- d="m -455.68828,510.59568 37.15811,0 0,12.29183 -23.38928,0 0,13.08097 17.97969,0 0,10.95369 -17.97969,0 0,14.44629 24.17608,0 0,12.29183 -37.94491,0 0,-63.06461"
- style="font-size:148.699646px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
- id="path3795"
- inkscape:connector-curvature="0" />
- <path
- d="m -647.94283,510.59568 8.6869,0 27.44915,37.90083 0,-37.90083 11.71533,0 0,63.06461 -8.6869,0 -27.4491,-37.90083 0,37.90083 -11.71538,0 0,-63.06461"
- style="font-size:148.699646px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
- id="path3791"
- inkscape:connector-curvature="0" />
- </g>
- </g>
- </g>
-</svg>
diff --git a/meson.build b/meson.build
index e8333c0da..1661caa4b 100644
--- a/meson.build
+++ b/meson.build
@@ -50,6 +50,12 @@ foreach define: set_defines
config_h.set_quoted(define[0], define[1])
endforeach
+distributor_logo = get_option('distributor_logo')
+if (distributor_logo != '')
+ config_h.set_quoted('DISTRIBUTOR_LOGO', distributor_logo,
+ description: 'Define to absolute path of distributor logo')
+endif
+
# meson does not support octal values, so it must be handled as a
# string. See: https://github.com/mesonbuild/meson/issues/2047
config_h.set('USER_DIR_MODE', '0700',
diff --git a/meson_options.txt b/meson_options.txt
index 1b7b54810..93e551373 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -8,3 +8,4 @@ option('tracing', type: 'boolean', value: false, description: 'add extra debuggi
option('wayland', type: 'boolean', value: true, description: 'build with Wayland support')
option('profile', type: 'combo', choices: ['default','development'], value: 'default')
option('malcontent', type: 'boolean', value: false, description: 'build with malcontent support')
+option('distributor_logo', type: 'string', description: 'absolute path to distributor logo for the About panel')
diff --git a/panels/info-overview/cc-info-overview-panel.c b/panels/info-overview/cc-info-overview-panel.c
index bd0e07762..884e3da44 100644
index bd0e07762..95a5904df 100644
--- a/panels/info-overview/cc-info-overview-panel.c
+++ b/panels/info-overview/cc-info-overview-panel.c
@@ -866,21 +866,6 @@ cc_info_panel_row_activated_cb (CcInfoOverviewPanel *self,
@@ -869,6 +869,9 @@ cc_info_panel_row_activated_cb (CcInfoOverviewPanel *self,
static void
setup_os_logo (CcInfoOverviewPanel *panel)
{
+#ifdef DISTRIBUTOR_LOGO
+ gtk_image_set_from_file (panel->os_logo, DISTRIBUTOR_LOGO);
+#else
g_autofree char *logo_name = g_get_os_info ("LOGO");
if (logo_name != NULL)
{
@@ -879,6 +882,7 @@ setup_os_logo (CcInfoOverviewPanel *panel)
{
gtk_image_set_from_resource (panel->os_logo, "/org/gnome/control-center/info-overview/GnomeLogoVerticalMedium.svg");
}
+#endif
}
static void
--
GitLab
From f08669767ca87ff99fc08e1a7334c8f2e7f18f0b Mon Sep 17 00:00:00 2001
From: Michael Catanzaro <mcatanzaro@gnome.org>
Date: Tue, 9 Mar 2021 16:02:46 -0600
Subject: [PATCH 2/3] info-overview: add build option to specify a dark mode
logo variant
Let's allow distributions to specify a different logo to use when using
a dark GTK theme. This is best-effort only since it relies on the
convention that dark themes must end with "dark" and therefore will fail
for a theme named "midnight" or anything that doesn't match convention.
---
meson.build | 5 ++++
meson_options.txt | 1 +
panels/info-overview/cc-info-overview-panel.c | 27 +++++++++++++++++++
3 files changed, 33 insertions(+)
diff --git a/meson.build b/meson.build
index 1661caa4b..124171626 100644
--- a/meson.build
+++ b/meson.build
@@ -54,6 +54,11 @@ distributor_logo = get_option('distributor_logo')
if (distributor_logo != '')
config_h.set_quoted('DISTRIBUTOR_LOGO', distributor_logo,
description: 'Define to absolute path of distributor logo')
+ dark_mode_distributor_logo = get_option('dark_mode_distributor_logo')
+ if (dark_mode_distributor_logo != '')
+ config_h.set_quoted('DARK_MODE_DISTRIBUTOR_LOGO', dark_mode_distributor_logo,
+ description: 'Define to absolute path of distributor logo for use in dark mode')
+ endif
endif
# meson does not support octal values, so it must be handled as a
diff --git a/meson_options.txt b/meson_options.txt
index 93e551373..5305c8606 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -9,3 +9,4 @@ option('wayland', type: 'boolean', value: true, description: 'build with Wayland
option('profile', type: 'combo', choices: ['default','development'], value: 'default')
option('malcontent', type: 'boolean', value: false, description: 'build with malcontent support')
option('distributor_logo', type: 'string', description: 'absolute path to distributor logo for the About panel')
+option('dark_mode_distributor_logo', type: 'string', description: 'absolute path to distributor logo dark mode variant')
diff --git a/panels/info-overview/cc-info-overview-panel.c b/panels/info-overview/cc-info-overview-panel.c
index 95a5904df..cb20e16b1 100644
--- a/panels/info-overview/cc-info-overview-panel.c
+++ b/panels/info-overview/cc-info-overview-panel.c
@@ -866,10 +866,37 @@ cc_info_panel_row_activated_cb (CcInfoOverviewPanel *self,
open_software_update (self);
}
-static void
-setup_os_logo (CcInfoOverviewPanel *panel)
-{
- g_autofree char *logo_name = g_get_os_info ("LOGO");
- if (logo_name != NULL)
- {
- gtk_image_set_from_icon_name (panel->os_logo, logo_name, GTK_ICON_SIZE_INVALID);
- gtk_image_set_pixel_size (panel->os_logo, 256);
- }
- else
- {
- gtk_image_set_from_resource (panel->os_logo, "/org/gnome/control-center/info-overview/GnomeLogoVerticalMedium.svg");
- }
-}
-
+#ifdef DARK_MODE_DISTRIBUTOR_LOGO
+static gboolean
+is_dark_mode (CcInfoOverviewPanel *panel)
+{
+ GdkScreen *screen;
+ GtkSettings *settings;
+ g_autofree char *theme_name = NULL;
+
+ theme_name = g_strdup (g_getenv ("GTK_THEME"));
+ if (theme_name != NULL)
+ return g_str_has_suffix (theme_name, "dark");
+
+ screen = gtk_widget_get_screen (GTK_WIDGET (panel));
+ settings = gtk_settings_get_for_screen (screen);
+
+ g_object_get (settings, "gtk-theme-name", &theme_name, NULL);
+ return theme_name != NULL && g_str_has_suffix (theme_name, "dark");
+}
+#endif
+
static void
cc_info_overview_panel_class_init (CcInfoOverviewPanelClass *klass)
setup_os_logo (CcInfoOverviewPanel *panel)
{
@@ -929,8 +914,6 @@ cc_info_overview_panel_init (CcInfoOverviewPanel *self)
info_overview_panel_setup_overview (self);
info_overview_panel_setup_virt (self);
-
- setup_os_logo (self);
}
GtkWidget *
diff --git a/panels/info-overview/cc-info-overview-panel.ui b/panels/info-overview/cc-info-overview-panel.ui
index 2f5d3cf8b..d593729c7 100644
--- a/panels/info-overview/cc-info-overview-panel.ui
+++ b/panels/info-overview/cc-info-overview-panel.ui
@@ -28,6 +28,7 @@
<object class="GtkImage" id="os_logo">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="resource">/org/gnome/control-center/info-overview/fedora_vertical.png</property>
</object>
<packing>
<property name="expand">False</property>
diff --git a/panels/info-overview/fedora_vertical.png b/panels/info-overview/fedora_vertical.png
new file mode 100644
index 0000000000000000000000000000000000000000..ddd581ea97a98a5fe8bb030eef658ec7362f62da
GIT binary patch
literal 6979
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
K&`NQ`fd2t&mONJg
literal 0
HcmV?d00001
diff --git a/panels/info-overview/info-overview.gresource.xml b/panels/info-overview/info-overview.gresource.xml
index 83806e0ad..68cc49626 100644
--- a/panels/info-overview/info-overview.gresource.xml
+++ b/panels/info-overview/info-overview.gresource.xml
@@ -2,6 +2,6 @@
<gresources>
<gresource prefix="/org/gnome/control-center/info-overview">
<file preprocess="xml-stripblanks">cc-info-overview-panel.ui</file>
- <file>GnomeLogoVerticalMedium.svg</file>
+ <file>fedora_vertical.png</file>
</gresource>
</gresources>
diff --git a/panels/info-overview/meson.build b/panels/info-overview/meson.build
index 14663f24c..d10c29e78 100644
--- a/panels/info-overview/meson.build
+++ b/panels/info-overview/meson.build
@@ -28,7 +28,7 @@ sources = files(
)
resource_data = files(
- 'GnomeLogoVerticalMedium.svg',
+ 'fedora_vertical.png',
'cc-info-overview-panel.ui'
)
#ifdef DISTRIBUTOR_LOGO
+#ifdef DARK_MODE_DISTRIBUTOR_LOGO
+ if (is_dark_mode (panel))
+ {
+ gtk_image_set_from_file (panel->os_logo, DARK_MODE_DISTRIBUTOR_LOGO);
+ return;
+ }
+#endif
gtk_image_set_from_file (panel->os_logo, DISTRIBUTOR_LOGO);
#else
g_autofree char *logo_name = g_get_os_info ("LOGO");
--
2.29.2
GitLab
From c379ccc4e8f0bcdee78361f134ba29d3a25f7528 Mon Sep 17 00:00:00 2001
From: Michael Catanzaro <mcatanzaro@gnome.org>
Date: Wed, 10 Mar 2021 11:30:57 -0600
Subject: [PATCH 3/3] info-overview: reduce size of logo when using icon from
/etc/os-release
When using the icon from /etc/os-release, display it as 128x128 rather
than 256x256. In distributions that don't ship a 128x128, such as
Fedora, this results in the 256x256 icon being scaled down to a
reasonable size. 256x256 is so large here as to be clearly undesirable.
128x128 is also the size that Ubuntu uses in its downstream patch. Might
as well reduce the need for patching as far as possible, even though
Fedora doesn't plan to use this codepath.
---
panels/info-overview/cc-info-overview-panel.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/panels/info-overview/cc-info-overview-panel.c b/panels/info-overview/cc-info-overview-panel.c
index cb20e16b1..3575b90c5 100644
--- a/panels/info-overview/cc-info-overview-panel.c
+++ b/panels/info-overview/cc-info-overview-panel.c
@@ -903,7 +903,7 @@ setup_os_logo (CcInfoOverviewPanel *panel)
if (logo_name != NULL)
{
gtk_image_set_from_icon_name (panel->os_logo, logo_name, GTK_ICON_SIZE_INVALID);
- gtk_image_set_pixel_size (panel->os_logo, 256);
+ gtk_image_set_pixel_size (panel->os_logo, 128);
}
else
{
--
GitLab

19
gnome-control-center.spec
View File

@ -13,14 +13,14 @@
Name: gnome-control-center
Version: 40~beta
Release: 4%{?dist}
Release: 5%{?dist}
Summary: Utilities to configure the GNOME desktop
License: GPLv2+ and CC-BY-SA
URL: http://www.gnome.org
Source0: https://download.gnome.org/sources/gnome-control-center/40/gnome-control-center-%{tarball_version}.tar.xz
# https://bugzilla.gnome.org/show_bug.cgi?id=695691
# https://gitlab.gnome.org/GNOME/gnome-control-center/-/merge_requests/965
Patch0: distro-logo.patch
Patch1: fix-language-chooser.patch
@ -151,7 +151,16 @@ utilities.
%autosetup -p1 -S git -n gnome-control-center-%{tarball_version}
%build
%meson -Ddocumentation=true
%meson \
-Ddocumentation=true \
%if 0%{?fedora}
-Ddistributor_logo=%{_datadir}/pixmaps/fedora-logo-small.png \
-Ddark_mode_distributor_logo=%{_datadir}/pixmaps/system-logo-white.png \
%elif 0%{?rhel}
-Ddistributor_logo=%{_datadir}/pixmaps/fedora-logo.png \
-Ddark_mode_distributor_logo=%{_datadir}/pixmaps/system-logo-white.png \
%endif
%{nil}
%meson_build
%install
@ -200,6 +209,10 @@ chrpath --delete $RPM_BUILD_ROOT%{_bindir}/gnome-control-center
%dir %{_datadir}/gnome/wm-properties
%changelog
* Wed Mar 10 2021 Michael Catanzaro <mcatanzaro@redhat.com> - 40~beta-5
- Refresh distro logo patch
- Drop Recommends: vino, let vino die!
* Sun Mar 07 2021 Igor Raits <ignatenkobrain@fedoraproject.org> - 40~beta-4
- Fix modifications of the networks (Fixes: RHBZ#1932674)