From fdea48aa1ccd46e5a2fd6bd0d4641d0c64599b4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Pierret?= Date: Thu, 25 Jan 2018 11:55:39 +0100 Subject: [PATCH 1/6] Create .spec.in and Source0 --- rpm_spec/{core-dom0.spec => core-dom0.spec.in} | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) rename rpm_spec/{core-dom0.spec => core-dom0.spec.in} (97%) diff --git a/rpm_spec/core-dom0.spec b/rpm_spec/core-dom0.spec.in similarity index 97% rename from rpm_spec/core-dom0.spec rename to rpm_spec/core-dom0.spec.in index 3780fbed..bd5c8679 100644 --- a/rpm_spec/core-dom0.spec +++ b/rpm_spec/core-dom0.spec.in @@ -22,18 +22,13 @@ # # -%{!?version: %define version %(cat version)} - -# debug_package hack should be removed when BuildArch:noarch is enabled below -%define debug_package %{nil} - %define _dracutmoddir /usr/lib/dracut/modules.d %if %{fedora} < 17 %define _dracutmoddir /usr/share/dracut/modules.d %endif Name: qubes-core-dom0 -Version: %{version} +Version: @VERSION@ Release: 1%{dist} Summary: The Qubes core files (Dom0-side) @@ -111,17 +106,18 @@ Provides: qubes-core-dom0-doc # Prevent preupgrade from installation (it pretend to provide distribution upgrade) Obsoletes: preupgrade < 2.0 Provides: preupgrade = 2.0 + +Source0: %{name}-%{version}.tar.gz + +%if 0%{?qubes_builder} %define _builddir %(pwd) +%endif %description The Qubes core files for installation on Dom0. %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 From 32fad062f134cd8b0a64cfe76cb3d56d523ade0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Pierret?= Date: Sun, 28 Jan 2018 11:14:24 +0100 Subject: [PATCH 2/6] Remove _builddir --- rpm_spec/core-dom0.spec.in | 4 ---- 1 file changed, 4 deletions(-) diff --git a/rpm_spec/core-dom0.spec.in b/rpm_spec/core-dom0.spec.in index bd5c8679..2fc03e75 100644 --- a/rpm_spec/core-dom0.spec.in +++ b/rpm_spec/core-dom0.spec.in @@ -109,10 +109,6 @@ Provides: preupgrade = 2.0 Source0: %{name}-%{version}.tar.gz -%if 0%{?qubes_builder} -%define _builddir %(pwd) -%endif - %description The Qubes core files for installation on Dom0. From ab131083af55df76379e9798871493adec449e39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Pierret?= Date: Sun, 28 Jan 2018 12:05:35 +0100 Subject: [PATCH 3/6] doc: handle release definition when not being in a git repository --- doc/conf.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/doc/conf.py b/doc/conf.py index 59c5ce24..7ae732aa 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -66,7 +66,10 @@ copyright = u'2010-{}, Invisible Things Lab'.format(time.strftime('%Y')) # The short X.Y version. version = open('../version').read().strip() # The full version, including alpha/beta/rc tags. -release = subprocess.check_output(['git', 'describe', '--long', '--dirty']).strip().decode() +try: + release = subprocess.check_output(['git', 'describe', '--long', '--dirty']).strip().decode() +except: + release = "1" # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. From 601e88854c91840588335bbbad9dadf7833e62f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Pierret?= Date: Mon, 2 Apr 2018 20:06:53 +0200 Subject: [PATCH 4/6] Define backend_vmm macro --- rpm_spec/core-dom0.spec.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/rpm_spec/core-dom0.spec.in b/rpm_spec/core-dom0.spec.in index 2fc03e75..65932557 100644 --- a/rpm_spec/core-dom0.spec.in +++ b/rpm_spec/core-dom0.spec.in @@ -27,6 +27,8 @@ %define _dracutmoddir /usr/share/dracut/modules.d %endif +%define backend_vmm @BACKEND_VMM@ + Name: qubes-core-dom0 Version: @VERSION@ Release: 1%{dist} From 6fb14e81980bfef9bc61d2dc2c5644b252bc570d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Pierret?= Date: Tue, 3 Apr 2018 21:30:15 +0200 Subject: [PATCH 5/6] spec.in: add changelog placeholder --- rpm_spec/core-dom0.spec.in | 3 +++ 1 file changed, 3 insertions(+) diff --git a/rpm_spec/core-dom0.spec.in b/rpm_spec/core-dom0.spec.in index 65932557..e3e7ee9d 100644 --- a/rpm_spec/core-dom0.spec.in +++ b/rpm_spec/core-dom0.spec.in @@ -442,3 +442,6 @@ fi /etc/xdg/autostart/qrexec-policy-agent.desktop /usr/share/doc/qubes/relaxng/*.rng + +%changelog +@CHANGELOG@ From ecdaa157a93c6af55fc70756ab527f9bb0517700 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Pierret?= Date: Wed, 4 Apr 2018 12:02:32 -0400 Subject: [PATCH 6/6] spec.in: remove useless condition on Fedora 17 which induces problem with Travis --- rpm_spec/core-dom0.spec.in | 4 ---- 1 file changed, 4 deletions(-) diff --git a/rpm_spec/core-dom0.spec.in b/rpm_spec/core-dom0.spec.in index e3e7ee9d..2e3a5f54 100644 --- a/rpm_spec/core-dom0.spec.in +++ b/rpm_spec/core-dom0.spec.in @@ -23,10 +23,6 @@ # %define _dracutmoddir /usr/lib/dracut/modules.d -%if %{fedora} < 17 -%define _dracutmoddir /usr/share/dracut/modules.d -%endif - %define backend_vmm @BACKEND_VMM@ Name: qubes-core-dom0