rpm: update packaging for mockbuild

qubes-ppc64le · Sep 10, 2018 · eff42b9 · eff42b9
1 parent 8372f65
commit eff42b9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 14 deletions.
diff --git a/rpm_spec/qubes-u2f-dom0.spec → rpm_spec/qubes-u2f-dom0.spec.in b/rpm_spec/qubes-u2f-dom0.spec → 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 → rpm_spec/qubes-u2f.spec.in b/rpm_spec/qubes-u2f.spec → 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}