diff --git a/.gitignore b/.gitignore index e69de29..242b4a7 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1,32 @@ +/gnome-control-center-3.28.1.tar.xz +/gnome-control-center-3.28.2.tar.xz +/gnome-control-center-3.29.90.tar.xz +/gnome-control-center-3.30.0.tar.xz +/gnome-control-center-3.30.1.tar.xz +/gnome-control-center-3.30.2.tar.xz +/gnome-control-center-3.31.4.tar.xz +/gnome-control-center-3.31.90.tar.xz +/gnome-control-center-3.31.92.tar.xz +/gnome-control-center-3.32.0.tar.xz +/gnome-control-center-3.32.0.1.tar.xz +/gnome-control-center-3.32.1.tar.xz +/gnome-control-center-3.32.2.tar.xz +/gnome-control-center-3.33.3.tar.xz +/gnome-control-center-3.33.90.tar.xz +/gnome-control-center-3.34.0.tar.xz +/gnome-control-center-3.34.0.1.tar.xz +/gnome-control-center-3.34.1.tar.xz +/gnome-control-center-3.34.2.tar.xz +/gnome-control-center-3.35.90.tar.xz +/gnome-control-center-3.35.91.tar.xz +/gnome-control-center-3.35.92.tar.xz +/gnome-control-center-3.36.0.tar.xz +/gnome-control-center-3.36.1.tar.xz +/gnome-control-center-3.36.2.tar.xz +/gnome-control-center-3.36.3.tar.xz +/gnome-control-center-3.36.4.tar.xz +/gnome-control-center-3.37.3.tar.xz +/gnome-control-center-3.37.90.tar.xz +/gnome-control-center-3.37.92.tar.xz +/gnome-control-center-3.38.0.tar.xz +/gnome-control-center-3.38.1.tar.xz diff --git a/distro-logo.patch b/distro-logo.patch new file mode 100644 index 0000000..a7924b0 --- /dev/null +++ b/distro-logo.patch @@ -0,0 +1,351 @@ +From dccda5d9604a39706a8708c9393d3d8f3ed2a00b 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 + +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. + +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 +--- + .../info-overview/GnomeLogoVerticalMedium.svg | 134 ------------------ + .../info-overview/cc-info-overview-panel.ui | 2 +- + panels/info-overview/fedora_vertical.png | Bin 0 -> 6979 bytes + .../info-overview/info-overview.gresource.xml | 2 +- + panels/info-overview/meson.build | 2 +- + 5 files changed, 3 insertions(+), 137 deletions(-) + delete mode 100644 panels/info-overview/GnomeLogoVerticalMedium.svg + create mode 100644 panels/info-overview/fedora_vertical.png + +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/panels/info-overview/cc-info-overview-panel.ui b/panels/info-overview/cc-info-overview-panel.ui +index de377bb69..4fab10973 100644 +--- a/panels/info-overview/cc-info-overview-panel.ui ++++ b/panels/info-overview/cc-info-overview-panel.ui +@@ -30,7 +30,7 @@ + + True + False +- /org/gnome/control-center/info-overview/GnomeLogoVerticalMedium.svg ++ /org/gnome/control-center/info-overview/fedora_vertical.png + + + 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 abbaf3218..e5b18853d 100644 +--- a/panels/info-overview/meson.build ++++ b/panels/info-overview/meson.build +@@ -29,7 +29,7 @@ sources = files( + ) + + resource_data = files( +- 'GnomeLogoVerticalMedium.svg', ++ 'fedora_vertical.png', + 'cc-info-overview-panel.ui' + ) + +-- +2.24.1 + diff --git a/gnome-control-center.spec b/gnome-control-center.spec new file mode 100644 index 0000000..93ef7bb --- /dev/null +++ b/gnome-control-center.spec @@ -0,0 +1,394 @@ +%define gnome_online_accounts_version 3.25.3 +%define glib2_version 2.56.0 +%define gnome_desktop_version 3.35.4 +%define gsd_version 3.35.0 +%define gsettings_desktop_schemas_version 3.31.0 +%define upower_version 0.99.8 +%define gtk3_version 3.22.20 +%define cheese_version 3.28.0 +%define gnome_bluetooth_version 3.18.2 +%define nm_version 1.24 + +Name: gnome-control-center +Version: 3.38.1 +Release: 2%{?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/3.38/gnome-control-center-%{version}.tar.xz + +# https://bugzilla.gnome.org/show_bug.cgi?id=695691 +Patch0: distro-logo.patch + +# https://teams.fedoraproject.org/project/silverblue/us/127 +Patch1: info-model-for-lenovo.patch + +BuildRequires: chrpath +BuildRequires: cups-devel +BuildRequires: desktop-file-utils +BuildRequires: docbook-style-xsl libxslt +BuildRequires: gcc +BuildRequires: gettext +BuildRequires: meson +BuildRequires: git +BuildRequires: pkgconfig(accountsservice) +BuildRequires: pkgconfig(cheese) >= %{cheese_version} +BuildRequires: pkgconfig(cheese-gtk) +BuildRequires: pkgconfig(clutter-gtk-1.0) +BuildRequires: pkgconfig(colord) +BuildRequires: pkgconfig(colord-gtk) +BuildRequires: pkgconfig(gdk-pixbuf-2.0) +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) >= %{gnome_online_accounts_version} +BuildRequires: pkgconfig(goa-backend-1.0) +BuildRequires: pkgconfig(grilo-0.3) +BuildRequires: pkgconfig(gsettings-desktop-schemas) >= %{gsettings_desktop_schemas_version} +BuildRequires: pkgconfig(gsound) +BuildRequires: pkgconfig(gtk+-3.0) >= %{gtk3_version} +BuildRequires: pkgconfig(gudev-1.0) +BuildRequires: pkgconfig(ibus-1.0) +BuildRequires: pkgconfig(libcanberra-gtk3) +BuildRequires: pkgconfig(libgtop-2.0) +BuildRequires: pkgconfig(libhandy-1) +BuildRequires: pkgconfig(libnm) >= %{nm_version} +BuildRequires: pkgconfig(libnma) +BuildRequires: pkgconfig(libpulse) +BuildRequires: pkgconfig(libpulse-mainloop-glib) +BuildRequires: pkgconfig(libsecret-1) +BuildRequires: pkgconfig(libsoup-2.4) +BuildRequires: pkgconfig(libxml-2.0) +BuildRequires: pkgconfig(mm-glib) +BuildRequires: pkgconfig(polkit-gobject-1) +BuildRequires: pkgconfig(pwquality) +BuildRequires: pkgconfig(smbclient) +BuildRequires: pkgconfig(upower-glib) >= %{upower_version} +BuildRequires: pkgconfig(x11) +BuildRequires: pkgconfig(xi) +BuildRequires: pkgconfig(udisks2) +%ifnarch s390 s390x +BuildRequires: pkgconfig(gnome-bluetooth-1.0) >= %{gnome_bluetooth_version} +BuildRequires: pkgconfig(libwacom) +%endif + +# Versioned library deps +Requires: cheese-libs%{?_isa} >= %{cheese_version} +Requires: glib2%{?_isa} >= %{glib2_version} +Requires: gnome-desktop3%{?_isa} >= %{gnome_desktop_version} +Requires: gnome-online-accounts%{?_isa} >= %{gnome_online_accounts_version} +Requires: gnome-settings-daemon%{?_isa} >= %{gsd_version} +Requires: gsettings-desktop-schemas%{?_isa} >= %{gsettings_desktop_schemas_version} +Requires: gtk3%{?_isa} >= %{gtk3_version} +Requires: upower%{?_isa} >= %{upower_version} +%ifnarch s390 s390x +Requires: gnome-bluetooth%{?_isa} >= 1:%{gnome_bluetooth_version} +%endif + +Requires: %{name}-filesystem = %{version}-%{release} +# For user accounts +Requires: accountsservice +Requires: alsa-lib +# For the thunderbolt panel +Recommends: bolt +# For the color panel +Requires: colord +# For the printers panel +Requires: cups-pk-helper +Requires: dbus +# For the info/details panel +Requires: glx-utils +# For the user languages +Requires: iso-codes +# For the network panel +Recommends: NetworkManager-wifi +Recommends: nm-connection-editor +# For Show Details in the color panel +Recommends: gnome-color-manager +# For the sharing panel +Recommends: gnome-remote-desktop +%if 0%{?fedora} +Recommends: rygel +%endif +Recommends: vino +# For the info/details panel +Requires: switcheroo-control +# For the keyboard panel +Requires: /usr/bin/gkbd-keyboard-display + +# Renamed in F28 +Provides: control-center = 1:%{version}-%{release} +Provides: control-center%{?_isa} = 1:%{version}-%{release} +Obsoletes: control-center < 1:%{version}-%{release} + +%description +This package contains configuration utilities for the GNOME desktop, which +allow to configure accessibility options, desktop fonts, keyboard and mouse +properties, sound setup, desktop theme and background, user interface +properties, screen resolution, and other settings. + +%package filesystem +Summary: GNOME Control Center directories +# NOTE: this is an "inverse dep" subpackage. It gets pulled in +# NOTE: by the main package and MUST not depend on the main package +BuildArch: noarch +# Renamed in F28 +Provides: control-center-filesystem = 1:%{version}-%{release} +Obsoletes: control-center-filesystem < 1:%{version}-%{release} + +%description filesystem +The GNOME control-center provides a number of extension points +for applications. This package contains directories where applications +can install configuration files that are picked up by the control-center +utilities. + +%prep +%autosetup -p1 -S git + +%build +%meson -Ddocumentation=true +%meson_build + +%install +%meson_install + +# We do want this +mkdir -p $RPM_BUILD_ROOT%{_datadir}/gnome/wm-properties + +# We don't want these +rm -rf $RPM_BUILD_ROOT%{_datadir}/gnome/autostart +rm -rf $RPM_BUILD_ROOT%{_datadir}/gnome/cursor-fonts + +# Remove rpath +chrpath --delete $RPM_BUILD_ROOT%{_bindir}/gnome-control-center + +%find_lang %{name} --all-name --with-gnome + +%files -f %{name}.lang +%license COPYING +%doc NEWS README.md +%{_bindir}/gnome-control-center +%{_datadir}/applications/*.desktop +%{_datadir}/bash-completion/completions/gnome-control-center +%{_datadir}/dbus-1/services/org.gnome.ControlCenter.SearchProvider.service +%{_datadir}/dbus-1/services/org.gnome.ControlCenter.service +%{_datadir}/gettext/ +%{_datadir}/glib-2.0/schemas/org.gnome.ControlCenter.gschema.xml +%{_datadir}/gnome-control-center/keybindings/*.xml +%{_datadir}/gnome-control-center/pixmaps +%{_datadir}/gnome-shell/search-providers/gnome-control-center-search-provider.ini +%{_datadir}/icons/hicolor/*/*/* +%{_datadir}/man/man1/gnome-control-center.1* +%{_datadir}/metainfo/gnome-control-center.appdata.xml +%{_datadir}/pixmaps/faces +%{_datadir}/pkgconfig/gnome-keybindings.pc +%{_datadir}/polkit-1/actions/org.gnome.controlcenter.*.policy +%{_datadir}/polkit-1/rules.d/gnome-control-center.rules +%{_datadir}/sounds/gnome/default/*/*.ogg +%{_libexecdir}/cc-remote-login-helper +%{_libexecdir}/gnome-control-center-search-provider +%{_libexecdir}/gnome-control-center-print-renderer + +%files filesystem +%dir %{_datadir}/gnome-control-center +%dir %{_datadir}/gnome-control-center/keybindings +%dir %{_datadir}/gnome/wm-properties + +%changelog +* Tue Oct 13 2020 Kalev Lember - 3.38.1-2 +- Add Recommends: nm-connection-editor for the network panel (#1887891) + +* Mon Oct 5 2020 Kalev Lember - 3.38.1-1 +- Update to 3.38.1 + +* Sat Sep 19 2020 Yaroslav Fedevych - 3.38.0-2 +- Specify the minimum libnm version needed to build the package + +* Sat Sep 12 2020 Kalev Lember - 3.38.0-1 +- Update to 3.38.0 + +* Sun Sep 06 2020 Kalev Lember - 3.37.92-1 +- Update to 3.37.92 + +* Mon Aug 17 2020 Kalev Lember - 3.37.90-1 +- Update to 3.37.90 + +* Tue Aug 04 2020 Michael Catanzaro - 3.37.3-4 +- Add Recommends: gnome-color-manager for the color panel + +* Sat Aug 01 2020 Fedora Release Engineering - 3.37.3-3 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Mon Jul 27 2020 Fedora Release Engineering - 3.37.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Mon Jul 20 2020 Kalev Lember - 3.37.3-1 +- Update to 3.37.3 + +* Mon Jul 20 2020 Kalev Lember - 3.36.4-1 +- Update to 3.36.4 + +* Wed Jun 03 2020 Kalev Lember - 3.36.3-1 +- Update to 3.36.3 + +* Fri May 01 2020 Kalev Lember - 3.36.2-1 +- Update to 3.36.2 + +* Tue Apr 28 2020 Felipe Borges - 3.36.1-2 +- Add "Model" row info for Lenovo devices + +* Fri Mar 27 2020 Kalev Lember - 3.36.1-1 +- Update to 3.36.1 + +* Thu Mar 19 2020 Michael Catanzaro - 3.36.0-3 +- No changes, bump revision to maintain upgrade path from F32 + +* Mon Mar 16 2020 Michael Catanzaro - 3.36.0-2 +- Update distro-logo.patch to use fedora_vertical version of logo. + +* Sat Mar 07 2020 Kalev Lember - 3.36.0-1 +- Update to 3.36.0 + +* Mon Mar 02 2020 Kalev Lember - 3.35.92-1 +- Update to 3.35.92 + +* Mon Feb 17 2020 Kalev Lember - 3.35.91-1 +- Update to 3.35.91 + +* Mon Feb 03 2020 Bastien Nocera - 3.35.90-1 ++ gnome-control-center-3.35.90-1 +- Update to 3.35.90 + +* Tue Jan 28 2020 Fedora Release Engineering - 3.34.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Thu Jan 16 2020 Kalev Lember - 3.34.2-3 +- Backport a patch to fix the build with latest libgnome-desktop + +* Mon Dec 09 2019 Michael Catanzaro - 3.34.2-2 +- Drop nm-connection-editor requires, per gnome-control-center#512 +- To edit mobile broadband connections, install nm-connection-editor + +* Wed Nov 27 2019 Kalev Lember - 3.34.2-1 +- Update to 3.34.2 + +* Thu Oct 10 2019 Adam Williamson - 3.34.1-4 +- Add patch to fix crash when selecting display with no modes (rhbz#1756553) + +* Wed Oct 09 2019 Felipe Borges - 3.34.1-3 +- Add patch to fix parsing of addresses while adding printers (rhbz#1750394) + +* Mon Oct 07 2019 Benjamin Berg - 3.34.1-2 +- Add patch to fix resetting of system wide format locale (rhbz#1759221) + +* Mon Oct 07 2019 Kalev Lember - 3.34.1-1 +- Update to 3.34.1 + +* Sat Oct 05 2019 Michael Catanzaro - 3.34.0.1-3 +- Add patch to fix editing wired connection settings (rhbz#1750805) +- Remove broken remote printers patch + +* Wed Oct 02 2019 Michael Catanzaro - 3.34.0.1-2 +- Add patch to fix crash when configuring remote printers + +* Mon Sep 09 2019 Kalev Lember - 3.34.0.1-1 +- Update to 3.34.0.1 + +* Mon Sep 09 2019 Kalev Lember - 3.34.0-1 +- Update to 3.34.0 + +* Mon Aug 12 2019 Kalev Lember - 3.33.90-1 +- Update to 3.33.90 + +* Thu Jul 25 2019 Fedora Release Engineering - 3.33.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Sun Jul 21 2019 Kalev Lember - 3.33.3-2 +- Remove libXxf86misc-devel BuildRequires as the package no longer exists + +* Wed Jun 19 2019 Kalev Lember - 3.33.3-1 +- Update to 3.33.3 + +* Fri May 24 2019 Kalev Lember - 3.32.2-1 +- Update to 3.32.2 + +* Tue Apr 16 2019 Adam Williamson - 3.32.1-2 +- Rebuild with Meson fix for #1699099 + +* Fri Mar 29 2019 Kalev Lember - 3.32.1-1 +- Update to 3.32.1 + +* Mon Mar 11 2019 Kalev Lember - 3.32.0.1-1 +- Update to 3.32.0.1 + +* Mon Mar 11 2019 Kalev Lember - 3.32.0-1 +- Update to 3.32.0 + +* Mon Mar 04 2019 Kalev Lember - 3.31.92-1 +- Update to 3.31.92 + +* Sat Feb 23 2019 Kevin Fenzi - 3.31.90-2 +- Add https://gitlab.gnome.org/GNOME/gnome-control-center/merge_requests/387.patch + to fix udisks crash + +* Thu Feb 07 2019 Kalev Lember - 3.31.90-1 +- Update to 3.31.90 + +* Thu Jan 31 2019 Fedora Release Engineering - 3.31.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Wed Jan 09 2019 Kalev Lember - 3.31.4-1 +- Update to 3.31.4 + +* Tue Nov 20 2018 Pete Walter - 3.30.2-3 +- Recommend gnome-remote-desktop for the sharing panel + +* Sat Nov 17 2018 Pete Walter - 3.30.2-2 +- Change bolt requires to recommends (#1643709) +- Change rygel requires to recommends + +* Thu Nov 01 2018 Kalev Lember - 3.30.2-1 +- Update to 3.30.2 + +* Thu Oct 11 2018 David Herrmann - 3.30.1-4 +- Reduce 'dbus-x11' dependency to 'dbus'. The xinit scripts are no longer the + canonical way to start dbus, but the 'dbus' package is nowadays required to + provide a user and system bus to its dependents. + +* Wed Oct 10 2018 Benjamin Berg - 3.30.1-3 +- Add patch to improve background loading. The patch is not acceptable + upstream as is, but is also a good improvement on the current situation + (#1631002) + +* Sun Oct 07 2018 Kalev Lember - 3.30.1-2 +- Backport an upstream fix for a crash in the online accounts panel + +* Wed Sep 26 2018 Kalev Lember - 3.30.1-1 +- Update to 3.30.1 + +* Thu Sep 06 2018 Kalev Lember - 3.30.0-1 +- Update to 3.30.0 + +* Sun Aug 12 2018 Kalev Lember - 3.29.90-1 +- Update to 3.29.90 + +* Fri Jul 13 2018 Fedora Release Engineering - 3.28.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Tue May 29 2018 Kalev Lember - 3.28.2-1 +- Update to 3.28.2 + +* Wed May 23 2018 Pete Walter - 3.28.1-4 +- Change NetworkManager-wifi requires to recommends (#1478661) + +* Tue May 22 2018 Ray Strode - 3.28.1-3 +- Change vino requires to a vino recommends + +* Fri Apr 13 2018 Kalev Lember - 3.28.1-2 +- Backport new thunderbolt panel + +* Tue Apr 10 2018 Pete Walter - 3.28.1-1 +- Rename control-center to gnome-control-center diff --git a/info-model-for-lenovo.patch b/info-model-for-lenovo.patch new file mode 100644 index 0000000..f2db219 --- /dev/null +++ b/info-model-for-lenovo.patch @@ -0,0 +1,129 @@ +From cb0c026adad0b3c892d3bb84366ed871d920e97d Mon Sep 17 00:00:00 2001 +From: Felipe Borges +Date: Tue, 28 Apr 2020 12:32:05 +0200 +Subject: [PATCH] info: Add device "Model" row for Lenovo + +Since we will be shipping Fedora 32 in some Lenovo devices[0], we +were asked to add an entry in Settings with a string identifying +the laptop model for users to look at while reporting issues[1]. + +Ideally this logic should live in systemd-hostnamed and be generic +enough to handle vendors and their particular ways of exposing this +info in userspace. Unfortunately the release is at the door now and +that work would require us some more time. Its development is ongoing +upstream[2] but won't likely be ready for the F32 that should happen +at any moment this week. + +[0] https://fedoramagazine.org/coming-soon-fedora-on-lenovo-laptops +[1] https://teams.fedoraproject.org/project/silverblue/us/127 +[2] https://github.com/systemd/systemd/issues/15493 and +https://github.com/systemd/systemd/pull/15531 +--- + panels/info-overview/cc-info-overview-panel.c | 42 +++++++++++++++++++ + .../info-overview/cc-info-overview-panel.ui | 9 ++++ + 2 files changed, 51 insertions(+) + +diff --git a/panels/info-overview/cc-info-overview-panel.c b/panels/info-overview/cc-info-overview-panel.c +index 98c77e97f..1b9916ac7 100644 +--- a/panels/info-overview/cc-info-overview-panel.c ++++ b/panels/info-overview/cc-info-overview-panel.c +@@ -62,6 +62,7 @@ struct _CcInfoOverviewPanel + CcListRow *disk_row; + CcListRow *gnome_version_row; + CcListRow *graphics_row; ++ CcListRow *device_model_row; + GtkListBox *hardware_box; + GtkDialog *hostname_editor; + CcHostnameEntry *hostname_entry; +@@ -417,6 +418,41 @@ get_graphics_hardware_string (void) + return g_strdup (renderer); + } + ++static gchar * ++get_device_model_string (void) ++{ ++ g_autofree char *vendor = NULL; ++ g_autoptr(GError) error = NULL; ++ gchar *model = NULL; ++ ++ if (g_file_get_contents ("/sys/class/dmi/id/sys_vendor", &vendor, NULL, &error)) ++ { ++ if (g_error_matches (error, G_FILE_ERROR, G_FILE_ERROR_NOENT)) ++ return NULL; ++ ++ vendor = g_strchomp (vendor); ++ if ((g_strcmp0 (vendor, "LENOVO") != 0) && (g_strcmp0 (vendor, "lenovo") != 0)) ++ return NULL; ++ ++ if (g_file_get_contents ("/sys/class/dmi/id/product_version", &model, NULL, &error)) ++ { ++ if (g_error_matches (error, G_FILE_ERROR, G_FILE_ERROR_NOENT)) ++ return NULL; ++ ++ model = g_strchomp (model); ++ if (g_strcmp0 (model, "") == 0) { ++ g_free (model); ++ ++ return NULL; ++ } ++ ++ return model; ++ } ++ } ++ ++ return NULL; ++} ++ + static char * + get_os_name (void) + { +@@ -692,6 +728,7 @@ info_overview_panel_setup_overview (CcInfoOverviewPanel *self) + g_autofree char *os_type_text = NULL; + g_autofree char *os_name_text = NULL; + g_autofree gchar *graphics_hardware_string = NULL; ++ g_autofree gchar *device_model_string = NULL; + + if (load_gnome_version (&gnome_version, NULL, NULL)) + cc_list_row_set_secondary_label (self->gnome_version_row, gnome_version); +@@ -717,6 +754,10 @@ info_overview_panel_setup_overview (CcInfoOverviewPanel *self) + + graphics_hardware_string = get_graphics_hardware_string (); + cc_list_row_set_secondary_markup (self->graphics_row, graphics_hardware_string); ++ ++ device_model_string = get_device_model_string (); ++ cc_list_row_set_secondary_markup (self->device_model_row, device_model_string); ++ gtk_widget_set_visible (GTK_WIDGET (self->device_model_row), (device_model_string != NULL)); + } + + static gboolean +@@ -819,6 +860,7 @@ cc_info_overview_panel_class_init (CcInfoOverviewPanelClass *klass) + gtk_widget_class_bind_template_child (widget_class, CcInfoOverviewPanel, disk_row); + gtk_widget_class_bind_template_child (widget_class, CcInfoOverviewPanel, gnome_version_row); + gtk_widget_class_bind_template_child (widget_class, CcInfoOverviewPanel, graphics_row); ++ gtk_widget_class_bind_template_child (widget_class, CcInfoOverviewPanel, device_model_row); + gtk_widget_class_bind_template_child (widget_class, CcInfoOverviewPanel, hardware_box); + gtk_widget_class_bind_template_child (widget_class, CcInfoOverviewPanel, hostname_editor); + gtk_widget_class_bind_template_child (widget_class, CcInfoOverviewPanel, hostname_entry); +diff --git a/panels/info-overview/cc-info-overview-panel.ui b/panels/info-overview/cc-info-overview-panel.ui +index de377bb69..e2d18c48b 100644 +--- a/panels/info-overview/cc-info-overview-panel.ui ++++ b/panels/info-overview/cc-info-overview-panel.ui +@@ -68,6 +68,15 @@ + + + ++ ++ ++ ++ False ++ False ++ Model ++ ++ ++ + + + +-- +2.26.1 + diff --git a/sources b/sources new file mode 100644 index 0000000..0bb00c9 --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (gnome-control-center-3.38.1.tar.xz) = 1627788b88fa556279aaf68fb34ec438c0bfa972446876a02013a4ec3f7680eaab9c25ce623fcb244a48133360cac017012bad965c52240a7612a32d9fa565e1