diff --git a/distro-logo.patch b/distro-logo.patch index 49e141c..d59e43a 100644 --- a/distro-logo.patch +++ b/distro-logo.patch @@ -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 -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 @@ -- -- -- -- -- -- -- -- image/svg+xml -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- +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 +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 @@ - - - False -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 -zcma)Bbx<5Uu)jkOD+d%PQi}Vb1&UL8_@Tw!p+Iqm;!c6$?#0~;g~Oq^JH?8-+aZtd -z|MzCzWHvk5WRh%t$;u>LNkIw+lN1vG0N}_-LsedQ-V3FG&|Yc_0xr- -zI5H8D`D@ztrzSP~Ya8Wdfn}5+AHNU$0!%H^;m>kd5M!Ya$Nj&(Vt%{%DM7eKtjN&c -z|K%m9DNd2CityLCoe0#&&Nnbm;$)CNECJq|Gu5`9fd^ -zR85Rdhk9J+)bTC`7tPf3zM-+GDto1H5SHVjOQ)7UOSX6 -zSQnMUku?Ver}hB-IdJu__QF88rwRvVefx*eeh_#b)rzqHPQ*215o664t@5(4T@}?_ -zM5gL}!ztc)8;-6nACDRCuVo-w7WP7d-hkrgKj!{7-1mj=$K9};D`&i{5C2^PrByV} -z$kx`tZ$^}_Tl#+sYI`AWVEOIuR3aSH5;6KYUSL5pmXm@4p8qR3ZAI}f5)6B3EvFX* -z=l&z0IAgl|ixAyeMqUDa6B&$8#YXbEMg{;N5tD&_RCQlG%JlG7omuGj9c!yILyfCG -zA;OXFr2~o6gOO0FFxcMJG*n(ysQT09sLCZbO)RRj%2ED;SAF{mVVf^aK}~?fRbv#h -z;)})li6PNaEz!oOHs5$WOaDk6DE|TD>b~<4xwCLQ;or%+_&w&4ZYx~a;Vb6}17qz}k -z+6q)XWzmN=d-r)Q{VAvDfJeb5j#dL>p$nIZ^DFT%jd(&>mTx@fof$ahz_=n7cf56S -zL{1Sz71HvKaYh)oPaNP#3@OAI)+&$~S_O+^e+;1$6&90gbOXEz%x#4|*hT(CY`KvU -z&tX!9faVnSfAo}IQgzh$k9vtci~QP71BOLMh?xcfU9O@&xWUm1q@ug0$JZ)cWVO^R -z$k_&&2*j}+LyB0X847OzL8#QCS~Mn;K{~MlcSOtg|A1lPlfPRP)JPD~YU>rPZS(bJ -zeC36tZvIZeJ^Pnck&bYDacmVynCCeazz#6(?5s~J)7N(MfD*I9P4T!v{m^oAauB`Y -zD|(L^wKHf~B7CqPM@s*bVx`r_tGF?dycCz$aWbBpMDr~Oudg4s*V@+$$xZQ&Gq20V -zXVrJATJum?JyJV5fHzO@W!Y-0y7nHi4&k=Y?|Qy)8;fADakX=QJP{1V5(3bZ+DXh3 -zz$<&Yb-E0X`gQm|%ugU5)hk+6d^WgqJRjFa9!Cix|H{}jFV*2wpO2DOV;%kUA`G(u -zy~TDgz#4RkCvZ&g7kBx&ZtwOWevf0f^5NU7DFd!$T5CMvP08KgSB~)Vcd-fCKSTs| -zK{Z(MKR9$)mVWx?nwi5wb-E;CwHNwelGv>ji(wRBTci6z{^(Nmu)$24 -z!rDWjskjuu -zkDGMQJe_>x^wg{{V<}0#aJrGIWGO1oCJYZp*}hxx -zv_l>oS{jW^bT$G-l7T+KME!)^U@gU(mifj;6;-v*{Msruk-(rJGwkr<1&+(4I~1Ym -z^~8eMnnPS%&$oH}`ud^hJM95oijBFsotuj)%)FWhWrihH0c^}fv|f!EwQS@g#EWm* -z$u>e()K#?_xpx_4P}*WXSnYR#kcd#Js}e9wT3@NZ6a5^CpfHFaU{F9L6i%wfESh-b -zYL8_7t~|B0?8?)PdSE5$lqK%4+G+-DAjN9zC+G-0t=cGa?6}$GRKh!}oYkzk_Z7)4 -z9To0wOByH9`P^1kIR_;E -z#19cS-*S5yD*a~WFIJ8nZT2U8xqjVQ#JOduz}A8yb|jKaTx2e;EQyFw -zC(g_G{!jjcyJ=Ke73;C_#7Yj0=Mm>h!}N^N*;l$~5H?6-$T6|_Axfp3*7!Ry$DH%X -zJ-nl{XNECd%Vcj=xqJ)akFzaL=>LGjX>?drXf10nQ3*h3Hn!*3CthMJvL&f7^)d@8 -zS=;pT=djX`;o@Py5WfN7$k@=1ki^&QnVh)Uy0uh7T$ipFErGQB{5pY@T3#FMwJR4r -zq%+$q#1}$&zdiGYnbbrH;;J%l2_t4XSY2~= -zc5JNxb^CkxdihM=zre;FnDS@2^x|LL-FCe$&)lPW9VP?G%9#3Jb_zlZO#stX0AmAv -z53gFx=dj8$NZ)@rp#M58{QEwiw|Q!*bYOa%9@@K6)lME2R?Sj|No}|R2^7-5kiM69U(bA;e=uu4 -zp+QmSCLJZe`fHub;w2Ld{$@7IN|FdqPL~d#vZd_ud}Vc!$=j9FnN88Q6(O<9V&sYA -zTPnEc2JfB~zu5LOJU~4I*DG -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 -zsq4shchQruamF$dBIXbQq6wcOkZjfQ@Y -z%TY7oGWXrzbA+ef#hXg3Y^8&Mev`DRZe(@m-`Nb(A{-oCsZso@%>%bc!hbf{LP1E0 -z{FWVER}smE7oUnAWsO^ -zk**+9S;LsbpWW`<)a}nqu)Pzbq}Gbs57{T>VeKW}8ntv9_T#KGWa>~9a69OENFXP> -zQ&zsFU6S~mk`T-HkxpA7CtXiC-)S!6;SW(DWYHPap@i-;~g@6g7_nqj4C -zh>dHFqQ~m3uagf~-?SPYDLM!gT8e`R=bB~Ph4+52vsB=^R~DRIkRE17zPaihnu0r# -zTnX3q8V2t17agDF$Ibt}X?DzN+WwgsJ;Df^h->L)qr_~I*|!4@J4ho+T0f*G`ferk -zxRo=@(3Ks3_;*N7w6jqcwBR8b2s{9#tR1CROcZ)-GK%}%64S9vJ@0vcofs-11aJ{> -zW5Ve-G>&Y;_<|CjF*}$~@{Q+>rYt92S=-wdk9f@Ym>BT5@F>{yQ)jnrb~ZAWhJeHJ -zgMUQ-1SKCm5%voVqo4Mdncqr=TS;4=-LN%O*p%Xvi>0g`Q+5=33G*)96uW%SNF*nUU(Om -z%J!DFO~r$BLL4kBr^bBQ^<%fs{LVI(>ooumOC_)vmrIoGN}g!xgl*d55jZSjzQwA~ -z9B{2{;r#1q*gf=TO5q2cggC-Ix|K<`!Ayq;znj*(5CGcJb0IVQE)idj{ezmgxACli -z9dOn9`fn-A=yjwt3VG3t%xMJ-kTDnp@B99s{Be%Qz_nxKS7)an)w1#M@an&RN5bTg -zxYxLA+=A%O+O={S;i6aHDE)YW57l0rCHWc4NAZH{1@Erujw+g`+PTcPvXQ3>{wZp; -z;dS8MoUpXoS`>-Bm54SIfV-HrC^BdymBSvpQnZx5u$$6ycb7lAc@{xxOXGT -zmwxq$f>KG5VfEtYSg-LGZG7nHrvkWwQT96oIROE2hGBIkxH-FDP;~&&Ogd_2{5*)V -znO#jx{qblaR(^Fx~Dxd)o_ -z`p_0x3o)B_#n{#k#{*@Cadl0WHZz6R8Qux!uBT3enajb}kE~PUVvXL(_|$kurhQ*s -z)osKE2J5f+r-N#6gE(E^8Vhuc-A-~qrLS}&Td|^d#IIp#O}5@=%x66CZjVs|K2Yt3fy$W_W+NJxSY2)&c7OwS5t<5(Y6h!4^2el7A*C%m! -z#muIp-bDWV{-DaI*wVR|ydIt!eB&WEmy((dsFtEis{bA-@Zp@bWML&l$owS=2s|yH -z8q4+~RXI=G$f#%UylneK2o^n%OEr~V@V7;<(e=b-)Q}1#jfFR)@u%zsunQ(PkLzNNVn9ZnH(a3D)%s)j2ukO(w -zNP^4R=t1=^Sb8vI>qmVAzaOwNJcXM})?_NQ`Ie=U9~5)27?$a{98u`+Hsg1^ZVJyO#KrtdQi-3cy3N -z@XzyxLuiKVacvUpt4nKa_C|qR6l=tQ_Z~8<(2nf1VIer9g=cCRmbL}?0v5tqp6`P1 -zslM~SOoN3hhThO65@P?Zhx=^xbu(wC+LvZ0Jw{BsBw90WP}+?Yh1DE4P|)Wj{m_P~ -z#Pd=YjULbBlY{Mk85}$H0}9Q>MV}1J&5sjJ%m9FoObBH(%NbwpA!D~N%Q*{wpcp^T -z1dNCc4X3^V%wQ+T;y)LS?G?7(thQ?a0Va|wQ9pJ`04{Mhh>KY>H=mP+We9iY35pS^ -zDmE||9i(QMz-iQ`-fgX?)ycaz40!{qz4t=8>^aAJ@uaWxY@NQRC-dpj?@@piQO4VQ -zdBFa4Ue$1pThwLTxZT`m`xSZUdaDj`2K(VR(u4XJ>yuBB!VO>k6yl405TE^ -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 @@ - - - cc-info-overview-panel.ui -- GnomeLogoVerticalMedium.svg -+ fedora_vertical.png - - -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 +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 diff --git a/gnome-control-center.spec b/gnome-control-center.spec index 97b7918..b05a57b 100644 --- a/gnome-control-center.spec +++ b/gnome-control-center.spec @@ -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 - 40~beta-5 +- Refresh distro logo patch +- Drop Recommends: vino, let vino die! + * Sun Mar 07 2021 Igor Raits - 40~beta-4 - Fix modifications of the networks (Fixes: RHBZ#1932674)