From 1c249683186f92c1baa8908bc5904935d934ac59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Pierret?= Date: Thu, 25 Jan 2018 12:20:40 +0100 Subject: [PATCH] Create .spec.in and Source0 --- rpm_spec/{core-agent.spec => core-agent.spec.in} | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) rename rpm_spec/{core-agent.spec => core-agent.spec.in} (98%) diff --git a/rpm_spec/core-agent.spec b/rpm_spec/core-agent.spec.in similarity index 98% rename from rpm_spec/core-agent.spec rename to rpm_spec/core-agent.spec.in index c97afe6..c79a3ed 100644 --- a/rpm_spec/core-agent.spec +++ b/rpm_spec/core-agent.spec.in @@ -23,9 +23,6 @@ %define qubes_services qubes-core qubes-core-netvm qubes-core-early qubes-firewall qubes-iptables qubes-updates-proxy qubes-qrexec-agent qubes-updates-proxy-forwarder %define qubes_preset_file 75-qubes-vm.preset -%{!?version: %define version %(cat version)} -%{!?backend_vmm: %define backend_vmm %(echo $BACKEND_VMM)} - %define scriptletfuns is_static() { \ [ -f "%{_unitdir}/$1" ] && ! grep -q '^[[].nstall]' "%{_unitdir}/$1" \ } \ @@ -104,7 +101,7 @@ restore_units() { \ } \ Name: qubes-core-agent -Version: %{version} +Version: @VERSION@ Release: 1%{dist} Summary: The Qubes core files for VM @@ -158,8 +155,9 @@ BuildRequires: pandoc BuildRequires: xen-devel BuildRequires: libX11-devel BuildRequires: qubes-utils-devel >= 3.1.3 -BuildRequires: qubes-libvchan-%{backend_vmm}-devel +BuildRequires: qubes-libvchan-@BACKEND_VMM@-devel BuildRequires: pam-devel +Source0: %{name}-%{version}.tar.gz %description The Qubes core files for installation inside a Qubes VM. @@ -277,17 +275,15 @@ Requires: Thunar %description thunar Thunar support for Qubes VM tools +%if 0%{?qubes_builder} %define _builddir %(pwd) +%endif %define kde_service_dir /usr/share/kde4/services %define kde5_service_dir /usr/share/kservices5/ServiceMenus %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 for dir in qubes-rpc qrexec misc; do