diff --git a/.gitignore b/.gitignore index a3b3222..87fa962 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /imaging-a585802.tar.gz +/imaging-0bd5694c78c9c3d9a3cd06a706a8f3c59296a9ac.tar.gz diff --git a/README.md b/README.md index 2b55a84..14b6e26 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,3 @@ # golang-github-disintegration-imaging -The golang-github-disintegration-imaging package \ No newline at end of file +The golang-github-disintegration-imaging package diff --git a/golang-github-disintegration-imaging.spec b/golang-github-disintegration-imaging.spec index 47aa829..fa412d2 100644 --- a/golang-github-disintegration-imaging.spec +++ b/golang-github-disintegration-imaging.spec @@ -1,27 +1,19 @@ -%global debug_package %{nil} +# Run tests in check section +# disable for bootstrapping +%bcond_with check -%global provider github -%global provider_tld com -%global project disintegration -%global repo imaging -# https://github.com/disintegration/imaging -%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} -%global import_path %{provider_prefix} -%global commit a5858022df0e1734a59f973fffe3f87b51c087ed -%global shortcommit %(c=%{commit}; echo ${c:0:7}) +%global goipath github.com/disintegration/imaging +%global commit 0bd5694c78c9c3d9a3cd06a706a8f3c59296a9ac -Name: golang-%{provider}-%{project}-%{repo} -Version: 1.2.1 -Release: 3.git%{shortcommit}%{?dist} +%gometa + +Name: %{goname} +Version: 1.5.0 +Release: 1%{?dist} Summary: Simple Go image processing package License: MIT -URL: https://%{provider_prefix} -Source0: %{url}/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 %{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} +URL: %{gourl} +Source0: %{gosource} %description %{summary}. @@ -29,11 +21,6 @@ BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang} %package devel Summary: %{summary} BuildArch: noarch -BuildRequires: golang(golang.org/x/image/bmp) -BuildRequires: golang(golang.org/x/image/tiff) -Requires: golang(golang.org/x/image/bmp) -Requires: golang(golang.org/x/image/tiff) -Provides: golang(%{import_path}) = %{version}-%{release} %description devel %{summary}. @@ -42,70 +29,26 @@ This package contains library source intended for building other packages which use import path with %{import_path} prefix. -%package unit-test-devel -Summary: Unit tests for %{name} package -BuildArch: noarch -# test subpackage tests code from devel subpackage -Requires: %{name}-devel = %{version}-%{release} - -%description unit-test-devel -%{summary}. - -This package contains unit tests for project -providing packages with %{import_path} prefix. - - %prep -%setup -q -n %{repo}-%{commit} - -%build +%forgeautosetup %install -# source codes for building projects -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" \! -iname "*_test.go") ; do - echo "%%dir %%{gopath}/src/%%{import_path}/$(dirname $file)" >> devel.file-list - install -d -p %{buildroot}%{gopath}/src/%{import_path}/$(dirname $file) - cp -pav $file %{buildroot}%{gopath}/src/%{import_path}/$file - echo "%%{gopath}/src/%%{import_path}/$file" >> devel.file-list -done - -# testing files for this project -install -d %{buildroot}%{gopath}/src/%{import_path}/ -# find all *_test.go files and generate unit-test.file-list -for file in $(find . -iname "*_test.go" -or -iname "testdata"); 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 - -sort -u -o devel.file-list devel.file-list -sort -u -o unit-test-devel.file-list unit-test-devel.file-list +%goinstall sed -i 's|\r||g' README.md +%if %{with check} %check -export GOPATH=%{buildroot}%{gopath}:%{gopath} - -%if ! 0%{?gotest:1} -%global gotest go test +%gochecks %endif -%gotest %{import_path} ||: - %files devel -f devel.file-list %doc README.md %license LICENSE -%files unit-test-devel -f unit-test-devel.file-list - %changelog +* Sun Nov 4 2018 mosquito - 1.5.0-1 +- Update to 1.5.0 + * Fri Jul 13 2018 Fedora Release Engineering - 1.2.1-3.gita585802 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild diff --git a/sources b/sources index 6e3cf58..62a2762 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (imaging-a585802.tar.gz) = 072b6a37fa6613aae640b75bcdad5117ee5ee9118babd3763b2de7e1bbbe60aff5a4c0974e96eab863af01e4ac299b278c959bab0b215d214bc97678635d84e2 +SHA512 (imaging-0bd5694c78c9c3d9a3cd06a706a8f3c59296a9ac.tar.gz) = 0d2fd7c689044634b0c31136e45f5ca5bf5c690270edc8aa8e88fed9a2a95158a6bd86e65a694a50d44a75f6d9cf77cebeed6fbe43f226e92022280786d9a317