diff --git a/.gitignore b/.gitignore
index 035b74c..751c058 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /pkcs7-a009d8d.tar.gz
 /pkcs7-1d50025.tar.gz
+/pkcs7-d7302db945fa6ea264fb79d8e13e931ea514a602.tar.gz
diff --git a/golang-github-fullsailor-pkcs7.spec b/golang-github-fullsailor-pkcs7.spec
index d070024..0da19ad 100644
--- a/golang-github-fullsailor-pkcs7.spec
+++ b/golang-github-fullsailor-pkcs7.spec
@@ -1,187 +1,54 @@
-# If any of the following macros should be set otherwise,
-# you can wrap any of them with the following conditions:
-# - %%if 0%%{centos} == 7
-# - %%if 0%%{?rhel} == 7
-# - %%if 0%%{?fedora} == 23
-# Or just test for particular distribution:
-# - %%if 0%%{centos}
-# - %%if 0%%{?rhel}
-# - %%if 0%%{?fedora}
-#
-# Be aware, on centos, both %%rhel and %%centos are set. If you want to test
-# rhel specific macros, you can use %%if 0%%{?rhel} && 0%%{?centos} == 0 condition.
-# (Don't forget to replace double percentage symbol with single one in order to apply a condition)
-
-# Generate devel rpm
-%global with_devel 1
-# Build project from bundled dependencies
-%global with_bundled 0
-# Build with debug info rpm
-%global with_debug 0
-# Run tests in check section
-%global with_check 1
-# Generate unit-test rpm
-%global with_unit_test 1
-
-%if 0%{?with_debug}
-%global _dwz_low_mem_die_limit 0
-%else
-%global debug_package   %{nil}
-%endif
-
+# Generated by go2rpm
+%bcond_without check
 
-%global provider        github
-%global provider_tld    com
-%global project         fullsailor
-%global repo            pkcs7
 # https://github.com/fullsailor/pkcs7
-%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
-%global import_path     %{provider_prefix}
-%global commit          1d5002593acb237433a98512c6343587b03ebe5d
-%global commitdate      20180223
-%global shortcommit     %(c=%{commit}; echo ${c:0:7})
-
-Name:           golang-%{provider}-%{project}-%{repo}
-Version:        0
-Release:        0.3.%{commitdate}git%{shortcommit}%{?dist}
-Summary:        Parsing and generation of some PKCS#7 structures for Go (golang)
-# Detected licences
-# - MIT/X11 (BSD like) at 'LICENSE'
-License:        MIT
-URL:            https://%{provider_prefix}
-Source0:        https://%{provider_prefix}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz
+%global goipath         github.com/fullsailor/pkcs7
+%global commit          d7302db945fa6ea264fb79d8e13e931ea514a602
 
-# e.g. el6 has ppc64 arch without gcc-go, so EA tag is required
-ExclusiveArch:  %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
-# If go_compiler is not set to 1, there is no virtual provide. Use golang instead.
-BuildRequires:  %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang}
+%gometa
 
+%global common_description %{expand:
+Package pkcs7 implements parsing and generation of some PKCS#7 structures.}
 
+%global golicenses      LICENSE
+%global godocs          README.md
 
-%description
-Implements a subset of PKCS#7/Crytpographic Message Syntax (rfc2315, rfc5652)
-
-%if 0%{?with_devel}
-%package devel
-Summary:       %{summary}
-BuildArch:     noarch
-
-%if 0%{?with_check} && ! 0%{?with_bundled}
-%endif
-
-
-Provides:      golang(%{import_path}) = %{version}-%{release}
-
-%description devel
-%{summary}
-
-This package contains library source intended for
-building other packages which use import path with
-%{import_path} prefix.
-%endif
-
-%if 0%{?with_unit_test} && 0%{?with_devel}
-%package unit-test-devel
-Summary:         Unit tests for %{name} package
-%if 0%{?with_check}
-#Here comes all BuildRequires: PACKAGE the unit tests
-#in %%check section need for running
-BuildRequires: /usr/bin/openssl
-%endif
+Name:           %{goname}
+Version:        0
+Release:        0.4%{?dist}
+Summary:        Go library that implements a subset of pkcs#7/crytpographic message syntax
 
-# test subpackage tests code from devel subpackage
-Requires:        %{name}-devel = %{version}-%{release}
+License:        MIT
+URL:            %{gourl}
+Source0:        %{gosource}
 
-%if 0%{?with_check} && ! 0%{?with_bundled}
+%if %{with check}
+# Tests
+BuildRequires:  openssl
 %endif
 
+%description
+%{common_description}
 
-%description unit-test-devel
-%{summary}
-
-This package contains unit tests for project
-providing packages with %{import_path} prefix.
-%endif
+%gopkg
 
 %prep
-%setup -q -n %{repo}-%{commit}
+%goprep
 
-%build
 %install
-# source codes for building projects
-%if 0%{?with_devel}
-install -d -p %{buildroot}/%{gopath}/src/%{import_path}/
-echo "%%dir %%{gopath}/src/%%{import_path}/." >> devel.file-list
-# find all *.go but no *_test.go files and generate devel.file-list
-for file in $(find . \( -iname "*.go" -or -iname "*.s" \) \! -iname "*_test.go") ; do
-    dirprefix=$(dirname $file)
-    install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$dirprefix
-    cp -pav $file %{buildroot}/%{gopath}/src/%{import_path}/$file
-    echo "%%{gopath}/src/%%{import_path}/$file" >> devel.file-list
-
-    while [ "$dirprefix" != "." ]; do
-        echo "%%dir %%{gopath}/src/%%{import_path}/$dirprefix" >> devel.file-list
-        dirprefix=$(dirname $dirprefix)
-    done
-done
-%endif
-
-# testing files for this project
-%if 0%{?with_unit_test} && 0%{?with_devel}
-install -d -p %{buildroot}/%{gopath}/src/%{import_path}/
-# find all *_test.go files and generate unit-test-devel.file-list
-for file in $(find . -iname "*_test.go") ; do
-    dirprefix=$(dirname $file)
-    install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$dirprefix
-    cp -pav $file %{buildroot}/%{gopath}/src/%{import_path}/$file
-    echo "%%{gopath}/src/%%{import_path}/$file" >> unit-test-devel.file-list
-
-    while [ "$dirprefix" != "." ]; do
-        echo "%%dir %%{gopath}/src/%%{import_path}/$dirprefix" >> devel.file-list
-        dirprefix=$(dirname $dirprefix)
-    done
-done
-%endif
-
-%if 0%{?with_devel}
-sort -u -o devel.file-list devel.file-list
-%endif
+%gopkginstall
 
+%if %{with check}
 %check
-%if 0%{?with_check} && 0%{?with_unit_test} && 0%{?with_devel}
-%if ! 0%{?with_bundled}
-export GOPATH=%{buildroot}/%{gopath}:%{gopath}
-%else
-# No dependency directories so far
-
-export GOPATH=%{buildroot}/%{gopath}:%{gopath}
-%endif
-
-%if ! 0%{?gotest:1}
-%global gotest go test
-%endif
-
-%gotest %{import_path}
+%gocheck
 %endif
 
-#define license tag if not already defined
-%{!?_licensedir:%global license %doc}
-
-
-%if 0%{?with_devel}
-%files devel -f devel.file-list
-%license LICENSE
-%doc README.md
-%dir %{gopath}/src/%{provider}.%{provider_tld}/%{project}
-%endif
-
-%if 0%{?with_unit_test} && 0%{?with_devel}
-%files unit-test-devel -f unit-test-devel.file-list
-%license LICENSE
-%doc README.md
-%endif
+%gopkgfiles
 
 %changelog
+* Tue Apr 30 01:03:11 CEST 2019 Robert-André Mauchin <zebob.m@gmail.com> - 0-0.4.20190430gitd7302db
+- Bump to commit d7302db945fa6ea264fb79d8e13e931ea514a602
+
 * Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0-0.3.20180223git1d50025
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
 
diff --git a/sources b/sources
index d42a3f5..f069b4c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (pkcs7-1d50025.tar.gz) = 05ec1ea26e3b3b8c7daa18f2eb2507e85884cb0cc99e37584aac318deba12bf6a0f16bcf1d7822823388ad5eb31b438a0b9a43eda9dbdee053f4298b3704cf66
+SHA512 (pkcs7-d7302db945fa6ea264fb79d8e13e931ea514a602.tar.gz) = 3c62d704bc4dd5c86e18196822a9e5c9730d289ba9e16614ef6c0bd29bc2552f1ffb3211c763224b48fe5d3ed270de3723711d5d30df664004a112ebe6efb165