debian,fedora: split nautilus integration into separate package

This will allow to avoid a lot of dependencies on minimal template.

QubesOS/qubes-issues#2816
QubesOS/qubes-issues#2771
This commit is contained in:
Marek Marczykowski-Górecki 2017-05-21 01:52:23 +02:00
parent 36fa978a0e
commit 5047fd9288
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
4 changed files with 25 additions and 10 deletions

12
debian/control vendored
View File

@ -34,7 +34,6 @@ Depends:
librsvg2-bin,
libvchan-xen,
locales,
locales-all,
ncurses-term,
net-tools,
psmisc,
@ -55,7 +54,6 @@ Depends:
xenstore-utils,
xinit,
xserver-xorg-core,
xserver-xorg-video-dummy,
${shlibs:Depends},
${misc:Depends}
Recommends:
@ -64,13 +62,14 @@ Recommends:
gnome-themes-standard,
haveged,
libnotify-bin,
locales-all,
mate-notification-daemon,
network-manager (>= 0.8.1-1),
network-manager-gnome,
ntpdate,
python-nautilus,
system-config-printer,
tinyproxy,
qubes-nautilus,
xsettingsd,
yum,
yum-utils
@ -79,3 +78,10 @@ Conflicts: ${diverted-files}, qubes-core-agent-linux, firewalld, qubes-core-vm-s
Description: Qubes core agent
This package includes various daemons necessary for qubes domU support,
such as qrexec.
Package: qubes-nautilus
Architecture: any
Description: Qubes integration for Nautilus
Nautilus addons for inter-VM file copy/move/open.
Depends:
python-nautilus,

View File

@ -156,6 +156,5 @@ usr/lib/tmpfiles.d/qubes-core-agent-linux.conf
usr/sbin/qubes-firewall
usr/share/glib-2.0/schemas/*
usr/share/kde4/services/*.desktop
usr/share/nautilus-python/extensions/*
usr/share/qubes/mime-override/globs
usr/share/qubes/qubes-master-key.asc

1
debian/qubes-nautilus.install vendored Normal file
View File

@ -0,0 +1 @@
usr/share/nautilus-python/extensions/*

View File

@ -126,7 +126,6 @@ Requires: ethtool
Requires: tinyproxy
Requires: ntpdate
Requires: net-tools
Requires: nautilus-python
Requires: qubes-utils >= 3.1.3
Requires: initscripts
Requires: gawk
@ -183,6 +182,14 @@ DNF plugin for Qubes specific post-installation actions:
* notify dom0 that updates were installed
* refresh applications shortcut list
%package -n qubes-nautilus
Summary: Qubes integration for Nautilus
Requires: qubes-core-vm
Requires: nautilus-python
%description -n qubes-nautilus
Nautilus addons for inter-VM file copy/move/open.
%define _builddir %(pwd)
%define kde_service_dir /usr/share/kde4/services
@ -494,9 +501,7 @@ rm -f %{name}-%{version}
/usr/lib/qubes/qubes-fix-nm-conf.sh
/usr/lib/qubes/qubes-setup-dnat-to-ns
/usr/lib/qubes/qubes-trigger-sync-appmenus.sh
/usr/lib/qubes/qvm-copy-to-vm.gnome
/usr/lib/qubes/qvm-copy-to-vm.kde
/usr/lib/qubes/qvm-move-to-vm.gnome
/usr/lib/qubes/qvm-move-to-vm.kde
/usr/lib/qubes/setup-ip
/usr/lib/qubes/tar2qfile
@ -522,9 +527,6 @@ rm -f %{name}-%{version}
/usr/share/glib-2.0/schemas/20_org.gnome.nautilus.qubes.gschema.override
/usr/share/glib-2.0/schemas/20_org.mate.NotificationDaemon.qubes.gschema.override
/usr/share/glib-2.0/schemas/20_org.gnome.desktop.wm.preferences.qubes.gschema.override
/usr/share/nautilus-python/extensions/qvm_copy_nautilus.py*
/usr/share/nautilus-python/extensions/qvm_move_nautilus.py*
/usr/share/nautilus-python/extensions/qvm_dvm_nautilus.py*
%dir %{python3_sitelib}/qubesagent-*.egg-info
%{python3_sitelib}/qubesagent-*.egg-info/*
@ -548,6 +550,13 @@ rm -f %{name}-%{version}
%files -n python3-dnf-plugins-qubes-hooks
%{python3_sitelib}/dnf-plugins/*
%files -n qubes-nautilus
/usr/lib/qubes/qvm-copy-to-vm.gnome
/usr/lib/qubes/qvm-move-to-vm.gnome
/usr/share/nautilus-python/extensions/qvm_copy_nautilus.py*
/usr/share/nautilus-python/extensions/qvm_move_nautilus.py*
/usr/share/nautilus-python/extensions/qvm_dvm_nautilus.py*
%package sysvinit
Summary: Qubes unit files for SysV init style or upstart
License: GPL v2 only