diff --git a/golang-github-ryanuber-columnize.spec b/golang-github-ryanuber-columnize.spec
index 9a8a22a..0f83c32 100644
--- a/golang-github-ryanuber-columnize.spec
+++ b/golang-github-ryanuber-columnize.spec
@@ -1,15 +1,27 @@
+# Generated by go2rpm
+%bcond_without check
+
 # https://github.com/ryanuber/columnize
 %global goipath         github.com/ryanuber/columnize
 Version:                2.1.1
 
+%gometa
+
 %global common_description %{expand:
-Columnize is a really small Go package that makes building CLI's a little bit easier. In some CLI designs, you want to output a number similar items in a human-readable way with nicely aligned columns. However, figuring out how wide to make each column is a boring problem to solve and eats your valuable time.}
+Columnize is a really small Go package that makes building CLI's a little bit
+easier. In some CLI designs, you want to output a number similar items in a
+human-readable way with nicely aligned columns. However, figuring out how wide
+to make each column is a boring problem to solve and eats your valuable time.}
 
-%gometa
+%global golicenses      LICENSE
+%global godocs          README.md
+
+%global gosupfiles glide.lock glide.yaml
 
 Name:           %{goname}
-Release:        1%{?dist}
-Summary:        Easy column formatted output for golang
+Release:        2%{?dist}
+Summary:        Easy column formatted output for Go
+
 License:        MIT
 URL:            %{gourl}
 Source0:        %{gosource}
@@ -19,45 +31,26 @@ Source2:        glide.lock
 %description
 %{common_description}
 
-
-%package devel
-Summary:       %{summary}
-BuildArch:     noarch
-
-%description devel
-%{common_description}
-
-This package contains library source intended for
-building other packages which use import path with
-%{goipath} prefix.
+%gopkg
 
 %prep
-%forgesetup
-cp %{SOURCE1} %{SOURCE2} .
-
+%goprep
+cp %{S:1} %{S:2} .
 
 %install
-%goinstall glide.lock glide.yaml
-
-
-# Remove in F33
-# Remove erroneous glide.lock folder
-%pretrans devel -p <lua>
-path = "%{gopath}/src/%{goipath}/glide.lock"
-st = posix.stat(path)
-if st and st.type == "directory" then
-  os.remove(path)
-end
-
+%gopkginstall
 
+%if %{with check}
 %check
-%gochecks
+%gocheck
+%endif
 
-%files devel -f devel.file-list
-%license LICENSE
-%doc README.md
+%gopkgfiles
 
 %changelog
+* Sun Apr 21 22:31:08 CEST 2019 Robert-André Mauchin <zebob.m@gmail.com> - 2.1.1-2
+- Update to new macros
+
 * Sun Mar 24 21:31:07 CET 2019 Robert-André Mauchin <zebob.m@gmail.com> - 2.1.1-1
 - Release 2.1.1