Skip to content

Commit

Permalink
Drop Fedora < 22 support
Browse files Browse the repository at this point in the history
yum actions no longer relevant
  • Loading branch information
marmarek committed Feb 13, 2018
1 parent 4a27d9e commit f38e204
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 10 deletions.
2 changes: 0 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion misc/qubes-trigger-sync-appmenus.action

This file was deleted.

7 changes: 0 additions & 7 deletions rpm_spec/core-agent.spec
Original file line number Diff line number Diff line change
Expand Up @@ -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:' \
Expand Down Expand Up @@ -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/[email protected]/90-session-stop-timeout.conf
Expand Down

0 comments on commit f38e204

Please sign in to comment.