Architecture specific change in rpms/golang-github-paulrosania-go-charset.git
by githook-noreply@fedoraproject.org
The package rpms/golang-github-paulrosania-go-charset.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-paulrosania-go-char....
Change:
-ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
Thanks.
Full change:
============
commit b3e409ec0515323308c6e7da8cc83716d1010a26
Author: Robert-Andr Mauchin <zebob.m(a)gmail.com>
Date: Mon Jul 8 23:37:30 2019 +0200
Renamed to golang-github-paulrosania-charset
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index be64ad9..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/go-charset-621bb39.tar.gz
-/go-charset-55c9d7a5834c4d034b34bf042103dbc646887f4f.tar.gz
diff --git a/README.md b/README.md
deleted file mode 100644
index 8a17a8c..0000000
--- a/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# golang-github-paulrosania-go-charset
-
-Character set conversion for Go
\ No newline at end of file
diff --git a/charsetdir-fedora-fix.patch b/charsetdir-fedora-fix.patch
deleted file mode 100644
index 3812664..0000000
--- a/charsetdir-fedora-fix.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From a9230e9179138c3ae8e795449a255ac0617ca7e4 Mon Sep 17 00:00:00 2001
-From: Jiri Kucera <jkucera(a)redhat.com>
-Date: Thu, 15 Feb 2018 11:34:44 +0100
-Subject: [PATCH] /usr/local/lib -> /usr/share
-
-According to Fedora Packaging Guidelines, there should be no files and
-directories installed to /usr/local
-
-Datadir prefix (/usr/share) should be synced with rpm %{_datadir}
----
- charset/file.go | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/charset/file.go b/charset/file.go
-index a0c2622..1b93da7 100644
---- a/charset/file.go
-+++ b/charset/file.go
-@@ -21,7 +21,7 @@ func RegisterDataFile(name string, open func() (io.ReadCloser, error)) {
- // CharsetDir gives the location of the default data file directory.
- // This directory will be used for files with names that have not
- // been registered with RegisterDataFile.
--var CharsetDir = "/usr/local/lib/go-charset/datafiles"
-+var CharsetDir = "@_DATADIR@/go-charset/datafiles"
-
- func readFile(name string) (data []byte, err error) {
- var r io.ReadCloser
diff --git a/dead.package b/dead.package
new file mode 100644
index 0000000..f866dd2
--- /dev/null
+++ b/dead.package
@@ -0,0 +1 @@
+Renamed to golang-github-paulrosania-charset
diff --git a/golang-github-paulrosania-charset.spec b/golang-github-paulrosania-charset.spec
deleted file mode 100644
index d0a29f9..0000000
--- a/golang-github-paulrosania-charset.spec
+++ /dev/null
@@ -1,66 +0,0 @@
-# Generated by go2rpm
-%bcond_without check
-
-# https://github.com/paulrosania/go-charset
-%global goipath github.com/paulrosania/go-charset
-%global commit 55c9d7a5834c4d034b34bf042103dbc646887f4f
-
-%gometa
-
-%global common_description %{expand:
-A fork of go-charset, which itself is a port of inferno's convcs for Go, which
-supports conversion to and from UTF-8.}
-
-%global golicenses LICENSE
-%global godocs README.md
-
-Name: %{goname}
-Version: 0
-Release: 0.4%{?dist}
-Summary: Character set conversion for Go
-
-# Upstream license specification: BSD-3-Clause
-License: BSD
-URL: %{gourl}
-Source0: %{gosource}
-# Changes /usr/local/lib/go-charset/datafiles to /usr/share/go-charset/datafiles
-Patch0: charsetdir-fedora-fix.patch
-
-%description
-%{common_description}
-
-%gopkg
-
-%prep
-%goprep
-
-%install
-%gopkginstall
-
-%if %{with check}
-%check
-%gocheck
-%endif
-
-%gopkgfiles
-
-%changelog
-* Tue May 28 16:04:16 CEST 2019 Robert-Andr Mauchin <zebob.m(a)gmail.com> - 0-0.4.20190528git55c9d7a
-- Bump to commit 55c9d7a5834c4d034b34bf042103dbc646887f4f
-
-* Fri Feb 01 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 0-0.3.20151028git621bb39
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Fri Jul 13 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 0-0.2.20151028git621bb39
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Thu Feb 15 2018 Jiri Kucera <jkucera(a)redhat.com> - 0-0.1.20151028git621bb39
-- First package for Fedora
- this package is required by golang-github-elazarl-goproxy package, which is
- a dependency of bettercap 2.0.0 (resolves #1540726);
- patch charsetdir-fedora-fix.patch changes /usr/local/lib/go-charset/datafiles
- to /usr/share/go-charset/datafiles to met the Fedora Packaging Guidelines
- requirements;
- patch sprintf-fatalf-invalid-args-fix.patch fixes ill-formed format string
- in fmt.Sprintf (charset/ascii.go) and forgotten t.Fatalf arguments
- (charset/charset_test.go)
diff --git a/sources b/sources
deleted file mode 100644
index 592f802..0000000
--- a/sources
+++ /dev/null
@@ -1 +0,0 @@
-SHA512 (go-charset-55c9d7a5834c4d034b34bf042103dbc646887f4f.tar.gz) = a8d6bce3a7ef08a4be0a8f641334b143821e9668af376c08fe66c1a89388354b1528590df23d22bffd9f15c8f2ef8200b02f41f068539a1cd02ab590b3396e6b
commit c331eb05f2b235cacc96f61f686a9d119d892baa
Author: Robert-Andr Mauchin <zebob.m(a)gmail.com>
Date: Tue May 28 16:20:34 2019 +0200
Bump to commit 55c9d7a5834c4d034b34bf042103dbc646887f4f
Signed-off-by: Robert-Andr Mauchin <zebob.m(a)gmail.com>
diff --git a/.gitignore b/.gitignore
index 72f689b..be64ad9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/go-charset-621bb39.tar.gz
+/go-charset-55c9d7a5834c4d034b34bf042103dbc646887f4f.tar.gz
diff --git a/golang-github-paulrosania-charset.spec b/golang-github-paulrosania-charset.spec
new file mode 100644
index 0000000..d0a29f9
--- /dev/null
+++ b/golang-github-paulrosania-charset.spec
@@ -0,0 +1,66 @@
+# Generated by go2rpm
+%bcond_without check
+
+# https://github.com/paulrosania/go-charset
+%global goipath github.com/paulrosania/go-charset
+%global commit 55c9d7a5834c4d034b34bf042103dbc646887f4f
+
+%gometa
+
+%global common_description %{expand:
+A fork of go-charset, which itself is a port of inferno's convcs for Go, which
+supports conversion to and from UTF-8.}
+
+%global golicenses LICENSE
+%global godocs README.md
+
+Name: %{goname}
+Version: 0
+Release: 0.4%{?dist}
+Summary: Character set conversion for Go
+
+# Upstream license specification: BSD-3-Clause
+License: BSD
+URL: %{gourl}
+Source0: %{gosource}
+# Changes /usr/local/lib/go-charset/datafiles to /usr/share/go-charset/datafiles
+Patch0: charsetdir-fedora-fix.patch
+
+%description
+%{common_description}
+
+%gopkg
+
+%prep
+%goprep
+
+%install
+%gopkginstall
+
+%if %{with check}
+%check
+%gocheck
+%endif
+
+%gopkgfiles
+
+%changelog
+* Tue May 28 16:04:16 CEST 2019 Robert-Andr Mauchin <zebob.m(a)gmail.com> - 0-0.4.20190528git55c9d7a
+- Bump to commit 55c9d7a5834c4d034b34bf042103dbc646887f4f
+
+* Fri Feb 01 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 0-0.3.20151028git621bb39
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Fri Jul 13 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 0-0.2.20151028git621bb39
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Thu Feb 15 2018 Jiri Kucera <jkucera(a)redhat.com> - 0-0.1.20151028git621bb39
+- First package for Fedora
+ this package is required by golang-github-elazarl-goproxy package, which is
+ a dependency of bettercap 2.0.0 (resolves #1540726);
+ patch charsetdir-fedora-fix.patch changes /usr/local/lib/go-charset/datafiles
+ to /usr/share/go-charset/datafiles to met the Fedora Packaging Guidelines
+ requirements;
+ patch sprintf-fatalf-invalid-args-fix.patch fixes ill-formed format string
+ in fmt.Sprintf (charset/ascii.go) and forgotten t.Fatalf arguments
+ (charset/charset_test.go)
diff --git a/golang-github-paulrosania-go-charset.spec b/golang-github-paulrosania-go-charset.spec
deleted file mode 100644
index 49e481d..0000000
--- a/golang-github-paulrosania-go-charset.spec
+++ /dev/null
@@ -1,229 +0,0 @@
-# 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 paulrosania
-%global repo go-charset
-# https://github.com/paulrosania/go-charset
-%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
-%global import_path %{provider_prefix}
-%global commit 621bb39fcc835dce592e682f5073025d0169587b
-%global commitdate 20151028
-%global shortcommit %(c=%{commit}; echo ${c:0:7})
-# Package specific macros:
-%global pkgdata_prefix %{_datadir}/%{repo}
-%global charset_dir datafiles
-
-Name: golang-%{provider}-%{project}-%{repo}
-Version: 0
-Release: 0.3.%{commitdate}git%{shortcommit}%{?dist}
-Summary: Character set conversion for Go
-License: BSD
-URL: https://%{provider_prefix}
-Source0: https://%{provider_prefix}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz
-Patch0: charsetdir-fedora-fix.patch
-Patch1: sprintf-fatalf-invalid-args-fix.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}
-
-%description
-%{summary}
-
-%if 0%{?with_devel}
-%package devel
-Summary: %{summary}
-BuildArch: noarch
-
-%if 0%{?with_check}
-%endif
-
-Provides: golang(%{import_path}/charset) = %{version}-%{release}
-Provides: golang(%{import_path}/charset/iconv) = %{version}-%{release}
-Provides: golang(%{import_path}/data) = %{version}-%{release}
-
-%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}
-
-%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}
-%patch0 -p1
-mv charset/file.go charset/file.go.in
-sed -e "s,@_DATADIR@,%{_datadir},g" charset/file.go.in > charset/file.go
-rm charset/file.go.in
-%patch1 -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
-# - skip ./cmd directory since there is nothing useful for us
-# - skip ./%%{charset_dir} directory since we treat it later
-for file in $(find . -iname "*.go" \! \( \
- -path "./cmd" -o -path "./cmd/*" \
- -o -path "./%{charset_dir}" -o -path "./%{charset_dir}/*" \
- -o -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
-# - now handle ./%%{charset_dir} (maybe worthless step since all the content of
-# ./%%{charset_dir} is included in ./data/*.go files, but since readFile use
-# %%{pkgdata_prefix}/%%{charset_dir} when it meets unregistered charset, we
-# install ./%%{charset_dir} to this directory to prevent some kinds of
-# unexpected errors, especially those caused by forgotten sync between ./data
-# and ./%%{charset_dir})
-install -d -p %{buildroot}%{pkgdata_prefix}/
-echo "%%dir %%{pkgdata_prefix}/." >> devel.file-list
-for file in $(find . -path "./%{charset_dir}/*") ; do
- dirprefix=$(dirname $file)
- install -d -p %{buildroot}%{pkgdata_prefix}/$dirprefix
- cp -pav $file %{buildroot}%{pkgdata_prefix}/$file
- echo "%%{pkgdata_prefix}/$file" >> devel.file-list
-
- while [ "$dirprefix" != "." ]; do
- echo "%%dir %%{pkgdata_prefix}/$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" \! \( \
- -path "./cmd" -o -path "./cmd/*" \
- -o -path "./%{charset_dir}" -o -path "./%{charset_dir}/*" \
-\)) ; 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
-
-%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
-
-export GOPATH=%{buildroot}%{gopath}:%{gopath}
-%endif
-
-%if ! 0%{?gotest:1}
-%global gotest go test
-%endif
-
-%gotest %{import_path}/charset
-%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
-* Fri Feb 01 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 0-0.3.20151028git621bb39
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Fri Jul 13 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 0-0.2.20151028git621bb39
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Thu Feb 15 2018 Jiri Kucera <jkucera(a)redhat.com> - 0-0.1.20151028git621bb39
-- First package for Fedora
- this package is required by golang-github-elazarl-goproxy package, which is
- a dependency of bettercap 2.0.0 (resolves #1540726);
- patch charsetdir-fedora-fix.patch changes /usr/local/lib/go-charset/datafiles
- to /usr/share/go-charset/datafiles to met the Fedora Packaging Guidelines
- requirements;
- patch sprintf-fatalf-invalid-args-fix.patch fixes ill-formed format string
- in fmt.Sprintf (charset/ascii.go) and forgotten t.Fatalf arguments
- (charset/charset_test.go)
diff --git a/sources b/sources
index 1387706..592f802 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (go-charset-621bb39.tar.gz) = 34ddafaec81676bb2082e4b5e05e49d3c7cc86b08733112c422d56453fbb151c88d013f287468abf4fafa27fbc48ef3f71cf278745b0e7a283844756161fcff0
+SHA512 (go-charset-55c9d7a5834c4d034b34bf042103dbc646887f4f.tar.gz) = a8d6bce3a7ef08a4be0a8f641334b143821e9668af376c08fe66c1a89388354b1528590df23d22bffd9f15c8f2ef8200b02f41f068539a1cd02ab590b3396e6b
diff --git a/sprintf-fatalf-invalid-args-fix.patch b/sprintf-fatalf-invalid-args-fix.patch
deleted file mode 100644
index 1cd68b6..0000000
--- a/sprintf-fatalf-invalid-args-fix.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 5d78b07dfaa8842c012de0c55cbbc1ac28fe1a23 Mon Sep 17 00:00:00 2001
-From: Jiri Kucera <jkucera(a)redhat.com>
-Date: Thu, 15 Feb 2018 23:11:09 +0100
-Subject: [PATCH] Invalid format string and forgotten arguments
-
----
- charset/ascii.go | 2 +-
- charset/charset_test.go | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/charset/ascii.go b/charset/ascii.go
-index ccf3a35..0e73d06 100644
---- a/charset/ascii.go
-+++ b/charset/ascii.go
-@@ -21,7 +21,7 @@ type codePointError struct {
- }
-
- func (e *codePointError) Error() string {
-- return fmt.Sprintf("Parse error at index %n: Code point %n is undefined in %s", e.i, e.cp, e.charset)
-+ return fmt.Sprintf("Parse error at index %d: Code point %d is undefined in %s", e.i, e.cp, e.charset)
- }
-
- func (strict translateFromASCII) Translate(data []byte, eof bool) (int, []byte, error) {
-diff --git a/charset/charset_test.go b/charset/charset_test.go
-index fda2d85..03d0782 100644
---- a/charset/charset_test.go
-+++ b/charset/charset_test.go
-@@ -177,7 +177,7 @@ func testTranslatingReader(t *testing.T, tr charset.Translator, inReader, outRea
- }
- err = checkTranslation(data, outbuf.Bytes())
- if err != nil {
-- t.Fatalf("translator %T, readers %T, %T, %v\n", err)
-+ t.Fatalf("translator %T, readers %T, %T, %v\n", tr, inr, outr, err)
- }
- }
-