From c23415da0fe69b9ac513d14530c43a50ed71a0b0 Mon Sep 17 00:00:00 2001 From: Robert-André Mauchin Date: Mar 14 2018 18:53:02 +0000 Subject: Update with the new Go packaging Upstream GIT revision 4611e80 --- diff --git a/.gitignore b/.gitignore index ea8bb7a..6ddde09 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /clipboard-adacf41.tar.gz +/clipboard-4611e809d8b1a3051c11d11f4b610c44df73fa38.tar.gz diff --git a/clipboard-adacf41-fix_import.patch b/clipboard-adacf41-fix_import.patch deleted file mode 100644 index dec82e5..0000000 --- a/clipboard-adacf41-fix_import.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -up clipboard-adacf416cec40266b051e7bc096c52951f2725e9/clipboard_test.go.fix_import clipboard-adacf416cec40266b051e7bc096c52951f2725e9/clipboard_test.go ---- clipboard-adacf416cec40266b051e7bc096c52951f2725e9/clipboard_test.go.fix_import 2016-12-26 19:48:59.000000000 +0100 -+++ clipboard-adacf416cec40266b051e7bc096c52951f2725e9/clipboard_test.go 2017-09-29 19:58:42.558325981 +0200 -@@ -7,7 +7,7 @@ package clipboard_test - import ( - "testing" - -- . "github.com/atotto/clipboard" -+ . "github.com/zyedidia/clipboard" - ) - - func TestCopyAndPaste(t *testing.T) { -diff -up clipboard-adacf416cec40266b051e7bc096c52951f2725e9/example_test.go.fix_import clipboard-adacf416cec40266b051e7bc096c52951f2725e9/example_test.go ---- clipboard-adacf416cec40266b051e7bc096c52951f2725e9/example_test.go.fix_import 2017-09-29 19:52:10.343445451 +0200 -+++ clipboard-adacf416cec40266b051e7bc096c52951f2725e9/example_test.go 2017-09-29 19:58:33.021353202 +0200 -@@ -3,7 +3,7 @@ package clipboard_test - import ( - "fmt" - -- "github.com/atotto/clipboard" -+ "github.com/zyedidia/clipboard" - ) - - func Example() { diff --git a/golang-github-zyedidia-clipboard.spec b/golang-github-zyedidia-clipboard.spec index e45fcfc..97e3762 100644 --- a/golang-github-zyedidia-clipboard.spec +++ b/golang-github-zyedidia-clipboard.spec @@ -1,186 +1,61 @@ -# 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 are outdated, api changed -%global with_check 0 -# 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 - - -%global provider github -%global provider_tld com -%global project zyedidia -%global repo clipboard -# https://github.com/zyedidia/clipboard -%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} -%global import_path %{provider_prefix} -%global commit adacf416cec40266b051e7bc096c52951f2725e9 -%global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commitdate 20161226 +# Run tests in check section +%bcond_without check -Name: golang-%{provider}-%{project}-%{repo} -Version: 0 -Release: 0.2.%{commitdate}git%{shortcommit}%{?dist} -Summary: Clipboard for golang -License: BSD -URL: https://%{provider_prefix} -Source0: https://%{provider_prefix}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz +%global goipath github.com/zyedidia/clipboard +%global commit 4611e809d8b1a3051c11d11f4b610c44df73fa38 -Patch0: clipboard-adacf41-fix_import.patch - -# 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} +%global common_description %{expand: +Clipboard for golang.} +%gometa +Name: %{goname} +Version: 0 +Release: 0.3%{?dist} +Summary: Clipboard for golang +License: BSD +URL: %{gourl} +Source: %{gosource} %description -%{summary}. +%{common_description} -%if 0%{?with_devel} -%package devel -Summary: %{summary} -BuildArch: noarch - -%if 0%{?with_check} && ! 0%{?with_bundled} -%endif - - -Provides: golang(%{import_path}) = %{version}-%{release} +%package devel +Summary: %{summary} +BuildArch: noarch + %description devel -%{summary}. +%{common_description} + +This package contains the source code needed for building packages that import +the %{goipath} Go namespace. -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} -BuildRequires: xsel -%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 -%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 %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 %changelog +* Sat Mar 10 2018 Robert-André Mauchin - 0-0.3.20180314git4611e80 +- Update with the new Go packaging +- Upstream GIT revision 4611e80 + * Wed Feb 07 2018 Fedora Release Engineering - 0-0.2.20161226gitadacf41 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild diff --git a/sources b/sources index e4895ad..ba85b09 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (clipboard-adacf41.tar.gz) = ae9fa2671fbc010cf02d87d45ebc70e235ec3c6458d1aed1851b6427168a5022e5895de1f10abe413fbcc809415127ef1ad5901b27c8a0a290f2412a71540ca4 +SHA512 (clipboard-4611e809d8b1a3051c11d11f4b610c44df73fa38.tar.gz) = 0027a58a0351941fbb5a02191a186bc68f87d3934c058b18b9fc609ee669915db4bd0989081f45cc6d18e5e1d1d4362c934126d924202afae910705d6fb93d8b