The package rpms/golang-github-markbates-inflect.git has added or updated architecture
specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/golang-github-markbates-inflect.g....
Change:
-ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
Thanks.
Full change:
============
commit d1c7c03f8f97ab34a99a8066206b453d265d4ee2
Author: Elliott Sales de Andrade <quantum.analyst(a)gmail.com>
Date: Tue Feb 19 06:59:15 2019 -0500
Fix failing test due to our GOPATH.
diff --git a/0001-Fix-test-when-GOPATH-contains-multiple-directories.patch
b/0001-Fix-test-when-GOPATH-contains-multiple-directories.patch
new file mode 100644
index 0000000..deba27e
--- /dev/null
+++ b/0001-Fix-test-when-GOPATH-contains-multiple-directories.patch
@@ -0,0 +1,26 @@
+From 0a8f10f7b70d82230939fe50ee1bc698e3832518 Mon Sep 17 00:00:00 2001
+From: Elliott Sales de Andrade <quantum.analyst(a)gmail.com>
+Date: Tue, 19 Feb 2019 06:56:16 -0500
+Subject: [PATCH] Fix test when GOPATH contains multiple directories.
+
+Signed-off-by: Elliott Sales de Andrade <quantum.analyst(a)gmail.com>
+---
+ name_test.go | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/name_test.go b/name_test.go
+index a9b585b..1ef30d4 100644
+--- a/name_test.go
++++ b/name_test.go
+@@ -218,7 +218,7 @@ func Test_Name_VarCasePlural(t *testing.T) {
+ }
+
+ func Test_Name_Package(t *testing.T) {
+- gp := os.Getenv("GOPATH")
++ gp := filepath.SplitList(os.Getenv("GOPATH"))[0]
+ r := require.New(t)
+ table := []struct {
+ V string
+--
+2.20.1
+
diff --git a/golang-github-markbates-inflect.spec b/golang-github-markbates-inflect.spec
index 785ba74..b22a846 100644
--- a/golang-github-markbates-inflect.spec
+++ b/golang-github-markbates-inflect.spec
@@ -9,6 +9,7 @@ Summary: Go library to perform word transformations
License: MIT
URL: %{gourl}
Source0: %{gosource}
+Patch0001: 0001-Fix-test-when-GOPATH-contains-multiple-directories.patch
%description
%{summary}
commit 29cbc1fd02500e31b67042e9cbb10ecc3e2ffcb5
Author: Elliott Sales de Andrade <quantum.analyst(a)gmail.com>
Date: Tue Feb 19 06:58:57 2019 -0500
Update to latest version.
diff --git a/.gitignore b/.gitignore
index 31e89ea..1e5036a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/inflect-6cacb66.tar.gz
/inflect-80fa1ea.tar.gz
+/inflect-1.0.4.tar.gz
diff --git a/golang-github-markbates-inflect.spec b/golang-github-markbates-inflect.spec
index 261c651..785ba74 100644
--- a/golang-github-markbates-inflect.spec
+++ b/golang-github-markbates-inflect.spec
@@ -1,11 +1,10 @@
%global goipath
github.com/markbates/inflect
-%global commit 80fa1ea41b0dc859816314ab0b85f07a6bc57923
+Version: 1.0.4
%gometa
Name: %{goname}
-Version: 0
-Release: 0.11%{?dist}
+Release: 1%{?dist}
Summary: Go library to perform word transformations
License: MIT
URL: %{gourl}
@@ -42,11 +41,15 @@ use import path with %{goipath} prefix.
%files devel -f devel.file-list
-%doc README
+%doc README.md
%license LICENCE
%changelog
+* Tue Feb 19 2019 Elliott Sales de Andrade <quantum.analyst(a)gmail.com> - 1.0.4-1
+- Update to latest version
+- Rewrite spec using latest Go macros
+
* Fri Feb 01 2019 Fedora Release Engineering <releng(a)fedoraproject.org> -
0-0.11.git80fa1ea
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
diff --git a/sources b/sources
index c788cf1..48b7b09 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (inflect-80fa1ea.tar.gz) =
a1ac33b407ff9e5ebbc0b3a45fffb11e1a78ce9a7e02f50a2727c9d80692bdc777b9be85916a94dbca784e2b1d1a40c55002b6a91d8712585c36204550a726cb
+SHA512 (inflect-1.0.4.tar.gz) =
3b92184a8a5791c3577f18c79f6e6f0eda665769d333d6e01c4993156eb43350f5141049dec98e5a638e8e039aa332cc2caf4a8c13775676fb6cff8fae431322
commit 42bb5b9aba38cd44bbd463e9329a019b26c6bc27
Author: Elliott Sales de Andrade <quantum.analyst(a)gmail.com>
Date: Tue Feb 19 06:50:35 2019 -0500
Rewrite spec using latest Go macros.
diff --git a/golang-github-markbates-inflect.spec b/golang-github-markbates-inflect.spec
index 8dc52fc..261c651 100644
--- a/golang-github-markbates-inflect.spec
+++ b/golang-github-markbates-inflect.spec
@@ -1,191 +1,50 @@
-# 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
-# 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
-
-
-%global provider github
-%global provider_tld com
-%global project markbates
-%global repo inflect
-#
https://github.com/markbates/inflect
-%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
-%global import_path %{provider_prefix}
+%global goipath
github.com/markbates/inflect
%global commit 80fa1ea41b0dc859816314ab0b85f07a6bc57923
-%global shortcommit %(c=%{commit}; echo ${c:0:7})
-Name: golang-%{provider}-%{project}-%{repo}
+%gometa
+
+Name: %{goname}
Version: 0
-Release: 0.11.git%{shortcommit}%{?dist}
+Release: 0.11%{?dist}
Summary: Go library to perform word transformations
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}
-
-
+URL: %{gourl}
+Source0: %{gosource}
%description
%{summary}
-%if 0%{?with_devel}
+
%package devel
Summary: %{summary}
BuildArch: noarch
-%if 0%{?with_check} && ! 0%{?with_bundled}
BuildRequires:
golang(github.com/gobuffalo/envy)
-%endif
-
-Requires:
golang(github.com/gobuffalo/envy)
-
-Provides: golang(%{import_path}) = %{version}-%{release}
+BuildRequires:
golang(github.com/stretchr/testify/require)
%description devel
%{summary}
-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}
+This package contains library source intended for building other packages which
+use import path with %{goipath} prefix.
-%if 0%{?with_check} && ! 0%{?with_bundled}
-BuildRequires:
golang(github.com/stretchr/testify/require)
-%endif
-
-Requires:
golang(github.com/stretchr/testify/require)
-
-%description unit-test-devel
-%{summary}
-
-This package contains unit tests for project
-providing packages with %{import_path} prefix.
-%endif
%prep
-%setup -q -n %{repo}-%{commit}
-# We want to skip the test checking for the name of the package
-# since it gets the wrong namespace
-sed -i '4d;5d;163,177d' name_test.go
-
-%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
-# install data used for tests
-cp -pav ./inflections.json %{buildroot}/%{gopath}/src/%{import_path}/
-echo "%%{gopath}/src/%%{import_path}/inflections.json" >>
unit-test-devel.file-list
-%endif
-
-%if 0%{?with_devel}
-sort -u -o devel.file-list devel.file-list
-%endif
-
-%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
+%forgeautosetup -p1
-export GOPATH=%{buildroot}/%{gopath}:%{gopath}
-%endif
-%if ! 0%{?gotest:1}
-%global gotest go test
-%endif
+%install
+%goinstall
-%gotest %{import_path}
-%endif
-#define license tag if not already defined
-%{!?_licensedir:%global license %doc}
+%check
+%gochecks
-%if 0%{?with_devel}
%files devel -f devel.file-list
-%license LICENCE
%doc README
-%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 LICENCE
-%doc README
-%endif
+
%changelog
* Fri Feb 01 2019 Fedora Release Engineering <releng(a)fedoraproject.org> -
0-0.11.git80fa1ea