From f3594daa7b62e60a417c6b9cc613d551b44248ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0abata?= Date: Thu, 15 Oct 2020 02:01:25 +0200 Subject: [PATCH] RHEL 9.0.0 Alpha bootstrap The content of this branch was automatically imported from Fedora ELN with the following as its source: https://src.fedoraproject.org/rpms/gnome-tweaks#e620da59b906219ce33fc16d34f22cf3dbad3d06 --- .gitignore | 15 ++ ...pening-system-installed-extensions-i.patch | 30 +++ 0002-extensions-Fix-preferences-opening.patch | 12 ++ gnome-tweaks.spec | 171 ++++++++++++++++++ sources | 1 + 5 files changed, 229 insertions(+) create mode 100644 0001-extensions-Fix-opening-system-installed-extensions-i.patch create mode 100644 0002-extensions-Fix-preferences-opening.patch create mode 100644 gnome-tweaks.spec create mode 100644 sources diff --git a/.gitignore b/.gitignore index e69de29..a93a813 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1,15 @@ +/gnome-tweaks-3.27.92.tar.xz +/gnome-tweaks-3.28.0.tar.xz +/gnome-tweaks-3.28.1.tar.xz +/gnome-tweaks-3.29.2.tar.xz +/gnome-tweaks-3.29.90.1.tar.xz +/gnome-tweaks-3.29.91.1.tar.xz +/gnome-tweaks-3.29.92.tar.xz +/gnome-tweaks-3.30.0.tar.xz +/gnome-tweaks-3.30.1.tar.xz +/gnome-tweaks-3.30.2.tar.xz +/gnome-tweaks-3.31.3.tar.xz +/gnome-tweaks-3.31.90.tar.xz +/gnome-tweaks-3.32.0.tar.xz +/gnome-tweaks-3.33.90.tar.xz +/gnome-tweaks-3.34.0.tar.xz diff --git a/0001-extensions-Fix-opening-system-installed-extensions-i.patch b/0001-extensions-Fix-opening-system-installed-extensions-i.patch new file mode 100644 index 0000000..72938dd --- /dev/null +++ b/0001-extensions-Fix-opening-system-installed-extensions-i.patch @@ -0,0 +1,30 @@ +From ca3581fe34030438c323b7da6b6d08abcd4d391d Mon Sep 17 00:00:00 2001 +From: Kalev Lember +Date: Mon, 19 Nov 2018 11:06:30 +0100 +Subject: [PATCH] extensions: Fix opening system installed extensions in + gnome-software + +When generating the app id that's passed to gnome-software, avoid +hardcoding the 'user' scope and use 'system' scope for system-wide +installed shell extensions. +--- + gtweak/tweaks/tweak_group_shell_extensions.py | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/gtweak/tweaks/tweak_group_shell_extensions.py b/gtweak/tweaks/tweak_group_shell_extensions.py +index 47854a7..284e6e0 100644 +--- a/gtweak/tweaks/tweak_group_shell_extensions.py ++++ b/gtweak/tweaks/tweak_group_shell_extensions.py +@@ -88,7 +88,8 @@ class _ShellExtensionTweak(Gtk.ListBoxRow, Tweak): + self._shell = shell + state = ext.get("state") + uuid = ext["uuid"] +- self._app_id = "user/*/extensions-web/shell-extension/" + uuid.replace('@', '_') + "/*" ++ scope = "user" if ext.get("type") == GnomeShell.EXTENSION_TYPE["PER_USER"] else "system" ++ self._app_id = scope + "/*/*/shell-extension/" + uuid.replace('@', '_') + "/*" + + shell._settings.bind("disable-user-extensions", self, + "sensitive", Gio.SettingsBindFlags.INVERT_BOOLEAN) +-- +2.19.1 + diff --git a/0002-extensions-Fix-preferences-opening.patch b/0002-extensions-Fix-preferences-opening.patch new file mode 100644 index 0000000..d598eaa --- /dev/null +++ b/0002-extensions-Fix-preferences-opening.patch @@ -0,0 +1,12 @@ +diff -up ./gtweak/tweaks/tweak_group_shell_extensions.py.orig ./gtweak/tweaks/tweak_group_shell_extensions.py +--- ./gtweak/tweaks/tweak_group_shell_extensions.py.orig 2019-09-27 13:15:56.000000000 +0200 ++++ ./gtweak/tweaks/tweak_group_shell_extensions.py 2020-04-04 12:47:37.398869243 +0200 +@@ -159,7 +159,7 @@ class _ShellExtensionTweak(Gtk.ListBoxRo + sw.set_active(False) + + def _on_configure_clicked(self, btn, uuid): +- execute_subprocess(['gnome-shell-extension-prefs', uuid], block=False) ++ execute_subprocess(['gnome-extensions', 'prefs', uuid], block=False) + + def _on_extension_toggled(self, sw, active, uuid): + if not sw.get_active(): diff --git a/gnome-tweaks.spec b/gnome-tweaks.spec new file mode 100644 index 0000000..72e2c29 --- /dev/null +++ b/gnome-tweaks.spec @@ -0,0 +1,171 @@ +%global majorversion %(cut -d "." -f 1-2 <<<%{version}) + +Name: gnome-tweaks +Version: 3.34.0 +Release: 6%{?dist} +Summary: Customize advanced GNOME 3 options + +# Software is GPLv3, Appdata file is CC0-1.0 +License: GPLv3 and CC0 +URL: https://wiki.gnome.org/action/show/Apps/Tweaks +Source0: https://download.gnome.org/sources/%{name}/%{majorversion}/%{name}-%{version}.tar.xz + +# Fix opening system installed extensions in gnome-software +# https://gitlab.gnome.org/GNOME/gnome-tweaks/merge_requests/25 +Patch0: 0001-extensions-Fix-opening-system-installed-extensions-i.patch +# Fix extension preferences with gnome-extensions instead of +# gnome-shell-extension-prefs +# https://bugzilla.redhat.com/show_bug.cgi?id=1820396#c2 +Patch1: 0002-extensions-Fix-preferences-opening.patch + +BuildRequires: desktop-file-utils +BuildRequires: gettext +BuildRequires: libappstream-glib +BuildRequires: meson +BuildRequires: python3-devel +Requires: gnome-desktop3 +Requires: gnome-settings-daemon +Requires: gnome-shell +Requires: gnome-shell-extension-user-theme +Requires: gobject-introspection +Requires: gsettings-desktop-schemas +Requires: gtk3 +Requires: libhandy +Requires: libnotify +Requires: libsoup +Requires: mutter +Requires: pango +Requires: python3dist(pygobject) +Provides: gnome-tweak-tool = %{version}-%{release} +Obsoletes: gnome-tweak-tool < 3.27.3-4 +BuildArch: noarch + +%description +GNOME Tweaks allows adjusting advanced configuration settings in GNOME 3. This +includes things like the fonts used in user interface elements, alternative user +interface themes, changes in window management behavior, GNOME Shell appearance +and extension, etc. + + +%prep +%autosetup -p1 + + +%build +%meson +%meson_build + + +%install +%meson_install + +# Update the screenshot shown in the software center +# +# NOTE: It would be *awesome* if this file was pushed upstream. +# +# See http://people.freedesktop.org/~hughsient/appdata/#screenshots for more details. +# +appstream-util replace-screenshots $RPM_BUILD_ROOT%{_datadir}/metainfo/org.gnome.tweaks.appdata.xml \ + https://raw.githubusercontent.com/hughsie/fedora-appstream/master/screenshots-extra/gnome-tweak-tool/a.png \ + https://raw.githubusercontent.com/hughsie/fedora-appstream/master/screenshots-extra/gnome-tweak-tool/b.png + +%find_lang %{name} + + +%check +desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/*.desktop +appstream-util validate-relax --nonet $RPM_BUILD_ROOT/%{_datadir}/metainfo/*.appdata.xml + + +%files -f %{name}.lang +%doc AUTHORS NEWS README.md +%license LICENSES/ +%{_bindir}/%{name} +%{_libexecdir}/gnome-tweak-tool-lid-inhibitor +%{python3_sitelib}/gtweak/ +%{_datadir}/metainfo/*.appdata.xml +%{_datadir}/applications/*.desktop +%{_datadir}/%{name}/ +%{_datadir}/icons/hicolor/*/apps/org.gnome.tweaks.svg +%{_datadir}/icons/hicolor/symbolic/apps/org.gnome.tweaks-symbolic.svg + + +%changelog +* Mon Jul 27 2020 Fedora Release Engineering - 3.34.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Tue May 26 2020 Miro Hrončok - 3.34.0-5 +- Rebuilt for Python 3.9 + +* Sat Apr 04 2020 Mohamed El Morabity - 3.34.0-4 +- Fix extension preferences opening (RHBZ #1820396) + +* Sat Mar 28 2020 Mohamed El Morabity - 3.34.0-3 +- Add dependency on gnome-extensions-app (RHBZ #1812779) + +* Tue Jan 28 2020 Fedora Release Engineering - 3.34.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Fri Sep 27 2019 Kalev Lember - 3.34.0-1 +- Update to 3.34.0 + +* Mon Aug 19 2019 Miro Hrončok - 3.33.90-2 +- Rebuilt for Python 3.8 + +* Fri Aug 09 2019 Mohamed El Morabity - 3.33.90-1 +- Update to 3.33.90 + +* Thu Jul 25 2019 Fedora Release Engineering - 3.32.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Wed Jun 19 2019 Mohamed El Morabity - 3.32.0-2 +- Fix typo in Provides version (RHBZ #1721864) + +* Mon Mar 11 2019 Kalev Lember - 3.32.0-1 +- Update to 3.32.0 + +* Wed Feb 06 2019 Kalev Lember - 3.31.90-1 +- Update to 3.31.90 + +* Thu Jan 31 2019 Fedora Release Engineering - 3.31.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Wed Jan 23 2019 Kalev Lember - 3.31.3-1 +- Update to 3.31.3 + +* Wed Dec 19 2018 Kalev Lember - 3.30.2-1 +- Update to 3.30.2 +- Fix opening system installed extensions in gnome-software + +* Fri Sep 28 2018 Kalev Lember - 3.30.1-1 +- Update to 3.30.1 + +* Thu Sep 06 2018 Mohamed El Morabity - 3.30.0-1 +- Update to 3.30.0 + +* Wed Aug 29 2018 Mohamed El Morabity - 3.29.92-1 +- Update to 3.29.92 + +* Mon Aug 13 2018 Kalev Lember - 3.29.91.1-1 +- Update to 3.29.91.1 + +* Fri Aug 03 2018 Mohamed El Morabity - 3.29.90.1-1 +- Update to 3.29.90.1 + +* Fri Jul 13 2018 Fedora Release Engineering - 3.29.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Tue Jun 19 2018 Miro Hrončok - 3.29.2-2 +- Rebuilt for Python 3.7 + +* Mon May 21 2018 Mohamed El Morabity - 3.29.2-1 +- Update to 3.29.2 + +* Sun Apr 08 2018 Kalev Lember - 3.28.1-1 +- Update to 3.28.1 + +* Mon Mar 12 2018 Mohamed El Morabity - 3.28.0-1 +- Update to 3.28.0 + +* Fri Mar 09 2018 Mohamed El Morabity - 3.27.92-1 +- Initial RPM release, based on gnome-tweak-tool.spec diff --git a/sources b/sources new file mode 100644 index 0000000..15bd679 --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (gnome-tweaks-3.34.0.tar.xz) = 1d2b21a31550d4b48afd02a9fcfb9844eacac7aa726ef624abcb40225af31da29b34e9032b3bb2943e5cb5f7553a6f931467d04bfbc2b026732e6bdcb86eb840