diff --git a/.gitignore b/.gitignore index e761835..376383e 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /douceur-c5c95ec.tar.gz +/douceur-0.2.0.tar.gz diff --git a/douceur.spec b/douceur.spec index 6d9cea6..f0f0c98 100644 --- a/douceur.spec +++ b/douceur.spec @@ -1,219 +1,66 @@ -# 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 1 -# 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 - -%if ! 0%{?gobuild:1} -%define gobuild(o:) go build -ldflags "${LDFLAGS:-} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n')" -a -v -x %{?**}; -%endif +# Generated by go2rpm +%bcond_without check -%global provider github -%global provider_tld com -%global project aymerick -%global repo douceur # https://github.com/aymerick/douceur -%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} -%global import_path %{provider_prefix} -%global commit c5c95ec357c8235fbd7f34e8c843d36783f3fad9 -%global shortcommit %(c=%{commit}; echo ${c:0:7}) - -Name: douceur -Version: 0.2.0 -Release: 6%{?dist} -Summary: A simple CSS parser and inliner in Go -License: MIT -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} - -%if ! 0%{?with_bundled} -# Remaining dependencies not included in main packages -BuildRequires: golang(golang.org/x/net/html) -BuildRequires: golang(github.com/gorilla/css/scanner) -BuildRequires: golang(github.com/PuerkitoBio/goquery) -%endif - -%description -%{summary} - -%if 0%{?with_devel} -%package -n golang-%{provider}-%{project}-%{repo}-devel -Summary: %{summary} -BuildArch: noarch +%global goipath github.com/aymerick/douceur +Version: 0.2.0 -%if 0%{?with_check} && ! 0%{?with_bundled} -BuildRequires: golang(github.com/PuerkitoBio/goquery) -BuildRequires: golang(github.com/gorilla/css/scanner) -BuildRequires: golang(golang.org/x/net/html) -%endif - -Requires: golang(github.com/PuerkitoBio/goquery) -Requires: golang(github.com/gorilla/css/scanner) -Requires: golang(golang.org/x/net/html) - -Provides: golang(%{import_path}/css) = %{version}-%{release} -Provides: golang(%{import_path}/inliner) = %{version}-%{release} -Provides: golang(%{import_path}/parser) = %{version}-%{release} +%gometa -%description -n golang-%{provider}-%{project}-%{repo}-devel -%{summary} +%global common_description %{expand: +A simple CSS parser and inliner in Go.} -This package contains library source intended for -building other packages which use import path with -%{import_path} prefix. -%endif +%global golicenses LICENSE +%global godocs CHANGELOG.md README.md -%if 0%{?with_unit_test} && 0%{?with_devel} -%package -n golang-%{provider}-%{project}-%{repo}-unit-test-devel -Summary: Unit tests for golang-%{provider}-%{project}-%{repo}-devel package -%if 0%{?with_check} -#Here comes all BuildRequires: PACKAGE the unit tests -#in %%check section need for running -%endif +%global godevelheader %{expand: +Obsoletes: golang-github-aymerick-douceur-unit-test-devel < 0.2.0-7 +} -# test subpackage tests code from devel subpackage -Requires: golang-%{provider}-%{project}-%{repo}-devel = %{version}-%{release} +Name: douceur +Release: 7%{?dist} +Summary: A simple CSS parser and inliner in Go -%if 0%{?with_check} && ! 0%{?with_bundled} -%endif +License: MIT +URL: %{gourl} +Source0: %{gosource} +BuildRequires: golang(github.com/gorilla/css/scanner) +BuildRequires: golang(github.com/PuerkitoBio/goquery) +BuildRequires: golang(golang.org/x/net/html) -%description -n golang-%{provider}-%{project}-%{repo}-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 -mkdir -p src/%{provider}.%{provider_tld}/%{project} -ln -s ../../../ src/%{import_path} - -%if ! 0%{?with_bundled} -export GOPATH=$(pwd):%{gopath} -%else -# No dependency directories so far -export GOPATH=$(pwd):%{gopath} -%endif - -%gobuild -o bin/douceur %{import_path}/ +%gobuild -o %{gobuilddir}/bin/douceur %{goipath} %install -install -d -p %{buildroot}%{_bindir} -install -p -m 0755 bin/douceur %{buildroot}%{_bindir} - -# 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 +install -m 0755 -vd %{buildroot}%{_bindir} +install -m 0755 -vp %{gobuilddir}/bin/* %{buildroot}%{_bindir}/ +%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}/inliner -%gotest %{import_path}/parser -%endif - -#define license tag if not already defined -%{!?_licensedir:%global license %doc} - %files %license LICENSE %doc CHANGELOG.md README.md %{_bindir}/douceur -%if 0%{?with_devel} -%files -n golang-%{provider}-%{project}-%{repo}-devel -f devel.file-list -%license LICENSE -%doc CHANGELOG.md README.md -%dir %{gopath}/src/%{provider}.%{provider_tld}/%{project} -%endif - -%if 0%{?with_unit_test} && 0%{?with_devel} -%files -n golang-%{provider}-%{project}-%{repo}-unit-test-devel -f unit-test-devel.file-list -%license LICENSE -%doc CHANGELOG.md README.md -%endif +%gopkgfiles %changelog +* Fri Jul 12 2019 Elliott Sales de Andrade - 0.2.0-7 +- Update to latest Go macros + * Thu Jan 31 2019 Fedora Release Engineering - 0.2.0-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild diff --git a/sources b/sources index 18267f4..5a713c2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (douceur-c5c95ec.tar.gz) = 8827ace56cd0dd9c53be619e3ce3b433b5ce908c4064254a397cf1a8fd85889b87bcb664487e6838e20b4d8c8e07a634219406f4a8966c2265fb8055291d3e3e +SHA512 (douceur-0.2.0.tar.gz) = 18db0e851aa370e7152edd08c88395f86bcfae16efda31fff6cc283e44939041c3cc7ebdd426bb680431f546c2a22451a1752a7b59dcb1f109b32b304c2e1da7