diff --git a/golang-github-flynn-json5.spec b/golang-github-flynn-json5.spec
index fe9eb60..17524b5 100644
--- a/golang-github-flynn-json5.spec
+++ b/golang-github-flynn-json5.spec
@@ -1,67 +1,59 @@
-# Run tests in check section
+# Generated by go2rpm
 %bcond_without check
 
+# https://github.com/flynn/json5
 %global goipath         github.com/flynn/json5
 %global commit          7620272ed63390e979cf5882d2fa0506fe2a8db5
 
+%gometa
+
 %global common_description %{expand:
-Go JSON5 decoder package based on encoding/json.}
+This is a Go package that implements decoding of JSON5.}
 
-%gometa
+%global golicenses      LICENSE
+%global godocs          CONTRIBUTING.md README.md
+
+Name:           %{goname}
+Version:        0
+Release:        0.7%{?dist}
+Summary:        Go JSON5 decoder package based on encoding/json
 
-Name:    %{goname}
-Version: 0
-Release: 0.6%{?dist}
-Summary: Go JSON5 decoder package based on encoding/json
-License: BSD and MIT
-URL:     %{gourl}
-Source:  %{gosource}
+License:        BSD and MIT
+URL:            %{gourl}
+Source0:        %{gosource}
 
 %if %{with check}
-BuildRequires: golang(github.com/kylelemons/godebug/pretty)
-BuildRequires: golang(github.com/robertkrimen/otto)
+# Tests
+BuildRequires:  golang(github.com/kylelemons/godebug/pretty)
+BuildRequires:  golang(github.com/robertkrimen/otto)
 %endif
 
 %description
 %{common_description}
 
-
-%package    devel
-Summary:    %{summary}
-BuildArch:  noarch
- 
-%description devel
-%{common_description}
- 
-This package contains the source code needed for building packages that import
-the %{goipath} Go namespace.
-
+%gopkg
 
 %prep
-%forgesetup
-
+%goprep
 
 %install
-%goinstall
-
+%gopkginstall
 
 %if %{with check}
 %check
-%gochecks
+%gocheck
 %endif
 
-
-%files devel -f devel.file-list
-%license LICENSE
-%doc README.md CONTRIBUTING.md
-
+%gopkgfiles
 
 %changelog
+* Mon Jun 03 20:28:44 CEST 2019 Robert-André Mauchin <zebob.m@gmail.com> - 0-0.7.20180314git7620272
+- Update to new macros
+
 * Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0-0.6.git7620272
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
 
-* Tue Oct 23 2018 Nicolas Mailhot <nim@fedoraproject.org>
-- 0-0.5
+* Tue Oct 23 2018 Nicolas Mailhot <nim@fedoraproject.org> - 0-0.5.git7620272
 - redhat-rpm-config-123 triggers bugs in gosetup, remove it from Go spec files as it’s just an alias
 - https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/message/RWD5YATAYAFWKIDZBB7EB6N5DAO4ZKFM/
 
@@ -76,4 +68,3 @@ the %{goipath} Go namespace.
 
 * Fri Sep 29 2017 Robert-André Mauchin <zebob.m@gmail.com> - 0-0.1.20160717git7620272
 - First package for Fedora
-