Minor improvements to packaging (based on rpmlint)

There is much more to fix, but lets start with low hanging fruits.
This commit is contained in:
Marek Marczykowski-Górecki 2015-11-11 15:18:51 +01:00
parent 5d74a8cbc0
commit e2ab963a27
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
3 changed files with 7 additions and 10 deletions

View File

@ -146,7 +146,7 @@ install-common:
install -D -m 0440 misc/qubes.sudoers $(DESTDIR)/etc/sudoers.d/qubes
install -D -m 0440 misc/sudoers.d_qt_x11_no_mitshm $(DESTDIR)/etc/sudoers.d/qt_x11_no_mitshm
install -D -m 0440 misc/20_tcp_timestamps.conf $(DESTDIR)/etc/sysctl.d/20_tcp_timestamps.conf
install -D -m 0644 misc/20_tcp_timestamps.conf $(DESTDIR)/etc/sysctl.d/20_tcp_timestamps.conf
install -d $(DESTDIR)/var/lib/qubes
@ -156,8 +156,8 @@ install-common:
install -d $(DESTDIR)$(LIBDIR)/qubes/
install misc/vusb-ctl.py $(DESTDIR)$(LIBDIR)/qubes/
install misc/qubes-trigger-sync-appmenus.sh $(DESTDIR)$(LIBDIR)/qubes/
install -D misc/polkit-1-qubes-allow-all.pkla $(DESTDIR)/etc/polkit-1/localauthority/50-local.d/qubes-allow-all.pkla
install -D misc/polkit-1-qubes-allow-all.rules $(DESTDIR)/etc/polkit-1/rules.d/00-qubes-allow-all.rules
install -D -m 0644 misc/polkit-1-qubes-allow-all.pkla $(DESTDIR)/etc/polkit-1/localauthority/50-local.d/qubes-allow-all.pkla
install -D -m 0644 misc/polkit-1-qubes-allow-all.rules $(DESTDIR)/etc/polkit-1/rules.d/00-qubes-allow-all.rules
install -D -m 0644 misc/mime-globs $(DESTDIR)/usr/share/qubes/mime-override/globs
install misc/qubes-download-dom0-updates.sh $(DESTDIR)$(LIBDIR)/qubes/
install -g user -m 2775 -d $(DESTDIR)/var/lib/qubes/dom0-updates

View File

@ -1,3 +1,5 @@
#!/bin/sh
wrap_in_html_if_url()
{
case "$1" in

View File

@ -68,11 +68,6 @@ Requires: pygtk2
Requires: zenity
Requires: qubes-libvchan
Requires: qubes-db-vm
Provides: qubes-core-vm
Obsoletes: qubes-core-commonvm
Obsoletes: qubes-core-appvm
Obsoletes: qubes-core-netvm
Obsoletes: qubes-core-proxyvm
Obsoletes: qubes-core-vm-kernel-placeholder <= 1.0
Obsoletes: qubes-upgrade-vm < 3.1
BuildRequires: xen-devel
@ -108,7 +103,7 @@ id -u 'user' >/dev/null 2>&1 || {
usermod -a --groups qubes user
if [ "$1" != 1 ] ; then
# do this whole %pre thing only when updating for the first time...
# do this whole %%pre thing only when updating for the first time...
exit 0
fi
@ -204,7 +199,7 @@ fi
%endif
if [ "$1" != 1 ] ; then
# do the rest of %post thing only when updating for the first time...
# do the rest of %%post thing only when updating for the first time...
exit 0
fi