From 84c9ae4bf16c8f10c61f0203d0d6e0cdf30c19c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
 <marmarek@invisiblethingslab.com>
Date: Sat, 30 Jan 2016 11:18:33 +0100
Subject: [PATCH] rpm: preparation for src.rpm building

QubesOS/qubes-issues#1508
---
 Makefile.builder                                   |  1 +
 ...upport.spec => qubes-kernel-vm-support.spec.in} | 14 +++++---------
 rpm_spec/{qubes-utils.spec => qubes-utils.spec.in} | 13 ++++---------
 3 files changed, 10 insertions(+), 18 deletions(-)
 rename rpm_spec/{qubes-kernel-vm-support.spec => qubes-kernel-vm-support.spec.in} (88%)
 rename rpm_spec/{qubes-utils.spec => qubes-utils.spec.in} (93%)

diff --git a/Makefile.builder b/Makefile.builder
index c19f19c..abaf768 100644
--- a/Makefile.builder
+++ b/Makefile.builder
@@ -1,3 +1,4 @@
 RPM_SPEC_FILES := rpm_spec/qubes-utils.spec rpm_spec/qubes-kernel-vm-support.spec
+RPM_USE_MOCKBUILD := 1
 ARCH_BUILD_DIRS := archlinux
 DEBIAN_BUILD_DIRS := debian
diff --git a/rpm_spec/qubes-kernel-vm-support.spec b/rpm_spec/qubes-kernel-vm-support.spec.in
similarity index 88%
rename from rpm_spec/qubes-kernel-vm-support.spec
rename to rpm_spec/qubes-kernel-vm-support.spec.in
index 1e4527f..e70a9e5 100644
--- a/rpm_spec/qubes-kernel-vm-support.spec
+++ b/rpm_spec/qubes-kernel-vm-support.spec.in
@@ -19,16 +19,14 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #
 
-
-%{!?version: %define version %(cat version)}
-
 # Package contains /usr/lib, but not binary files, which confuses find-debuginfo.sh script.
 %global debug_package %{nil}
 
 Name:		qubes-kernel-vm-support
-Version:	%{version}
+Version:	@VERSION@
 Release:	1%{?dist}
 Summary:	Qubes VM kernel and initramfs modules
+Source0:    qubes-utils-%{version}.tar.gz
 
 Group:		Qubes
 Vendor:     Invisible Things Lab
@@ -38,7 +36,9 @@ URL:		http://www.qubes-os.org
 Requires:	dracut
 Requires:	dkms
 
+%if 0%{?qubes_builder}
 %define _builddir %(pwd)
+%endif
 
 %description
 This package contains:
@@ -50,11 +50,7 @@ initrd is provided by dom0.
 libvchan library.
 
 %prep
-# we operate on the current directory, so no need to unpack anything
-# symlink is to generate useful debuginfo packages
-rm -f %{name}-%{version}
-ln -sf . %{name}-%{version}
-%setup -T -D
+%setup -q -n qubes-utils-%{version}
 
 %build
 
diff --git a/rpm_spec/qubes-utils.spec b/rpm_spec/qubes-utils.spec.in
similarity index 93%
rename from rpm_spec/qubes-utils.spec
rename to rpm_spec/qubes-utils.spec.in
index 05a5f45..d733b52 100644
--- a/rpm_spec/qubes-utils.spec
+++ b/rpm_spec/qubes-utils.spec.in
@@ -1,12 +1,12 @@
-%define version %(cat version)
 %if 0%{?qubes_builder}
 %define _builddir %(pwd)
 %endif
 
 Name:		qubes-utils
-Version:	%{version}
+Version:	@VERSION@
 Release:	1%{?dist}
 Summary:	Common Linux files for Qubes Dom0 and VM
+Source0:    %{name}-%{version}.tar.gz
 
 Group:		Qubes
 License:	GPL
@@ -88,15 +88,10 @@ Release:	1%{?dist}
 Libraries for qubes-utils
 
 %prep
-# we operate on the current directory, so no need to unpack anything
-# symlink is to generate useful debuginfo packages
-rm -f %{name}-%{version}
-ln -sf . %{name}-%{version}
-%setup -T -D
-
+%setup -q
 
 %build
-make all
+make all BACKEND_VMM=@BACKEND_VMM@
 
 %install
 make install DESTDIR=%{buildroot} PYTHON=%{__python2}