diff --git a/rpm_spec/core-vm.spec b/rpm_spec/core-vm.spec index 8aeb89b..6490935 100644 --- a/rpm_spec/core-vm.spec +++ b/rpm_spec/core-vm.spec @@ -33,7 +33,9 @@ Vendor: Invisible Things Lab License: GPL URL: http://www.qubes-os.org Requires: fedora-release +%if %{fedora} < 22 Requires: yum-plugin-post-transaction-actions +%endif Requires: NetworkManager >= 0.8.1-1 %if %{fedora} >= 18 # Fedora >= 18 defaults to firewalld, which isn't supported nor needed by Qubes @@ -123,6 +125,10 @@ usermod -L user (cd qrexec; make install DESTDIR=$RPM_BUILD_ROOT) make install-vm DESTDIR=$RPM_BUILD_ROOT +%if %{fedora} >= 22 +rm -f $RPM_BUILD_ROOT/etc/yum/post-actions/qubes-trigger-sync-appmenus.action +%endif + %triggerin -- initscripts if [ -e /etc/init/serial.conf ]; then cp /usr/share/qubes/serial.conf /etc/init/serial.conf @@ -333,7 +339,9 @@ rm -f %{name}-%{version} %config(noreplace) /etc/yum.repos.d/qubes-r3.repo /etc/yum/pluginconf.d/yum-qubes-hooks.conf %config(noreplace) /etc/dnf/plugins/qubes-hooks.conf +%if %{fedora} < 22 /etc/yum/post-actions/qubes-trigger-sync-appmenus.action +%endif /usr/lib/systemd/system/user@.service.d/90-session-stop-timeout.conf /usr/sbin/qubes-serial-login /usr/bin/qvm-copy-to-vm