From eff42b91023de6ba9766e9a73c85d1babe9a37d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Mon, 10 Sep 2018 20:42:11 +0200 Subject: [PATCH] rpm: update packaging for mockbuild --- .../{qubes-u2f-dom0.spec => qubes-u2f-dom0.spec.in} | 10 +++------- rpm_spec/{qubes-u2f.spec => qubes-u2f.spec.in} | 10 +++------- 2 files changed, 6 insertions(+), 14 deletions(-) rename rpm_spec/{qubes-u2f-dom0.spec => qubes-u2f-dom0.spec.in} (72%) rename rpm_spec/{qubes-u2f.spec => qubes-u2f.spec.in} (93%) diff --git a/rpm_spec/qubes-u2f-dom0.spec b/rpm_spec/qubes-u2f-dom0.spec.in similarity index 72% rename from rpm_spec/qubes-u2f-dom0.spec rename to rpm_spec/qubes-u2f-dom0.spec.in index 3ff94f1..550c9a6 100644 --- a/rpm_spec/qubes-u2f-dom0.spec +++ b/rpm_spec/qubes-u2f-dom0.spec.in @@ -1,14 +1,12 @@ -%{!?version: %define version %(cat version)} -%define _builddir %(pwd) - Name: qubes-u2f-dom0 -Version: %{version} +Version: @VERSION@ Release: 1%{?dist} Summary: Qubes OS U2F proxy policy files Group: Qubes License: GPL2+ URL: https://github.com/QubesOS/qubes-app-u2f +Source0: qubes-u2f-%{version}.tar.gz BuildArch: noarch @@ -18,9 +16,7 @@ Requires: qubes-core-dom0 Qubes OS U2F proxy policy files %prep -rm -f %{name}-%{version} -ln -sf . %{name}-%{version} -%setup -T -D +%setup -q -n qubes-u2f-%{version} %build diff --git a/rpm_spec/qubes-u2f.spec b/rpm_spec/qubes-u2f.spec.in similarity index 93% rename from rpm_spec/qubes-u2f.spec rename to rpm_spec/qubes-u2f.spec.in index 6981160..2664399 100644 --- a/rpm_spec/qubes-u2f.spec +++ b/rpm_spec/qubes-u2f.spec.in @@ -1,14 +1,12 @@ -%{!?version: %define version %(cat version)} -%define _builddir %(pwd) - Name: qubes-u2f -Version: %{version} +Version: @VERSION@ Release: 1%{?dist} Summary: Qubes OS U2F proxy Group: Qubes License: GPL2+ URL: https://github.com/QubesOS/qubes-app-u2f +Source0: %{name}-%{version}.tar.gz BuildArch: noarch BuildRequires: python3-devel @@ -23,9 +21,7 @@ Requires: python3-u2flib-host Qubes OS U2F proxy %prep -rm -f %{name}-%{version} -ln -sf . %{name}-%{version} -%setup -T -D +%setup -q %build make PYTHON=%{__python3}