From 329aed3460ae76fde2030e5849801cb102719404 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Pierret?= Date: Thu, 25 Jan 2018 12:00:58 +0100 Subject: [PATCH 1/4] Create .spec.in and Source0 --- ...-core-admin-client.spec => qubes-core-admin-client.spec.in} | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) rename rpm_spec/{qubes-core-admin-client.spec => qubes-core-admin-client.spec.in} (97%) diff --git a/rpm_spec/qubes-core-admin-client.spec b/rpm_spec/qubes-core-admin-client.spec.in similarity index 97% rename from rpm_spec/qubes-core-admin-client.spec rename to rpm_spec/qubes-core-admin-client.spec.in index e2dfc25..40e9ae1 100644 --- a/rpm_spec/qubes-core-admin-client.spec +++ b/rpm_spec/qubes-core-admin-client.spec.in @@ -1,5 +1,5 @@ Name: qubes-core-admin-client -Version: %(cat version) +Version: @VERSION@ Release: 0.1%{?dist} Summary: Qubes OS admin client tools @@ -23,6 +23,7 @@ BuildRequires: python3-dbus Requires: python3-qubesadmin %endif BuildArch: noarch +Source0: %{name}-%{version}.tar.gz %if 0%{?qubes_builder} %define _builddir %(pwd) From aba6f98cd9a095d266dbfee4619f0f103a99923b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Pierret?= Date: Sun, 28 Jan 2018 11:19:31 +0100 Subject: [PATCH 2/4] Remove _builddir and useless condition on qubes_builder --- rpm_spec/qubes-core-admin-client.spec.in | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/rpm_spec/qubes-core-admin-client.spec.in b/rpm_spec/qubes-core-admin-client.spec.in index 40e9ae1..8f22b7e 100644 --- a/rpm_spec/qubes-core-admin-client.spec.in +++ b/rpm_spec/qubes-core-admin-client.spec.in @@ -25,10 +25,6 @@ Requires: python3-qubesadmin BuildArch: noarch Source0: %{name}-%{version}.tar.gz -%if 0%{?qubes_builder} -%define _builddir %(pwd) -%endif - %description This package include managemt tools, like qvm-*. @@ -66,14 +62,13 @@ Python3 module qubesadmin. %endif %prep -%if !0%{?qubes_builder} %setup -q -%endif %build make -C doc PYTHON=%{__python3} SPHINXBUILD=sphinx-build-%{python3_version} man + %install rm -rf build %make_install PYTHON=%{__python2} From 9fe403e3c72050b86072d55a77fcca34387c3b66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Pierret?= Date: Sun, 28 Jan 2018 12:39:37 +0100 Subject: [PATCH 3/4] 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 ec429c9..5b20c01 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -74,7 +74,10 @@ author = 'Invisible Things Lab' # 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 9f76d0ef85e69abc21c1e33735fb341616c2a402 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Pierret?= Date: Tue, 3 Apr 2018 21:30:54 +0200 Subject: [PATCH 4/4] spec.in: add changelog placeholder --- rpm_spec/qubes-core-admin-client.spec.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rpm_spec/qubes-core-admin-client.spec.in b/rpm_spec/qubes-core-admin-client.spec.in index 8f22b7e..b555d02 100644 --- a/rpm_spec/qubes-core-admin-client.spec.in +++ b/rpm_spec/qubes-core-admin-client.spec.in @@ -103,4 +103,4 @@ make -C doc DESTDIR=$RPM_BUILD_ROOT \ %changelog - +@CHANGELOG@