diff --git a/golang-github-xorm-builder.spec b/golang-github-xorm-builder.spec
index 94c4093..7510737 100644
--- a/golang-github-xorm-builder.spec
+++ b/golang-github-xorm-builder.spec
@@ -1,47 +1,54 @@
-%global goipath github.com/go-xorm/builder
-Version:        0.3.4
+# Generated by go2rpm
+%bcond_without check
+
+# https://github.com/go-xorm/builder
+%global goipath         github.com/go-xorm/builder
+Version:                0.3.4
 
 %gometa
 
+%global common_description %{expand:
+Package Builder is a lightweight and fast SQL builder for Go and XORM.}
+
+%global golicenses      LICENSE
+%global godocs          README.md
+
 Name:           %{goname}
 Release:        1%{?dist}
-Summary:        Lightweight and fast SQL builder for Go and XORM
+Summary:        Lightweight and fast SQL builder for Go language
+
+# Upstream license specification: BSD-3-Clause
 License:        BSD
 URL:            %{gourl}
 Source0:        %{gosource}
 
-%description
-%{summary}.
-
-
-%package devel
-Summary:       %{summary}
-BuildArch:     noarch
+%if %{with check}
+# Tests
+BuildRequires:  golang(github.com/go-xorm/sqlfiddle)
+BuildRequires:  golang(github.com/stretchr/testify/assert)
+%endif
 
-%description devel
-%{summary}.
-
-This package contains library source intended for building other packages which
-use import path with %{goipath} prefix.
+%description
+%{common_description}
 
+%gopkg
 
 %prep
-%forgeautosetup -p1
-
+%goprep
 
 %install
-%goinstall
-
+%gopkginstall
 
+%if %{with check}
 %check
-%gochecks
-
-
-%files devel -f devel.file-list
-%doc README.md
-%license LICENSE
+%gocheck
+%endif
 
+%gopkgfiles
 
 %changelog
+* Fri May 31 17:48:00 CEST 2019 Robert-André Mauchin <zebob.m@gmail.com> - 0.3.4-2
+- Update to new macros
+
 * Mon Mar 18 2019 Nathan Scott <nathans@redhat.com> - 0.3.4-1
 - First package for Fedora