From e2ab963a27634318c1348ec7bdc784feb2a39cbe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
 <marmarek@invisiblethingslab.com>
Date: Wed, 11 Nov 2015 15:18:51 +0100
Subject: [PATCH] Minor improvements to packaging (based on rpmlint)

There is much more to fix, but lets start with low hanging fruits.
---
 Makefile                         | 6 +++---
 qubes-rpc/wrap-in-html-if-url.sh | 2 ++
 rpm_spec/core-vm.spec            | 9 ++-------
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/Makefile b/Makefile
index 08b0950..d96f15d 100644
--- a/Makefile
+++ b/Makefile
@@ -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
diff --git a/qubes-rpc/wrap-in-html-if-url.sh b/qubes-rpc/wrap-in-html-if-url.sh
index e519e6d..7a96e7e 100644
--- a/qubes-rpc/wrap-in-html-if-url.sh
+++ b/qubes-rpc/wrap-in-html-if-url.sh
@@ -1,3 +1,5 @@
+#!/bin/sh
+
 wrap_in_html_if_url()
 {
 	case "$1" in
diff --git a/rpm_spec/core-vm.spec b/rpm_spec/core-vm.spec
index 31b5af6..fa92ea6 100644
--- a/rpm_spec/core-vm.spec
+++ b/rpm_spec/core-vm.spec
@@ -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