From f38e204aa7d34b5955deb1d104e4579d84e5a9a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
 <marmarek@invisiblethingslab.com>
Date: Tue, 13 Feb 2018 17:04:59 +0100
Subject: [PATCH] Drop Fedora < 22 support

yum actions no longer relevant
---
 Makefile                                | 2 --
 misc/qubes-trigger-sync-appmenus.action | 1 -
 rpm_spec/core-agent.spec                | 7 -------
 3 files changed, 10 deletions(-)
 delete mode 100644 misc/qubes-trigger-sync-appmenus.action

diff --git a/Makefile b/Makefile
index b1627d0..63e0216 100644
--- a/Makefile
+++ b/Makefile
@@ -161,8 +161,6 @@ install-rh: install-systemd install-systemd-dropins install-sysvinit
 	install -d $(DESTDIR)/etc/yum.conf.d
 	touch $(DESTDIR)/etc/yum.conf.d/qubes-proxy.conf
 
-	install -D -m 0644 misc/qubes-trigger-sync-appmenus.action $(DESTDIR)/etc/yum/post-actions/qubes-trigger-sync-appmenus.action
-
 	install -D -m 0644 misc/grub.qubes $(DESTDIR)/etc/default/grub.qubes
 	install -D -m 0644 misc/serial.conf $(DESTDIR)/usr/share/qubes/serial.conf
 	install -D misc/qubes-serial-login $(DESTDIR)/$(SBINDIR)/qubes-serial-login
diff --git a/misc/qubes-trigger-sync-appmenus.action b/misc/qubes-trigger-sync-appmenus.action
deleted file mode 100644
index b8d8f88..0000000
--- a/misc/qubes-trigger-sync-appmenus.action
+++ /dev/null
@@ -1 +0,0 @@
-*:any:/usr/lib/qubes/qubes-trigger-sync-appmenus.sh
diff --git a/rpm_spec/core-agent.spec b/rpm_spec/core-agent.spec
index cd24342..ff091e5 100644
--- a/rpm_spec/core-agent.spec
+++ b/rpm_spec/core-agent.spec
@@ -323,10 +323,6 @@ usermod -p '' root
 (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
-
 %if 0%{?rhel} >= 7
 sed -i \
         -e 's:-primary:-centos:' \
@@ -612,9 +608,6 @@ rm -f %{name}-%{version}
 %config(noreplace) /etc/yum.repos.d/qubes-r4.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
 %config(noreplace) /etc/dconf/profile/user
 %config(noreplace) /etc/dconf/db/local.d/dpi
 /usr/lib/systemd/system/user@.service.d/90-session-stop-timeout.conf