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

Resolves: RHEL-39680 (Re-enable build of the fedora-langpacks subpackage in RHEL)

Browse Source
This commit is contained in:
Milan Crha 2024-07-08 10:41:38 +02:00
parent a82905c13c
commit ddc80d8900
2 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
0001-fedora-langpacks-for-rhel.patch Normal file
View File

@ -0,0 +1,15 @@
diff --git a/plugins/fedora-langpacks/gs-plugin-fedora-langpacks.c b/plugins/fedora-langpacks/gs-plugin-fedora-langpacks.c
index ae91005bed..39780cc061 100644
--- a/plugins/fedora-langpacks/gs-plugin-fedora-langpacks.c
+++ b/plugins/fedora-langpacks/gs-plugin-fedora-langpacks.c
@@ -30,7 +30,8 @@ gs_plugin_fedora_langpacks_init (GsPluginFedoraLangpacks *self)
GsPlugin *plugin = GS_PLUGIN (self);
/* this plugin should be fedora specific */
- if (!gs_plugin_check_distro_id (plugin, "fedora")) {
+ if (!gs_plugin_check_distro_id (plugin, "fedora") &&
+ !gs_plugin_check_distro_id (plugin, "rhel")) {
gs_plugin_set_enabled (plugin, FALSE);
return;
}

11
gnome-software.spec
View File

@ -14,8 +14,8 @@
%bcond malcontent %[!0%{?rhel}] %bcond malcontent %[!0%{?rhel}]
# Disable rpm-ostree support for RHEL builds # Disable rpm-ostree support for RHEL builds
%bcond rpmostree %[!0%{?rhel}] %bcond rpmostree %[!0%{?rhel}]
# Disable fedora-langpacks subpackage for RHEL builds # this is to be able to disable fedora-langpacks subpackage build
%bcond langpacks %[!0%{?rhel}] %bcond langpacks %[1]
# this is not a library version # this is not a library version
%define gs_plugin_version 20 %define gs_plugin_version 20
@ -26,13 +26,15 @@
Name: gnome-software Name: gnome-software
Version: 46.3 Version: 46.3
Release: 1%{?dist} Release: 2%{?dist}
Summary: A software center for GNOME Summary: A software center for GNOME
License: GPL-2.0-or-later License: GPL-2.0-or-later
URL: https://apps.gnome.org/Software URL: https://apps.gnome.org/Software
Source0: https://download.gnome.org/sources/gnome-software/46/%{name}-%{tarball_version}.tar.xz Source0: https://download.gnome.org/sources/gnome-software/46/%{name}-%{tarball_version}.tar.xz
Patch: 0001-fedora-langpacks-for-rhel.patch
# ostree and flatpak not on i686 for RHEL 10 # ostree and flatpak not on i686 for RHEL 10
# https://github.com/containers/composefs/pull/229#issuecomment-1838735764 # https://github.com/containers/composefs/pull/229#issuecomment-1838735764
%if 0%{?rhel} >= 10 %if 0%{?rhel} >= 10
@ -276,6 +278,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
%{_datadir}/gtk-doc/html/gnome-software/ %{_datadir}/gtk-doc/html/gnome-software/
%changelog %changelog
* Mon Jul 08 2024 Milan Crha <mcrha@redhat.com> - 46.3-2
- Resolves: RHEL-39680 (Re-enable build of the fedora-langpacks subpackage in RHEL)
* Mon Jul 01 2024 Milan Crha <mcrha@redhat.com> - 46.3-1 * Mon Jul 01 2024 Milan Crha <mcrha@redhat.com> - 46.3-1
- Resolves: RHEL-45603 (Update to 46.3) - Resolves: RHEL-45603 (Update to 46.3)