From 345a5f962378b6602195fd04063c4555db64ad09 Mon Sep 17 00:00:00 2001 From: Robert-André Mauchin Date: Mar 14 2018 19:32:32 +0000 Subject: Update with the new Go packaging --- diff --git a/.gitignore b/.gitignore index c1811b6..0deb331 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /poller-ab09682.tar.gz +/poller-ab09682913b79f402713d1df1977dedc19eb25ac.tar.gz diff --git a/golang-github-zyedidia-poller.spec b/golang-github-zyedidia-poller.spec index a054f3f..85abfe2 100644 --- a/golang-github-zyedidia-poller.spec +++ b/golang-github-zyedidia-poller.spec @@ -1,185 +1,68 @@ -# 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 -# Tests fail on ppc -%global with_check 0 -# Generate unit-test rpm -%global with_unit_test 1 - -%if 0%{?with_debug} -%global _dwz_low_mem_die_limit 0 +# Run tests in check section +# Tests fail on ppc/aarch64 +%ifarch ppc ppc64 ppc64le aarch64 +%bcond_with check %else -%global debug_package %{nil} +%bcond_without check %endif - -%global provider github -%global provider_tld com -%global project zyedidia -%global repo poller -# https://github.com/zyedidia/poller -%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} -%global import_path %{provider_prefix} +%global goipath github.com/zyedidia/poller %global commit ab09682913b79f402713d1df1977dedc19eb25ac -%global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commitdate 20170616 - -Name: golang-%{provider}-%{project}-%{repo} -Version: 0 -Release: 0.2.%{commitdate}git%{shortcommit}%{?dist} -Summary: An epoll(7)-based file-descriptor multiplexer -License: BSD -URL: https://%{provider_prefix} -Source0: https://%{provider_prefix}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz -Patch0: poller-ab09682-fix_import.patch +%global common_description %{expand: +An epoll(7)-based file-descriptor multiplexer.} -# 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 +Name: %{goname} +Version: 0 +Release: 0.3%{?dist} +Summary: An epoll(7)-based file-descriptor multiplexer +License: BSD +URL: %{gourl} +Source: %{gosource} +Patch0: poller-ab09682-fix_import.patch %description -%{summary} - -%if 0%{?with_devel} -%package devel -Summary: %{summary} -BuildArch: noarch - -%if 0%{?with_check} && ! 0%{?with_bundled} -%endif - +%{common_description} -Provides: golang(%{import_path}) = %{version}-%{release} +%package devel +Summary: %{summary} +BuildArch: noarch + %description devel -%{summary} - -This package contains library source intended for -building other packages which use import path with -%{import_path} prefix. -%endif +%{common_description} + +This package contains the source code needed for building packages that import +the %{goipath} Go namespace. -%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 - -%description unit-test-devel -%{summary} - -This package contains unit tests for project -providing packages with %{import_path} prefix. -%endif %prep -%autosetup -p1 -n %{repo}-%{commit} +%gosetup -q +%patch0 -p1 -%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 +%install +%goinstall -%if 0%{?with_devel} -sort -u -o devel.file-list devel.file-list -%endif +%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 +%gochecks %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.txt %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.txt -%doc README.md -%endif %changelog +* Sat Mar 10 2018 Robert-André Mauchin - 0-0.3.20180314gitab09682 +- Update with the new Go packaging + * Wed Feb 07 2018 Fedora Release Engineering - 0-0.2.20170616gitab09682 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild diff --git a/sources b/sources index cf0cf3d..81bf9c8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (poller-ab09682.tar.gz) = 3e208df5ffae09e2e5a075515622f00438f0d152f6ccbeb4a7eb244165a28aff67a570998ef97e9f59f3cbaa634edfcddbba4042d534e8b645eee851c047f78f +SHA512 (poller-ab09682913b79f402713d1df1977dedc19eb25ac.tar.gz) = 3e208df5ffae09e2e5a075515622f00438f0d152f6ccbeb4a7eb244165a28aff67a570998ef97e9f59f3cbaa634edfcddbba4042d534e8b645eee851c047f78f