From 5d52765490a3976fe718acd165a4832bc2742401 Mon Sep 17 00:00:00 2001
From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
Date: Jul 13 2019 03:35:39 +0000
Subject: Update to latest Go macros.


---

diff --git a/yubihsm-connector.spec b/yubihsm-connector.spec
index ab4a370..3951b79 100644
--- a/yubihsm-connector.spec
+++ b/yubihsm-connector.spec
@@ -3,69 +3,58 @@
 
 # https://github.com/Yubico/yubihsm-connector
 %global goipath         github.com/Yubico/yubihsm-connector
-%global summary         Backend to talk to YubiHSM 2
+Version:                2.0.0
+%global tag             %{version}
+
+%gometa
+
+%global common_description %{expand:
+Backend to talk to YubiHSM 2}
 
 Name:           yubihsm-connector
-Version:        2.0.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        YubiHSM Connector
-License:        ASL 2.0
-
-%gometa
 
+# Upstream license specification: Apache-2.0
+License:        ASL 2.0
 URL:            %{gourl}
-Source0:        %{gourl}/archive/%{version}/%{name}-%{version}.tar.gz
+Source0:        %{gosource}
 
 %{?systemd_requires}
-Requires(pre): shadow-utils
-BuildRequires: systemd-rpm-macros
-BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang}
-BuildRequires: golang(github.com/kardianos/service)
-BuildRequires: golang(github.com/thorduri/go-libusb/usb)
-BuildRequires: golang(github.com/sirupsen/logrus)
-BuildRequires: golang(github.com/sirupsen/logrus/hooks/syslog)
-BuildRequires: golang(github.com/spf13/cobra)
-BuildRequires: golang(github.com/spf13/viper)
-BuildRequires: golang(gopkg.in/yaml.v2)
-Recommends:    yubihsm-shell
+Requires(pre):  shadow-utils
+BuildRequires:  systemd-rpm-macros
+BuildRequires:  golang(github.com/kardianos/service)
+BuildRequires:  golang(github.com/sirupsen/logrus)
+BuildRequires:  golang(github.com/sirupsen/logrus/hooks/syslog)
+BuildRequires:  golang(github.com/spf13/cobra)
+BuildRequires:  golang(github.com/spf13/viper)
+BuildRequires:  golang(github.com/thorduri/go-libusb/usb)
+BuildRequires:  golang(gopkg.in/yaml.v2)
+Recommends:     yubihsm-shell
 
 %description
-%{summary}
-
-%package devel
-Summary:       %{summary}
-BuildArch:     noarch
-
+%{common_description}
 
-%description devel
-%{summary}
-
-This package contains library source intended for
-building other packages which use import path with
-%{goipath} prefix.
+%gopkg
 
 %prep
-%forgeautosetup
-rm -rf vendor/
-
-#%%gosetup -q
+%goprep
 
 %build
-%gobuildroot
 pushd src/yubihsm-connector/
 go generate
 popd
-%gobuild -o _bin/yubihsm-connector %{goipath}/src/yubihsm-connector/
+%gobuild -o %{gobuilddir}/bin/yubihsm-connector %{goipath}/src/yubihsm-connector
 
 %install
-install -Dpm 0755 _bin/yubihsm-connector %{buildroot}%{_bindir}/yubihsm-connector
+install -Dpm 0755 %{gobuilddir}/bin/yubihsm-connector %{buildroot}%{_bindir}/yubihsm-connector
 install -Dpm 0644  deb/yubihsm-connector.yaml %{buildroot}%{_sysconfdir}/yubihsm-connector.yaml
 install -Dpm 0644  deb/yubihsm-connector.service %{buildroot}%{_unitdir}/yubihsm-connector.service
 install -Dpm 0644  deb/70-yubihsm-connector.rules %{buildroot}%{_udevrulesdir}/70-yubihsm-connector.rules
 
 %if %{with check}
 %check
-%gochecks
+%gocheck
 %endif
 
 %pre
@@ -76,22 +65,15 @@ getent passwd yubihsm-connector >/dev/null || \
     --system
 exit 0
 
-
 %post
 %systemd_post yubihsm-connector.service
 
-
 %preun
 %systemd_preun yubihsm-connector.service
 
-
 %postun
 %systemd_postun_with_restart yubihsm-connector.service
 
-#define license tag if not already defined
-%{!?_licensedir:%global license %doc}
-
-
 %files
 %license LICENSE
 %{_bindir}/yubihsm-connector
@@ -100,5 +82,8 @@ exit 0
 %{_udevrulesdir}/70-yubihsm-connector.rules
 
 %changelog
+* Fri Jul 12 2019 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 2.0.0-2
+- Update to latest Go macros
+
 * Thu Jan 31 2019 Jakub Jelen <jjelen@redhat.com> - 2.0.0-1
 - First package for Fedora