From 0d8544bd946241c5f8b1fbc1bf7383a43db6f39d Mon Sep 17 00:00:00 2001 From: Robert-André Mauchin Date: Jun 01 2019 18:12:19 +0000 Subject: Update to new macros Signed-off-by: Robert-André Mauchin --- diff --git a/golang-github-zyedidia-poller.spec b/golang-github-zyedidia-poller.spec index 76d646b..ebcf884 100644 --- a/golang-github-zyedidia-poller.spec +++ b/golang-github-zyedidia-poller.spec @@ -1,65 +1,52 @@ -# Run tests in check section -# Tests fail on ppc/aarch64 -%ifarch ppc ppc64 ppc64le aarch64 -%bcond_with check -%else +# Generated by go2rpm %bcond_without check -%endif +# https://github.com/zyedidia/poller %global goipath github.com/zyedidia/poller +Version: 2.0.0 %global commit ab09682913b79f402713d1df1977dedc19eb25ac -%global common_description %{expand: -An epoll(7)-based file-descriptor multiplexer.} - %gometa -Name: %{goname} -Version: 0 -Release: 0.6%{?dist} -Summary: An epoll(7)-based file-descriptor multiplexer -License: BSD -URL: %{gourl} -Source: %{gosource} +%global common_description %{expand: +Package Poller is a file-descriptor multiplexer.} -Patch0: poller-ab09682-fix_import.patch +%global golicenses LICENSE.txt +%global godocs README.md -%description -%{common_description} +Name: %{goname} +Release: 1%{?dist} +Summary: Epoll(7)-based file-descriptor multiplexer +# Upstream license specification: BSD-2-Clause +License: BSD +URL: %{gourl} +Source0: %{gosource} -%package devel -Summary: %{summary} -BuildArch: noarch - -%description devel +%description %{common_description} - -This package contains the source code needed for building packages that import -the %{goipath} Go namespace. +%gopkg %prep -%forgesetup -%patch0 -p1 +%goprep +find . -name "*.go" -exec sed -i "s|github.com/npat-efault/poller|github.com/zyedidia/poller|" "{}" +; %install -%goinstall - +%gopkginstall %if %{with check} %check -%gochecks +%gocheck %endif - -%files devel -f devel.file-list -%license LICENSE.txt -%doc README.md - +%gopkgfiles %changelog +* Sat Jun 01 19:50:34 CEST 2019 Robert-André Mauchin - 2.0.0-1.20180314gitab09682 +- Update to new macros + * Fri Feb 01 2019 Fedora Release Engineering - 0-0.6.20180314gitab09682 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild @@ -78,4 +65,3 @@ the %{goipath} Go namespace. * Fri Sep 29 2017 Robert-André Mauchin - 0-0.1.20170616gitab09682 - First package for Fedora - diff --git a/poller-ab09682-fix_import.patch b/poller-ab09682-fix_import.patch deleted file mode 100644 index e42cb87..0000000 --- a/poller-ab09682-fix_import.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up poller-ab09682913b79f402713d1df1977dedc19eb25ac/echo_test.go.fix_import poller-ab09682913b79f402713d1df1977dedc19eb25ac/echo_test.go ---- poller-ab09682913b79f402713d1df1977dedc19eb25ac/echo_test.go.fix_import 2017-09-29 21:14:31.300132500 +0200 -+++ poller-ab09682913b79f402713d1df1977dedc19eb25ac/echo_test.go 2017-09-29 21:14:58.703061776 +0200 -@@ -30,7 +30,7 @@ import ( - "testing" - "time" - -- "github.com/npat-efault/poller" -+ "github.com/zyedidia/poller" - ) - - const (