From ea9042e86e2d6923bba513ab2e2fdfecf8917794 Mon Sep 17 00:00:00 2001 From: Brian 'Redbeard' Harrington Date: Tue, 9 May 2017 16:28:39 -0700 Subject: [PATCH] contrib/rpm: Fixing the source URL format Fixing the source URL format to confirm to more normative rpmbuild standards and to allow for proper use of spectool/rpmspectool. This change now produces a proper archive with the name and version number used. --- .gitignore | 1 + contrib/rpm/matchbox.spec | 7 +++---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 840a65d0..3a43f609 100644 --- a/.gitignore +++ b/.gitignore @@ -32,3 +32,4 @@ bin/ _output/ tools/ contrib/registry/data +contrib/rpm/*.tar.gz diff --git a/contrib/rpm/matchbox.spec b/contrib/rpm/matchbox.spec index ff847b1f..eb1dcb5d 100644 --- a/contrib/rpm/matchbox.spec +++ b/contrib/rpm/matchbox.spec @@ -8,7 +8,8 @@ Release: 2%{?dist} Summary: Network boot and provision CoreOS machines License: ASL 2.0 URL: https://%{import_path} -Source0: https://%{import_path}/archive/v%{version}.tar.gz +Source0: https://%{import_path}/archive/v%{version}/%{name}-%{version}.tar.gz + BuildRequires: golang BuildRequires: systemd @@ -28,9 +29,7 @@ ExclusiveArch: %{go_arches} BuildRequires: compiler(golang) %prep -%setup -# tarball has - top level dir, not - -#%setup -q -n %{repo}-%{version} +%setup -q -n %{repo}-%{version} %build # create a Go workspace with a symlink to builddir source