Skip to content

Commit

Permalink
Do not build python3-dnf-plugins-qubes-hooks on Fedora >= 41
Browse files Browse the repository at this point in the history
It's not relevant for DNF5 anymore.
Since that subpackage had the only BR: python3-devel, move it to the
main package for "qubesagent" python package build.

QubesOS/qubes-issues#9244

(cherry picked from commit fd441f0)
  • Loading branch information
marmarek committed Nov 5, 2024
1 parent 42d714d commit 4f6ab9b
Showing 1 changed file with 8 additions and 1 deletion.
9 changes: 8 additions & 1 deletion rpm_spec/core-agent.spec.in
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,7 @@ BuildRequires: qubes-utils-devel >= 4.2.17
BuildRequires: qubes-libvchan-%{?qubes_backend_vmm}%{?!qubes_backend_vmm:@BACKEND_VMM@}-devel
BuildRequires: pam-devel
BuildRequires: python%{python3_pkgversion}-setuptools
BuildRequires: python%{python3_pkgversion}-devel
BuildRequires: systemd
%if 0%{?rhel} >= 8
BuildRequires: redhat-lsb
Expand Down Expand Up @@ -230,6 +231,8 @@ Requires: (gnome-keyring if xdg-desktop-portal)
%description
The Qubes core files for installation inside a Qubes VM.

%if 0%{?fedora} < 41
# not relevant anymore with DNF5
%if 0%{?rhel} == 8
%package -n python3-dnf-plugins-qubes-hooks
Summary: DNF plugin for Qubes specific post-installation actions
Expand Down Expand Up @@ -257,6 +260,7 @@ DNF plugin for Qubes specific post-installation actions:
* notify dom0 that updates were installed
* refresh applications shortcut list
%endif
%endif

%if 0%{?rhel} != 7
%package caja
Expand Down Expand Up @@ -964,8 +968,8 @@ rm -f %{name}-%{version}
/etc/yum/pluginconf.d/yum-qubes-hooks.conf
/usr/lib/yum-plugins/yum-qubes-hooks.py*
%endif
%endif
%config(noreplace) /etc/dnf/plugins/qubes-hooks.conf
%endif
%dir /etc/dconf/db/local.d
%config(noreplace) /etc/dconf/db/local.d/dpi
%config(noreplace) /etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-notifyd.xml
Expand Down Expand Up @@ -1066,13 +1070,16 @@ rm -f %{name}-%{version}
%dir /mnt/removable
%dir /rw

%if 0%{?fedora} < 41
# not relevant anymore with DNF5
%if 0%{?rhel} == 8
%files -n python3-dnf-plugins-qubes-hooks
%{plateform_python3_sitelib}/dnf-plugins/*
%else
%files -n python%{python3_pkgversion}-dnf-plugins-qubes-hooks
%{python3_sitelib}/dnf-plugins/*
%endif
%endif

%if 0%{?rhel} != 7
%files caja
Expand Down

0 comments on commit 4f6ab9b

Please sign in to comment.