Merge branch 'master' of git://git.qubes-os.org/marmarek/template-builder

convert_app2template.sh

@@ -8,7 +8,8 @@ if ! grep -q ^Name $SRC ; then
     exit 0
 fi
 
-sed -n -e "s/^\(Name.*\)=\(.*\)/\1=%VMNAME%: \2/p" \
+sed -n -e "/^\[Desktop Entry\]$/p" \
+    -e "s/^\(Name.*\)=\(.*\)/\1=%VMNAME%: \2/p" \
     -e "s/^\(GenericName.*\)=\(.*\)/\1=%VMNAME%: \2/p" \
     -e "s/^Exec=\(.*\)/Exec=qvm-run -q --tray -a %VMNAME% \'\1\'/p" \
     -e "/^Comment.*=/p" \

templates.spec

@@ -18,6 +18,8 @@ Source:		.
 Requires:	qubes-core-dom0 >= 1.4.1
 Requires:   kernel-qubes-vm
 Requires:	xdg-utils
+Requires(post):	tar
+Requires(post):	qubes-core-dom0
 
 %define _builddir %(pwd)
 %define _rpmdir %(pwd)/rpm