Browse Source

fedora: do not require/use yum-plugin-post-transaction-actions in F>=22

Since Fedora 22+ obsoletes yum, do not require yum-specific package to
be installed.

QubesOS/qubes-issues#1282
Marek Marczykowski-Górecki 8 years ago
parent
commit
ba28c9f140
1 changed files with 8 additions and 0 deletions
  1. 8 0
      rpm_spec/core-vm.spec

+ 8 - 0
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