diff --git a/.gitignore b/.gitignore
index 86525c3..b399340 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /cli-c48282d14eba4b0817ddef3f832ff8d13851aefd.tar.gz
+/cli-1.0.0.tar.gz
diff --git a/golang-github-mitchellh-cli.spec b/golang-github-mitchellh-cli.spec
index 34212ea..7669f4e 100644
--- a/golang-github-mitchellh-cli.spec
+++ b/golang-github-mitchellh-cli.spec
@@ -1,69 +1,74 @@
-# http://github.com/mitchellh/cli
+# Generated by go2rpm
+%bcond_without check
 
+# https://github.com/mitchellh/cli
 %global goipath         github.com/mitchellh/cli
-%global commit          c48282d14eba4b0817ddef3f832ff8d13851aefd
+Version:                1.0.0
 
+%gometa
 
-%gometa -i
+%global common_description %{expand:
+Cli is a library for implementing powerful command-line interfaces in Go.}
+
+%global golicenses      LICENSE
+%global godocs          README.md
+
+%global gosupfiles glide.lock glide.yaml
 
 Name:           %{goname}
-Version:        0
-Release:        0.9%{?dist}
+Release:        1%{?dist}
 Summary:        Go library for implementing command-line interfaces
-# Detected licences
-# - *No copyright* MPL (v2.0) at 'LICENSE'
+
+# Upstream license specification: MPL-2.0
 License:        MPLv2.0
 URL:            %{gourl}
 Source0:        %{gosource}
 Source1:        glide.yaml
-Source2:        glide.yaml
-
-%description
-%{summary}
+Source2:        glide.lock
 
-%package devel
-Summary:       %{summary}
-BuildArch:     noarch
+BuildRequires:  golang(github.com/armon/go-radix)
+BuildRequires:  golang(github.com/bgentry/speakeasy)
+BuildRequires:  golang(github.com/fatih/color)
+BuildRequires:  golang(github.com/mattn/go-isatty)
+BuildRequires:  golang(github.com/posener/complete)
+BuildRequires:  golang(github.com/posener/complete/cmd/install)
 
-BuildRequires: golang(golang.org/x/crypto/ssh/terminal)
-BuildRequires: golang-github-armon-go-radix-devel
-BuildRequires: golang-github-bgentry-speakeasy-devel
-BuildRequires: golang-github-fatih-color-devel
-BuildRequires: golang-github-mattn-go-colorable-devel
-BuildRequires: golang-github-mattn-go-isatty-devel
-BuildRequires: golang-github-posener-complete-devel
-BuildRequires: golang-github-shiena-ansicolor-devel
-
-%description devel
-%{summary}
+%description
+%{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
-
+%gopkginstall
+
+# 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
+
+%if %{with check}
 %check
-%gochecks
+%gocheck
+%endif
 
-#define license tag if not already defined
-%{!?_licensedir:%global license %doc}
-
-%files devel -f devel.file-list
-%license LICENSE
-%doc README.md
+%gopkgfiles
 
 %changelog
-* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - Forge-specific packaging variables
+* Sun Apr 21 18:07:08 CEST 2019 Robert-André Mauchin <zebob.m@gmail.com> - 1.0.0-1
+- Release 1.0.0
+
+* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0-0.9.gitc48282d
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
 
-* Tue Oct 23 2018 Nicolas Mailhot <nim@fedoraproject.org>
-- 0-0.8
+* Tue Oct 23 2018 Nicolas Mailhot <nim@fedoraproject.org> - 0-0.8.gitc48282d
 - 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/
 
diff --git a/sources b/sources
index d65e20a..51846ae 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (cli-c48282d14eba4b0817ddef3f832ff8d13851aefd.tar.gz) = 60cfe3319a01e29192a2267dcab3e8de8220b8b14bdbeb894a6e14928b5c9e088babe2f2751d186474978cca006900b8ffe66813fc70b62e07452a607724498a
+SHA512 (cli-1.0.0.tar.gz) = 1e70b7102e32e4f3ab4ec69b580618af653dae271bcf221f355b40a1ce603f87c021b5967c1e3ce690f1052c344758041a4419dc88ff65d08b1e0ee2c795ae52