From 08d38e519a769e68686a5f8dc5d67e80331ccab8 Mon Sep 17 00:00:00 2001
From: Robert-André Mauchin <zebob.m@gmail.com>
Date: Jul 03 2019 20:54:23 +0000
Subject: Update to new macros


Signed-off-by: Robert-André Mauchin <zebob.m@gmail.com>

---

diff --git a/golang-github-tdewolff-minify.spec b/golang-github-tdewolff-minify.spec
index ec27b18..d209c82 100644
--- a/golang-github-tdewolff-minify.spec
+++ b/golang-github-tdewolff-minify.spec
@@ -1,50 +1,64 @@
+# Generated by go2rpm
+%bcond_without check
+
+# https://github.com/tdewolff/minify
 %global goipath         github.com/tdewolff/minify
 Version:                2.5.0
 
 %gometa
 
+%global common_description %{expand:
+Minify is a minifier package written in Go. It provides HTML5, CSS3, JS, JSON,
+SVG and XML minifiers and an interface to implement any other minifier.
+Minification is the process of removing bytes from a file (such as whitespace)
+without changing its output and therefore shrinking its size and speeding up
+transmission over the internet and possibly parsing. The implemented minifiers
+are designed for high performance.
+
+The core functionality associates mimetypes with minification functions,
+allowing embedded resources (like CSS or JS within HTML files) to be minified as
+well. Users can add new implementations that are triggered based on a mimetype
+(or pattern), or redirect to an external command (like ClosureCompiler,
+UglifyCSS, ...).}
+
+%global golicenses      LICENSE.md
+%global godocs          README.md README-minify.md
+
 Name:           %{goname}
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Go minifiers for web formats
+
 License:        MIT
 URL:            %{gourl}
 Source0:        %{gosource}
 
-%description
-%{summary}
-
-
-%package devel
-Summary:       %{summary}
-BuildArch:     noarch
-
-BuildRequires: (golang(github.com/tdewolff/parse) >= 2.3.7 with golang(github.com/tdewolff/parse) < 3)
-BuildRequires: (golang(github.com/tdewolff/parse/buffer) >= 2.3.7 with golang(github.com/tdewolff/parse/buffer) < 3)
-BuildRequires: (golang(github.com/tdewolff/parse/css) >= 2.3.7 with golang(github.com/tdewolff/parse/css) < 3)
-BuildRequires: (golang(github.com/tdewolff/parse/html) >= 2.3.7 with golang(github.com/tdewolff/parse/html) < 3)
-BuildRequires: (golang(github.com/tdewolff/parse/js) >= 2.3.7 with golang(github.com/tdewolff/parse/js) < 3)
-BuildRequires: (golang(github.com/tdewolff/parse/json) >= 2.3.7 with golang(github.com/tdewolff/parse/json) < 3)
-BuildRequires: (golang(github.com/tdewolff/parse/strconv) >= 2.3.7 with golang(github.com/tdewolff/parse/strconv) < 3)
-BuildRequires: (golang(github.com/tdewolff/parse/svg) >= 2.3.7 with golang(github.com/tdewolff/parse/svg) < 3)
-BuildRequires: (golang(github.com/tdewolff/parse/xml) >= 2.3.7 with golang(github.com/tdewolff/parse/xml) < 3)
+BuildRequires:  golang(github.com/dustin/go-humanize)
+BuildRequires:  golang(github.com/fsnotify/fsnotify)
+BuildRequires:  golang(github.com/matryer/try)
+BuildRequires:  golang(github.com/spf13/pflag)
+BuildRequires:  (golang(github.com/tdewolff/parse) >= 2.3.6 with golang(github.com/tdewolff/parse) < 3)
+BuildRequires:  (golang(github.com/tdewolff/parse/buffer) >= 2.3.6 with golang(github.com/tdewolff/parse/buffer) < 3)
+BuildRequires:  (golang(github.com/tdewolff/parse/css) >= 2.3.6 with golang(github.com/tdewolff/parse/css) < 3)
+BuildRequires:  (golang(github.com/tdewolff/parse/html) >= 2.3.6 with golang(github.com/tdewolff/parse/html) < 3)
+BuildRequires:  (golang(github.com/tdewolff/parse/js) >= 2.3.6 with golang(github.com/tdewolff/parse/js) < 3)
+BuildRequires:  (golang(github.com/tdewolff/parse/json) >= 2.3.6 with golang(github.com/tdewolff/parse/json) < 3)
+BuildRequires:  (golang(github.com/tdewolff/parse/strconv) >= 2.3.6 with golang(github.com/tdewolff/parse/strconv) < 3)
+BuildRequires:  (golang(github.com/tdewolff/parse/svg) >= 2.3.6 with golang(github.com/tdewolff/parse/svg) < 3)
+BuildRequires:  (golang(github.com/tdewolff/parse/xml) >= 2.3.6 with golang(github.com/tdewolff/parse/xml) < 3)
+
+%if %{with check}
+# Tests
+BuildRequires:  golang(github.com/tdewolff/test)
+%endif
 
-BuildRequires: golang(github.com/tdewolff/test)
-BuildRequires: golang(github.com/dustin/go-humanize)
-BuildRequires: golang(github.com/fsnotify/fsnotify)
-BuildRequires: golang(github.com/matryer/try)
-BuildRequires: golang(github.com/spf13/pflag)
-
-
-%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
-%forgesetup
-
+%goprep
+mv cmd/minify/README.md README-minify.md
 # Depend on unversioned tdewolff/parse until Go modules are supported in Fedora
 # Provide unversioned import path until Go modules are supported in Fedora
 sed -i \
@@ -52,21 +66,30 @@ sed -i \
     -e 's|"github.com/tdewolff/minify/v2|"github.com/tdewolff/minify|' \
     $(find . -name '*.go')
 
+%build
+%gobuild -o %{gobuilddir}/bin/gominify %{goipath}/cmd/minify
 
 %install
-%goinstall
-
+%gopkginstall
+install -m 0755 -vd                     %{buildroot}%{_bindir}
+install -m 0755 -vp %{gobuilddir}/bin/* %{buildroot}%{_bindir}/
 
+%if %{with check}
 %check
-%gochecks
+%gocheck
+%endif
 
-
-%files devel -f devel.file-list
-%doc README.md
+%files
 %license LICENSE.md
+%doc README.md README-minify.md
+%{_bindir}/*
 
+%gopkgfiles
 
 %changelog
+* Wed Jul 03 22:53:20 CEST 2019 Robert-André Mauchin <zebob.m@gmail.com> - 2.5.0-2
+- Update to new macros
+
 * Fri May 17 2019 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 2.5.0-1
 - Update to latest version