Qubes/core-agent-linux
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

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

QubesOS/qubes-issues#1282
This commit is contained in:
Marek Marczykowski-Górecki 2015-11-10 16:54:29 +01:00
parent b6cfcdcc6f
commit ba28c9f140
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
rpm_spec/core-vm.spec
View File

@ -33,7 +33,9 @@ Vendor: Invisible Things Lab
License: GPL License: GPL
URL: http://www.qubes-os.org URL: http://www.qubes-os.org
Requires: fedora-release Requires: fedora-release
%if %{fedora} < 22
Requires: yum-plugin-post-transaction-actions Requires: yum-plugin-post-transaction-actions
%endif
Requires: NetworkManager >= 0.8.1-1 Requires: NetworkManager >= 0.8.1-1
%if %{fedora} >= 18 %if %{fedora} >= 18
# Fedora >= 18 defaults to firewalld, which isn't supported nor needed by Qubes # 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) (cd qrexec; make install DESTDIR=$RPM_BUILD_ROOT)
make install-vm 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 %triggerin -- initscripts
if [ -e /etc/init/serial.conf ]; then if [ -e /etc/init/serial.conf ]; then
cp /usr/share/qubes/serial.conf /etc/init/serial.conf 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 %config(noreplace) /etc/yum.repos.d/qubes-r3.repo
/etc/yum/pluginconf.d/yum-qubes-hooks.conf /etc/yum/pluginconf.d/yum-qubes-hooks.conf
%config(noreplace) /etc/dnf/plugins/qubes-hooks.conf %config(noreplace) /etc/dnf/plugins/qubes-hooks.conf
%if %{fedora} < 22
/etc/yum/post-actions/qubes-trigger-sync-appmenus.action /etc/yum/post-actions/qubes-trigger-sync-appmenus.action
%endif
/usr/lib/systemd/system/user@.service.d/90-session-stop-timeout.conf /usr/lib/systemd/system/user@.service.d/90-session-stop-timeout.conf
/usr/sbin/qubes-serial-login /usr/sbin/qubes-serial-login
/usr/bin/qvm-copy-to-vm /usr/bin/qvm-copy-to-vm