From cf0e931e410f2adad47b2c804a683f26cd2c6e07 Mon Sep 17 00:00:00 2001 From: Robert-André Mauchin Date: May 24 2019 13:58:12 +0000 Subject: Update to new macros Signed-off-by: Robert-André Mauchin --- diff --git a/.gitignore b/.gitignore index 34af8fe..3d61b69 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /cssmin-fb8d9b4.tar.gz +/cssmin-fb8d9b44afdc258bfff6052d3667521babcb2239.tar.gz diff --git a/golang-github-dchest-cssmin.spec b/golang-github-dchest-cssmin.spec index dabcf7d..94b3db1 100644 --- a/golang-github-dchest-cssmin.spec +++ b/golang-github-dchest-cssmin.spec @@ -1,169 +1,50 @@ -# 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 dchest -%global repo cssmin # https://github.com/dchest/cssmin -%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} -%global import_path %{provider_prefix} +%global goipath github.com/dchest/cssmin %global commit fb8d9b44afdc258bfff6052d3667521babcb2239 -%global shortcommit %(c=%{commit}; echo ${c:0:7}) - -Name: golang-%{provider}-%{project}-%{repo} -Version: 0 -Release: 0.8.git%{shortcommit}%{?dist} -Summary: Go package to minify CSS -License: BSD -URL: https://%{provider_prefix} -Source0: https://%{provider_prefix}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz -# 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 Cssmin minifies CSS. It's a port of Ryan Grove's cssmin from Ruby.} +%global golicenses LICENSE +%global godocs README.md -%description -%{summary}. - -%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 -%endif - -# test subpackage tests code from devel subpackage -Requires: %{name}-devel = %{version}-%{release} - -%if 0%{?with_check} && ! 0%{?with_bundled} -%endif +Name: %{goname} +Version: 0 +Release: 0.9%{?dist} +Summary: Go package to minify CSS +# Upstream license specification: BSD-3-Clause +License: BSD +URL: %{gourl} +Source0: %{gosource} -%description unit-test-devel -%{summary} +%description +%{common_description} -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} +%gocheck %endif -%if ! 0%{?gotest:1} -%global gotest go test -%endif - -%gotest %{import_path} -%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 +* Fri May 24 15:49:55 CEST 2019 Robert-André Mauchin - 0-0.9.20190524gitfb8d9b4 +- Update to new macros + * Thu Jan 31 2019 Fedora Release Engineering - 0-0.8.gitfb8d9b4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild diff --git a/sources b/sources index e542576..4643cd5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cssmin-fb8d9b4.tar.gz) = 1a5e0ec4533b1c9262aada49f22c3f379b7209bef754628c6ca9b3e3a4a6c5f5c2c27e2daf02ae8eadf4e049005a56a72506aa7bbf98c609a8d97143235107a1 +SHA512 (cssmin-fb8d9b44afdc258bfff6052d3667521babcb2239.tar.gz) = 1a5e0ec4533b1c9262aada49f22c3f379b7209bef754628c6ca9b3e3a4a6c5f5c2c27e2daf02ae8eadf4e049005a56a72506aa7bbf98c609a8d97143235107a1