diff --git a/gnome-software.spec b/gnome-software.spec index 0366256..998acbb 100644 --- a/gnome-software.spec +++ b/gnome-software.spec @@ -14,6 +14,8 @@ %bcond malcontent %[!0%{?rhel}] # Disable rpm-ostree support for RHEL builds %bcond rpmostree %[!0%{?rhel}] +# Disable fedora-langpacks subpackage for RHEL builds +%bcond langpacks %[!0%{?rhel}] # this is not a library version %define gs_plugin_version 20 @@ -24,7 +26,7 @@ Name: gnome-software Version: 46.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A software center for GNOME License: GPL-2.0-or-later @@ -90,7 +92,9 @@ Requires: librsvg2%{?_isa} Requires: libxmlb%{?_isa} >= %{libxmlb_version} Recommends: PackageKit%{?_isa} >= %{packagekit_version} +%if %{with langpacks} Recommends: %{name}-fedora-langpacks +%endif Obsoletes: gnome-software-snap < 3.33.1 Obsoletes: gnome-software-editor < 3.35.1 @@ -107,6 +111,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release} These development files are for building gnome-software plugins outside the source tree. Most users do not need this subpackage installed. +%if %{with langpacks} %package fedora-langpacks Summary: Contains fedora-langpacks plugin Requires: %{name}%{?_isa} = %{version}-%{release} @@ -114,6 +119,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release} %description fedora-langpacks The fedora-langpacks plugin ensures langpacks packages are installed for the current locale. +%endif %if %{with rpmostree} %package rpm-ostree @@ -168,6 +174,10 @@ This package includes the rpm-ostree backend. # remove unneeded dpkg plugin rm %{buildroot}%{_libdir}/gnome-software/plugins-%{gs_plugin_version}/libgs_plugin_dpkg.so +%if !%{with langpacks} +rm %{buildroot}%{_libdir}/gnome-software/plugins-%{gs_plugin_version}/libgs_plugin_fedora-langpacks.so +%endif + # make the software center load faster desktop-file-edit %{buildroot}%{_datadir}/applications/org.gnome.Software.desktop \ --set-key=X-AppInstall-Package --set-value=%{name} @@ -246,8 +256,10 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop %{_libexecdir}/gnome-software-cmd %{_libexecdir}/gnome-software-restarter +%if %{with langpacks} %files fedora-langpacks %{_libdir}/gnome-software/plugins-%{gs_plugin_version}/libgs_plugin_fedora-langpacks.so +%endif %if %{with rpmostree} %files rpm-ostree @@ -264,6 +276,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop %{_datadir}/gtk-doc/html/gnome-software/ %changelog +* Mon Jun 03 2024 Milan Crha - 46.2-2 +- Resolves: RHEL-39680 (Build fedora-langpacks subpackage only in Fedora) + * Tue May 28 2024 Milan Crha - 46.2-1 - Resolves: RHEL-38644 (Update to 46.2)