Architecture specific change in rpms/deepin-dbus-generator.git
by githook-noreply@fedoraproject.org
The package rpms/deepin-dbus-generator.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/deepin-dbus-generator.git/commit/....
Change:
-ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
Thanks.
Full change:
============
commit 5598ea311f6492af86648b42de0daa8c89295af0
Author: Robert-Andr Mauchin <zebob.m(a)gmail.com>
Date: Tue Jun 4 23:16:36 2019 +0200
Update to new macros
Signed-off-by: Robert-Andr Mauchin <zebob.m(a)gmail.com>
diff --git a/deepin-dbus-generator.spec b/deepin-dbus-generator.spec
index 3fb89d5..b887f1d 100644
--- a/deepin-dbus-generator.spec
+++ b/deepin-dbus-generator.spec
@@ -1,46 +1,64 @@
-%global repo go-dbus-generator
-
-Name: deepin-dbus-generator
-Version: 0.6.6
-Release: 6%{?dist}
-Summary: Convert dbus interfaces to go-lang or qml wrapper code
-License: GPLv3+
-URL: https://github.com/linuxdeepin/go-dbus-generator
-Source0: %{url}/archive/%{version}/%{repo}-%{version}.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}}
-BuildRequires: golang
-BuildRequires: golang(gopkg.in/check.v1)
-BuildRequires: golang(pkg.deepin.io/lib)
+# Generated by go2rpm
+%bcond_without check
+
+# https://github.com/linuxdeepin/go-dbus-generator
+%global goipath github.com/linuxdeepin/go-dbus-generator
+Version: 0.6.6
+%global tag 0.6.6
+
+%gometa
+
+%global goname deepin-dbus-generator
+
+%global common_description %{expand:
+Convert dbus interfaces to Golang or QML wrapper code.}
+
+%global golicenses LICENSE
+%global godocs README.md
+
+Name: %{goname}
+Release: 7%{?dist}
+Summary: Convert dbus interfaces to Golang or QML wrapper code
+
+License: GPLv3
+URL: %{gourl}
+Source0: %{gosource}
+
+BuildRequires: golang(pkg.deepin.io/lib/dbus)
+BuildRequires: golang(pkg.deepin.io/lib/dbus/introspect)
BuildRequires: pkgconfig(glib-2.0)
BuildRequires: pkgconfig(gobject-2.0)
BuildRequires: pkgconfig(Qt5)
BuildRequires: pkgconfig(Qt5Qml)
+%if %{with check}
+# Tests
+BuildRequires: golang(gopkg.in/check.v1)
+%endif
+
%description
-Static dbus binding generator for dlib.
+%{common_description}
%prep
-%setup -q -n %{repo}-%{version}
-# qmake path
-sed -i 's|qmake|qmake-qt5|' build_test.go template_qml.go
+%goprep
+find . -name "*.go" -exec sed -i "s|launchpad.net/gocheck|gopkg.in/check.v1|" "{}" +;
%build
-export GOPATH="%{gopath}"
-BUILD_ID="0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \n')"
-function gobuild { go build -a -ldflags "-B $BUILD_ID" -v -x "$@"; }
-gobuild -o dbus-generator
+%gobuild -o %{gobuilddir}/bin/dbus-generator %{goipath}
%install
-install -Dm755 dbus-generator %{buildroot}%{_bindir}/dbus-generator
+install -m 0755 -vd %{buildroot}%{_bindir}
+install -m 0755 -vp %{gobuilddir}/bin/* %{buildroot}%{_bindir}/
%files
-%doc README.md
%license LICENSE
-%{_bindir}/dbus-generator
+%doc README.md
+%{_bindir}/*
%changelog
+* Tue Jun 04 22:43:13 CEST 2019 Robert-Andr Mauchin <zebob.m(a)gmail.com> - 0.6.6-7
+- Update to new macros
+
* Thu Jan 31 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.6.6-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
4 years, 9 months
Architecture specific change in rpms/deepin-gir-generator.git
by githook-noreply@fedoraproject.org
The package rpms/deepin-gir-generator.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/deepin-gir-generator.git/commit/?....
Change:
-ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
Thanks.
Full change:
============
commit 9ca6785b45032eaaa8cdf308dbdc18b6e4987127
Author: Robert-Andr Mauchin <zebob.m(a)gmail.com>
Date: Tue Jun 4 20:52:35 2019 +0200
Update to new macros
Signed-off-by: Robert-Andr Mauchin <zebob.m(a)gmail.com>
diff --git a/.gitignore b/.gitignore
index 758ad81..5c4fd2b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
/go-gir-generator-1.0.4.tar.gz
/go-gir-generator-1.1.0.tar.gz
/go-gir-generator-1.2.0.tar.gz
+/go-gir-generator-2.0.2.tar.gz
diff --git a/SettingsBackendLike.patch b/SettingsBackendLike.patch
deleted file mode 100644
index 74b0660..0000000
--- a/SettingsBackendLike.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 55ad8df560b2a8aec3462e61edff781f11cf86a9 Mon Sep 17 00:00:00 2001
-From: jouyouyun <jouyouwen717(a)gmail.com>
-Date: Mon, 24 Oct 2016 19:43:32 +0800
-Subject: [PATCH] Fix 'SettingsBackendLike' undefined
-
-Change-Id: I9b817b3a6ec26ce8023e26a6b2c7abc67074d53f
----
-
-diff --git a/lib.in/gio-2.0/config.json b/lib.in/gio-2.0/config.json
-index aaf75ed..7733140 100644
---- a/lib.in/gio-2.0/config.json
-+++ b/lib.in/gio-2.0/config.json
-@@ -35,6 +35,7 @@
- "AppLaunchContext",
- "Emblem",
- "Settings",
-+ "SettingsBackend",
- "FileMonitor",
- "FileInfo",
- "InputStream",
-@@ -52,7 +53,6 @@
- "FileAttributeInfoList",
- "FileAttributeMatcher",
- "ActionEntry",
-- "SettingsBackend",
- "MountIface"
- //"SettingsSchema"
- ],
-diff --git a/lib.in/glib-2.0/config.json b/lib.in/glib-2.0/config.json
-index 88a8314..4290004 100644
---- a/lib.in/glib-2.0/config.json
-+++ b/lib.in/glib-2.0/config.json
-@@ -11,7 +11,8 @@
- "KeyFile",
- "Variant",
- "VariantType",
-- "PollFD"
-+ "PollFD",
-+ "Tree"
- ],
- "functions": [
- "get_user_cache_dir",
diff --git a/deepin-gir-generator.spec b/deepin-gir-generator.spec
index 6dd3f2a..ae47023 100644
--- a/deepin-gir-generator.spec
+++ b/deepin-gir-generator.spec
@@ -1,55 +1,76 @@
-%global repo go-gir-generator
+# Generated by go2rpm
+%bcond_without check
-Name: deepin-gir-generator
-Version: 1.2.0
-Release: 1%{?dist}
+# https://github.com/linuxdeepin/go-gir-generator
+%global goipath pkg.deepin.io/gir
+%global forgeurl https://github.com/linuxdeepin/go-gir-generator
+Version: 2.0.2
+%global tag 2.0.2
+
+%gometa
+
+%global goname deepin-gir-generator
+
+%global common_description %{expand:
+Generate static golang bindings for GObject.}
+
+%global golicenses LICENSE
+%global godocs CHANGELOG.md README.md
+
+Name: %{goname}
+Release: 2%{?dist}
Summary: Generate static golang bindings for GObject
+
License: GPLv3
-URL: https://github.com/linuxdeepin/go-gir-generator
-Source0: %{url}/archive/%{version}/%{repo}-%{version}.tar.gz
-Patch0: SettingsBackendLike.patch
-# https://cr.deepin.io/#/c/go-gir-generator/+/41653/
-Patch1: %{name}_build-with-glib2.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 %{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}
+
BuildRequires: pkgconfig(gobject-introspection-1.0)
BuildRequires: pkgconfig(gudev-1.0)
-Provides: golang(gir/gobject-2.0)
-Provides: golang(gir/gio-2.0)
-Provides: golang(gir/glib-2.0)
-Provides: golang(gir/gudev-1.0)
+
+%if %{with check}
+# Tests
+BuildRequires: golang(gopkg.in/check.v1)
+%endif
%description
-Generate static golang bindings for GObject
+%{common_description}
%prep
-%setup -q -n %{repo}-%{version}
-
-GIO_VER=$(v=$(rpm -q --qf %{RPMTAG_VERSION} gobject-introspection); echo ${v//./})
-if [ $GIO_VER -ge 1521 ]; then
-# Our gobject-introspection is too new
-# https://cr.deepin.io/#/c/16880/
-%patch0 -p1
-%patch1 -p1
-fi
+%goprep
+rm -rf gogtk-demo
+find . -name ".gitignore" -delete
+sed -i "s#go build#go build -buildmode pie -compiler gc -tags=\"rpm_crashtraceback \${BUILDTAGS:-}\" -ldflags \"\${LDFLAGS:-} -B 0x\$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\\n') -extldflags '-Wl,-z,relro -Wl,--as-needed -Wl,-z,now -specs=/usr/lib/rpm/redhat/redhat-hardened-ld '\" -a -v -x#" Makefile
%build
+mkdir -p out/src/pkg.deepin.io/gir/{glib-2.0,gio-2.0,gobject-2.0,gudev-1.0}
export GOPATH="%{gopath}"
%make_build
%install
%make_install
+rm -rf lib.in out src test
+%gopkginstall
%files
-%doc README.md
+%doc CHANGELOG.md README.md
%license LICENSE
%{_bindir}/gir-generator
-%{gopath}/src/gir/
+%{gopath}/src/pkg.deepin.io/
%changelog
+* Tue Jun 04 19:37:05 CEST 2019 Robert-Andr Mauchin <zebob.m(a)gmail.com> - 2.0.2-2
+- Update to new macros
+
+* Fri May 10 2019 Robin Lee <cheeselee(a)fedoraproject.org> - 2.0.2-1
+- new version
+
+* Wed Apr 17 2019 Robin Lee <cheeselee(a)fedoraproject.org> - 2.0.1-1
+- new version
+
+* Thu Mar 28 2019 Robin Lee <cheeselee(a)fedoraproject.org> - 2.0.0-1
+- new version
+
* Thu Jan 31 2019 mosquito <sensor.wen(a)gmail.com> - 1.2.0-1
- Update to 1.2.0
diff --git a/deepin-gir-generator_build-with-glib2.patch b/deepin-gir-generator_build-with-glib2.patch
deleted file mode 100644
index 4946619..0000000
--- a/deepin-gir-generator_build-with-glib2.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 45d1e2d91b6ee19866ed319f29e0fe561105e80b Mon Sep 17 00:00:00 2001
-From: Felix Yan <felixonmars(a)archlinux.org>
-Date: Sat, 16 Feb 2019 03:56:07 +0800
-Subject: [PATCH] fix: build issues with new glib2/gobject-introspection
-
-This should fix build errors on Fedora. Tested with glib2 2.59.2 and
-gobject-introspection 1.59.4.
-
-Change-Id: Ia1a21978e7494762ca9418ad57b32bcc4311e221
----
-
-diff --git a/lib.in/gio-2.0/config.json b/lib.in/gio-2.0/config.json
-index de0be17..ef2cb51 100644
---- a/lib.in/gio-2.0/config.json
-+++ b/lib.in/gio-2.0/config.json
-@@ -53,7 +53,8 @@
- "FileAttributeInfoList",
- "FileAttributeMatcher",
- "ActionEntry",
-- "MountIface"
-+ "MountIface",
-+ "OutputVector"
- //"SettingsSchema"
- ],
- "interfaces": [
diff --git a/sources b/sources
index 13a48ac..3e79eb2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (go-gir-generator-1.2.0.tar.gz) = 8fefad81103f614bb5c172df5255ff36a395923d9d82faf54f6a21ad4c38f59bdcab3c6f94ee7298debec46c79981a58011cf38f52effe2cde819ef399e9d5ce
+SHA512 (go-gir-generator-2.0.2.tar.gz) = 1f1efed3299e2fc2eea75f22cf9b3d04ab75242c9bd1aa2fa42acdf90988d17cd16b4252da235df5dd3a7d82e8a85bfd35c441fa43a4cd7002510c56df4325e7
4 years, 9 months
Architecture specific change in rpms/golang-github-jdkato-prose.git
by githook-noreply@fedoraproject.org
The package rpms/golang-github-jdkato-prose.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-jdkato-prose.git/co....
Change:
-ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
Thanks.
Full change:
============
commit 5cb5e07b4495e8d55a00b4c2866e2a4a5901d7dc
Author: Robert-Andr Mauchin <zebob.m(a)gmail.com>
Date: Mon Jun 3 17:35:56 2019 +0200
Update to new macros
Signed-off-by: Robert-Andr Mauchin <zebob.m(a)gmail.com>
diff --git a/golang-github-jdkato-prose.spec b/golang-github-jdkato-prose.spec
index 8e5e43a..73223f2 100644
--- a/golang-github-jdkato-prose.spec
+++ b/golang-github-jdkato-prose.spec
@@ -1,235 +1,73 @@
-# 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)
+# Generated by go2rpm
+%bcond_without check
-# Generate devel rpm
-%global with_devel 1
-# Build project from bundled dependencies
-%global with_bundled 0
-# Build with debug info rpm
-%global with_debug 1
-# Run tests in check section
-%global with_check 1
-# Generate unit-test rpm
-%global with_unit_test 1
+# https://github.com/jdkato/prose
+%global goipath github.com/jdkato/prose
+Version: 1.1.0
-%if 0%{?with_debug}
-%global _dwz_low_mem_die_limit 0
-%else
-%global debug_package %{nil}
-%endif
+%gometa
-%if ! 0%{?gobuild:1}
-%define gobuild(o:) go build -ldflags "${LDFLAGS:-} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n')" -a -v -x %{?**};
-%endif
+%global common_description %{expand:
+Prose is a natural language processing library (English only) in pure Go. It
+supports tokenization, segmentation, part-of-speech tagging, and named-entity
+extraction.}
-%global provider github
-%global provider_tld com
-%global project jdkato
-%global repo prose
-# https://github.com/jdkato/prose
-%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
-%global import_path %{provider_prefix}
+%global golicenses LICENSE
+%global godocs AUTHORS.md README.md requirements.txt
-Name: golang-%{provider}-%{project}-%{repo}
-Version: 1.1.0
-Release: 1%{?dist}
+Name: %{goname}
+Release: 2%{?dist}
Summary: Golang library for text processing
-License: MIT
-URL: https://%{provider_prefix}
-Source0: https://%{provider_prefix}/archive/v%{version}/%{repo}-%{version}.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}
-# Provide main package name
-Provides: prose%{?_isa} = %{version}-%{release}
+License: MIT
+URL: %{gourl}
+Source0: %{gosource}
-%if ! 0%{?with_bundled}
-# cmd/prose/main.go
-BuildRequires: golang(github.com/urfave/cli)
+BuildRequires: golang(github.com/montanaflynn/stats)
+BuildRequires: golang(github.com/shogo82148/go-shuffle)
+BuildRequires: golang(github.com/urfave/cli)
+BuildRequires: golang(gopkg.in/neurosnap/sentences.v1)
+BuildRequires: golang(gopkg.in/neurosnap/sentences.v1/data)
-# Remaining dependencies not included in main packages
-BuildRequires: golang(github.com/montanaflynn/stats)
-BuildRequires: golang(github.com/shogo82148/go-shuffle)
-BuildRequires: golang(github.com/neurosnap/sentences)
+%if %{with check}
+# Tests
+BuildRequires: golang(github.com/stretchr/testify/assert)
%endif
%description
-%{summary}
-
-%if 0%{?with_devel}
-%package devel
-Summary: %{summary}
-BuildArch: noarch
-
-%if 0%{?with_check} && ! 0%{?with_bundled}
-BuildRequires: golang(github.com/montanaflynn/stats)
-BuildRequires: golang(github.com/shogo82148/go-shuffle)
-BuildRequires: golang(github.com/neurosnap/sentences)
-%endif
-
-Requires: golang(github.com/montanaflynn/stats)
-Requires: golang(github.com/shogo82148/go-shuffle)
-Requires: golang(github.com/neurosnap/sentences)
-
-Provides: golang(%{import_path}) = %{version}-%{release}
-Provides: golang(%{import_path}/chunk) = %{version}-%{release}
-Provides: golang(%{import_path}/summarize) = %{version}-%{release}
-Provides: golang(%{import_path}/tag) = %{version}-%{release}
-Provides: golang(%{import_path}/tokenize) = %{version}-%{release}
-Provides: golang(%{import_path}/transform) = %{version}-%{release}
-
-%description devel
-%{summary}
+%{common_description}
-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: golang(github.com/jdkato/syllables)
-BuildRequires: golang(github.com/stretchr/testify/assert)
-%endif
-
-Requires: golang(github.com/jdkato/syllables)
-Requires: golang(github.com/stretchr/testify/assert)
-
-%description unit-test-devel
-%{summary}
-
-This package contains unit tests for project
-providing packages with %{import_path} prefix.
-%endif
+%gopkg
%prep
-%setup -q -n %{repo}-%{version}
+%goprep
%build
-mkdir -p src/%{provider}.%{provider_tld}/%{project}
-ln -s ../../../ src/%{import_path}
-
-%if ! 0%{?with_bundled}
-export GOPATH=$(pwd):%{gopath}
-%else
-# No dependency directories so far
-export GOPATH=$(pwd):%{gopath}
-%endif
-
-%gobuild -o bin/cmd/prose %{import_path}/cmd/prose
-
-%install
-install -d -p %{buildroot}%{_bindir}
-install -p -m 0755 bin/cmd/prose %{buildroot}%{_bindir}
-
-# 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
+for cmd in cmd/* ; do
+ %gobuild -o %{gobuilddir}/bin/$(basename $cmd) %{goipath}/$cmd
done
-# install data used for tests
-cp -rpav ./testdata %{buildroot}/%{gopath}/src/%{import_path}/
-echo "%%{gopath}/src/%%{import_path}/testdata" >> unit-test-devel.file-list
-%endif
-%if 0%{?with_devel}
-sort -u -o devel.file-list devel.file-list
-%endif
+%install
+%gopkginstall
+install -m 0755 -vd %{buildroot}%{_bindir}
+install -m 0755 -vp %{gobuilddir}/bin/* %{buildroot}%{_bindir}/
+%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
+%gocheck
%endif
-%gotest %{import_path}/chunk
-%gotest %{import_path}/summarize
-%gotest %{import_path}/tag
-%gotest %{import_path}/tokenize
-%gotest %{import_path}/transform
-%endif
-
-#define license tag if not already defined
-%{!?_licensedir:%global license %doc}
-
%files
%license LICENSE
-%doc AUTHORS.md README.md
-%{_bindir}/prose
+%doc AUTHORS.md README.md requirements.txt
+%{_bindir}/*
-%if 0%{?with_devel}
-%files devel -f devel.file-list
-%license LICENSE
-%doc AUTHORS.md 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 AUTHORS.md README.md
-%endif
+%gopkgfiles
%changelog
+* Mon Jun 03 17:24:47 CEST 2019 Robert-Andr Mauchin <zebob.m(a)gmail.com> - 1.1.0-2
+- Update to new macros
+
* Sat Feb 09 2019 Elliott Sales de Andrade <quantum.analyst(a)gmail.com> - 1.1.0-1
- Update to latest tagged version
4 years, 9 months
Architecture specific change in rpms/golang-github-lpabon-godbc.git
by githook-noreply@fedoraproject.org
The package rpms/golang-github-lpabon-godbc.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-lpabon-godbc.git/co....
Change:
-ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
Thanks.
Full change:
============
commit 96beeefc715f53c71549217a162c16d5ce1c50ab
Author: Robert-Andr Mauchin <zebob.m(a)gmail.com>
Date: Sun Jun 2 21:19:34 2019 +0200
Update to new macros
Signed-off-by: Robert-Andr Mauchin <zebob.m(a)gmail.com>
diff --git a/.gitignore b/.gitignore
index e3135a9..7f6eb48 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/godbc-9577782.tar.gz
+/godbc-9577782540c1398b710ddae1b86268ba03a19b0c.tar.gz
diff --git a/golang-github-lpabon-godbc.spec b/golang-github-lpabon-godbc.spec
index f7f6f2d..b42a8f5 100644
--- a/golang-github-lpabon-godbc.spec
+++ b/golang-github-lpabon-godbc.spec
@@ -1,157 +1,59 @@
-%if 0%{?fedora} || 0%{?rhel} == 6
-%global with_devel 1
-%global with_bundled 0
-%global with_debug 0
-%global with_check 1
-%global with_unit_test 1
-%else
-%global with_devel 0
-%global with_bundled 0
-%global with_debug 0
-%global with_check 0
-%global with_unit_test 0
-%endif
-
-%if 0%{?with_debug}
-%global _dwz_low_mem_die_limit 0
-%else
-%global debug_package %{nil}
-%endif
-
-%define copying() \
-%if 0%{?fedora} >= 21 || 0%{?rhel} >= 7 \
-%license %{*} \
-%else \
-%doc %{*} \
-%endif
+# Generated by go2rpm
+%bcond_without check
-%global provider github
-%global provider_tld com
-%global project lpabon
-%global repo godbc
# https://github.com/lpabon/godbc
-%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
-%global import_path %{provider_prefix}
+%global goipath github.com/lpabon/godbc
+Version: 1.0.1
%global commit 9577782540c1398b710ddae1b86268ba03a19b0c
-%global shortcommit %(c=%{commit}; echo ${c:0:7})
-Name: golang-%{provider}-%{project}-%{repo}
-Version: 1.0.1
-Release: 10.git%{shortcommit}%{?dist}
-Summary: Design by contract for Go
-License: ASL 2.0
-URL: https://%{provider_prefix}
-Source0: https://%{provider_prefix}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz
+%gometa
-# e.g. el6 has ppc64 arch without gcc-go, so EA tag is required
-ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{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}
+%global common_description %{expand:
+Design by Contract is a programming methodology which binds the caller and the
+function called to a contract. The contract is represented using Hoare Triple:
+ {P} C {Q}
+where {P} is the precondition before executing command C, and {Q} is the
+postcondition. }
-%if 0%{?with_devel}
-%package devel
-Summary: %{summary}
-BuildArch: noarch
+%global golicenses LICENSE
+%global godocs README.md AUTHORS
-%if 0%{?with_check}
-BuildRequires: golang(github.com/stretchr/testify/assert)
-%endif
-
-Requires: golang(github.com/stretchr/testify/assert)
-
-Provides: golang(%{import_path}) = %{version}-%{release}
-
-%description devel
-%{summary}
-
-This package contains library source intended for
-building other packages which use import path with
-%{import_path} prefix.
-%endif
+Name: %{goname}
+Release: 11%{?dist}
+Summary: Design by contract for Go
-%if 0%{?with_unit_test} && 0%{?with_devel}
-%package unit-test-devel
-Summary: Unit tests for %{name} package
-# 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}
+# Upstream license specification: Apache-2.0
+License: ASL 2.0
+URL: %{gourl}
+Source0: %{gosource}
-%if 0%{?with_check}
-#Here comes all BuildRequires: PACKAGE the unit tests
-#in %%check section need for running
+%if %{with check}
+# Tests
+BuildRequires: golang(github.com/stretchr/testify/assert)
%endif
-# test subpackage tests code from devel subpackage
-Requires: %{name}-devel = %{version}-%{release}
-
-%description unit-test-devel
-%{summary}
+%description
+%{common_description}
-This package contains unit tests for project
-providing packages with %{import_path} prefix.
-%endif
+%gopkg
%prep
-%setup -q -n %{repo}-%{commit}
-
-%build
+%goprep
%install
-# source codes for building projects
-%if 0%{?with_devel}
-install -d -p %{buildroot}/%{gopath}/src/%{import_path}/
-# find all *.go but no *_test.go files and generate devel.file-list
-for file in $(find . -iname "*.go" \! -iname "*_test.go") ; do
- echo "%%dir %%{gopath}/src/%%{import_path}/$(dirname $file)" >> devel.file-list
- install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$(dirname $file)
- cp -pav $file %{buildroot}/%{gopath}/src/%{import_path}/$file
- echo "%%{gopath}/src/%%{import_path}/$file" >> devel.file-list
-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
- echo "%%dir %%{gopath}/src/%%{import_path}/$(dirname $file)" >> devel.file-list
- install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$(dirname $file)
- cp -pav $file %{buildroot}/%{gopath}/src/%{import_path}/$file
- echo "%%{gopath}/src/%%{import_path}/$file" >> unit-test-devel.file-list
-done
-%endif
-
-%if 0%{?with_devel}
-sort -u -o devel.file-list devel.file-list
-%endif
+%gopkginstall
+%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
-export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath}
-%endif
-%gotest %{import_path}
-%endif
-
-%if 0%{?with_devel}
-%files devel -f devel.file-list
-%copying LICENSE
-%doc README.md AUTHORS
-%dir %{gopath}/src/%{provider}.%{provider_tld}/%{project}
-%dir %{gopath}/src/%{import_path}
+%gocheck
%endif
-%if 0%{?with_unit_test} && 0%{?with_devel}
-%files unit-test-devel -f unit-test-devel.file-list
-%copying LICENSE
-%doc README.md AUTHORS
-%endif
+%gopkgfiles
%changelog
+* Sun Jun 02 21:13:37 CEST 2019 Robert-Andr Mauchin <zebob.m(a)gmail.com> - 1.0.1-11.20190602git9577782
+- Update to new macros
+
* Fri Feb 01 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.0.1-10.git9577782
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
@@ -181,5 +83,3 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath}
* Wed Oct 14 2015 lpabon <lpabon(a)redhat.com> - 1.0.1-1.git9577782
- First package for Fedora
-
-
diff --git a/sources b/sources
index da50ad1..70307ef 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-678025a23e3cadc99f135cd896f413b5 godbc-9577782.tar.gz
+SHA512 (godbc-9577782540c1398b710ddae1b86268ba03a19b0c.tar.gz) = 5372ecf97c5113311738c0bb39351b0bc9f1ada157077b71dbba06cf2aac3f533e1128c712f32b53b140b97a635d1e969dbab64ee2f5a5899c6b1d5820981b6e
4 years, 9 months
Architecture specific change in rpms/golang-github-gosexy-gettext.git
by githook-noreply@fedoraproject.org
The package rpms/golang-github-gosexy-gettext.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-gosexy-gettext.git/....
Change:
-ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
Thanks.
Full change:
============
commit c04421d6d9fa93d47a5a927d406021658522a782
Author: Robert-Andr Mauchin <zebob.m(a)gmail.com>
Date: Sun Jun 2 21:11:04 2019 +0200
Release 0.9
Signed-off-by: Robert-Andr Mauchin <zebob.m(a)gmail.com>
diff --git a/.gitignore b/.gitignore
index 2b33850..b99cd72 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/golang-github-gosexy-gettext.spec
/gettext-305f360.tar.gz
+/gettext-0.9.tar.gz
diff --git a/golang-github-gosexy-gettext.spec b/golang-github-gosexy-gettext.spec
index be34682..a036ad8 100644
--- a/golang-github-gosexy-gettext.spec
+++ b/golang-github-gosexy-gettext.spec
@@ -1,185 +1,80 @@
-%if 0%{?fedora} || 0%{?rhel} == 6
-%global with_devel 1
-%global with_bundled 0
-%global with_debug 0
-%global with_check 1
-%global with_unit_test 1
-%else
-%global with_devel 0
-%global with_bundled 0
-%global with_debug 0
-%global with_check 0
-%global with_unit_test 0
-%endif
-
-%if 0%{?with_debug}
-%global _dwz_low_mem_die_limit 0
-%else
-%global debug_package %{nil}
-%endif
+# Generated by go2rpm
+%bcond_without check
-%global provider github
-%global provider_tld com
-%global project gosexy
-%global repo gettext
# https://github.com/gosexy/gettext
-%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
-%global import_path %{provider_prefix}
-%global commit 305f360aee30243660f32600b87c3c1eaa947187
-%global shortcommit %(c=%{commit}; echo ${c:0:7})
-
-Name: golang-%{provider}-%{project}-%{repo}
-Version: 0
-Release: 0.8.git%{shortcommit}%{?dist}
-Summary: Gettext support for the Go language
-License: MIT
-URL: https://%{provider_prefix}
-Source0: https://%{provider_prefix}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz
+%global goipath github.com/gosexy/gettext
+Version: 0.9
-# e.g. el6 has ppc64 arch without gcc-go, so EA tag is required
-ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{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}
-BuildRequires: golang(github.com/jessevdk/go-flags)
+%gometa
-%description
-Go bindings for GNU gettext, an internationalization and localization library
-for writing multilingual systems.
-
-%package -n go-xgettext
-Summary: Program for extracting translatable strings from Go programs
-%description -n go-xgettext
-The go-xgettext program is an implementation of xgettext implemented in go.
-It can reliably parse go source files to identify content to translate.
+%global godevelheader %{expand:
+Requires: gettext-devel}
-%if 0%{?with_devel}
-%package devel
-Summary: %{summary}
-BuildArch: noarch
+%global common_description %{expand:
+Go bindings for GNU gettext, an internationalization and localization library
+for writing multilingual systems.}
-%if 0%{?with_check} && ! 0%{?with_bundled}
-BuildRequires: golang(github.com/stretchr/testify/assert)
-BuildRequires: golang(gopkg.in/check.v1)
-%endif
+%global golicenses LICENSE
+%global godocs _examples README.md
-Requires: golang(github.com/stretchr/testify/assert)
-Requires: golang(gopkg.in/check.v1)
+Name: %{goname}
+Release: 1%{?dist}
+Summary: Go bindings for GNU's gettext
-Provides: golang(%{import_path}) = %{version}-%{release}
+License: MIT
+URL: %{gourl}
+Source0: %{gosource}
-%description devel
-%{summary}
+BuildRequires: golang(github.com/jessevdk/go-flags)
+BuildRequires: gettext-devel
-This package contains library source intended for
-building other packages which use import path with
-%{import_path} prefix.
+%if %{with check}
+# Tests
+BuildRequires: golang(github.com/stretchr/testify/assert)
+BuildRequires: golang(gopkg.in/check.v1)
%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
+%description
+%{common_description}
-# test subpackage tests code from devel subpackage
-Requires: %{name}-devel = %{version}-%{release}
+%package -n go-xgettext
+Summary: Program for extracting translatable strings from Go programs
-%description unit-test-devel
-%{summary}
+%description -n go-xgettext
+The go-xgettext program is an implementation of xgettext implemented in go.
+It can reliably parse go source files to identify content to translate.
-This package contains unit tests for project
-providing packages with %{import_path} prefix.
-%endif
+%gopkg
%prep
-%setup -q -n %{repo}-%{commit}
+%goprep
%build
-mkdir -p $(dirname src/%{import_path})
-ln -s ../../../ src/%{import_path}
-
-%if ! 0%{?with_bundled}
-export GOPATH=$(pwd):%{gopath}
-%else
-export GOPATH=$(pwd):$(pwd)/Godeps/_workspace:%{gopath}
-%endif
-
-%gobuild -o bin/go-xgettext %{import_path}/go-xgettext
-
-%install
-install -d -p %{buildroot}%{_bindir}
-install -p -m 0755 bin/go-xgettext %{buildroot}%{_bindir}
-
-# 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
-# NOTE: the _examples/ directory is required for unit tests to pass, it contains test data
-for file in $(find . -iname "*.go" \! -iname "*_test.go" -o -iname "_examples") ; do
- echo "%%dir %%{gopath}/src/%%{import_path}/$(dirname $file)" >> devel.file-list
- install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$(dirname $file)
- cp -pav $file %{buildroot}/%{gopath}/src/%{import_path}/$file
- echo "%%{gopath}/src/%%{import_path}/$file" >> devel.file-list
+for cmd in go-xgettext; do
+ %gobuild -o %{gobuilddir}/bin/$(basename $cmd) %{goipath}/$cmd
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.file-list
-# NOTE: the _examples/ directory is required for unit tests to pass, it contains test data
-for file in $(find . -iname "*_test.go" -o -iname "_examples"); do
- echo "%%dir %%{gopath}/src/%%{import_path}/$(dirname $file)" >> devel.file-list
- install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$(dirname $file)
- cp -pav $file %{buildroot}/%{gopath}/src/%{import_path}/$file
- echo "%%{gopath}/src/%%{import_path}/$file" >> unit-test-devel.file-list
-done
-%endif
-
-%if 0%{?with_devel}
-sort -u -o devel.file-list devel.file-list
-%endif
+%install
+%gopkginstall
+install -m 0755 -vd %{buildroot}%{_bindir}
+install -m 0755 -vp %{gobuilddir}/bin/* %{buildroot}%{_bindir}/
+%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
-export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath}
-%endif
-
-%gotest %{import_path}
-%gotest %{import_path}/go-xgettext
+%gocheck -d .
%endif
-#define license tag if not already defined
-%{!?_licensedir:%global license %doc}
-
-%files
-%license LICENSE
-%doc README.md
-
-%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
+%files -n go-xgettext
%license LICENSE
-%doc README.md
-%endif
+%doc _examples README.md
+%{_bindir}/*
-%files -n go-xgettext
-%doc LICENSE
-%{_bindir}/go-xgettext
+%gopkgfiles
%changelog
+* Sun Jun 02 20:43:37 CEST 2019 Robert-Andr Mauchin <zebob.m(a)gmail.com> - 0.9-1
+- Release 0.9
+
* Fri Feb 01 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 0-0.8.git305f360
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
@@ -200,8 +95,10 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath}
* Tue Aug 09 2016 Zygmunt Krynicki <me(a)zygoon.pl> - 0-0.3.git305f360
- Build and install go-xgettext to a separate binary package
+
* Tue Jul 26 2016 Zygmunt Krynicki <me(a)zygoon.pl> - 0-0.2.git305f360
- Update to latest upstream snapshot
- Include test data in the devel and unit test packages and enable unit tests
+
* Fri Jun 10 2016 Zygmunt Krynicki <me(a)zygoon.pl> - 0-0.1.git98b7b91
- First package for Fedora
diff --git a/sources b/sources
index ef2b35e..4613438 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-07a314ca5de61dd3ff515391292bf2e3 gettext-305f360.tar.gz
+SHA512 (gettext-0.9.tar.gz) = d0ccdb1ff1adf052064ac30ef05ff630bac6b9b76d177f31ee898f208962315946228f2a75d135ed6c31552882c06e3141ca242725878cd12732ce14e09ac438
4 years, 9 months
Architecture specific change in rpms/golang-github-libgit2-git2go.git
by githook-noreply@fedoraproject.org
The package rpms/golang-github-libgit2-git2go.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-libgit2-git2go.git/....
Change:
+ExcludeArch: i686 armv7hl
Thanks.
Full change:
============
commit 5e7953aede59b0cfd0806aa4ac958ed8ad111bd0
Author: Robert-Andr Mauchin <zebob.m(a)gmail.com>
Date: Sun Jun 2 20:42:57 2019 +0200
Update to new macros
Signed-off-by: Robert-Andr Mauchin <zebob.m(a)gmail.com>
diff --git a/golang-github-libgit2-git2go.spec b/golang-github-libgit2-git2go.spec
index 36217b9..c00a001 100644
--- a/golang-github-libgit2-git2go.spec
+++ b/golang-github-libgit2-git2go.spec
@@ -1,60 +1,58 @@
-# Some tests use the network.
-%bcond_with network
+# Generated by go2rpm
+%bcond_without check
+# https://github.com/libgit2/git2go
%global goipath github.com/libgit2/git2go
%global commit ecaeb7a21d479b7966311760a2e8bd734f8f0eef
%gometa
+%global godevelheader %{expand:
+Requires: (pkgconfig(libgit2) >= 0.27 with pkgconfig(libgit2) < 0.28)}
+
+%global common_description %{expand:
+Go bindings for libgit2.}
+
+%global golicenses LICENSE
+%global godocs README.md
+
Name: %{goname}
Version: 0
-Release: 0.27.1%{?dist}
-Summary: Git to Go; bindings for libgit2
+Release: 0.27.2%{?dist}
+Summary: Bindings for libgit2
+
License: MIT
URL: %{gourl}
Source0: %{gosource}
-%if ! %{with network}
-Patch0001: 0001-Skip-tests-that-use-the-network.patch
-%endif
+Patch0: 0001-Skip-tests-that-use-the-network.patch
# https://bugzilla.redhat.com/show_bug.cgi?id=1680200
-ExcludeArch: i686 armv7hl
-
-%description
-%{summary}
-
-
-%package devel
-Summary: %{summary}
-BuildArch: noarch
+ExcludeArch: i686 armv7hl
BuildRequires: (pkgconfig(libgit2) >= 0.27 with pkgconfig(libgit2) < 0.28)
-Requires: (pkgconfig(libgit2) >= 0.27 with pkgconfig(libgit2) < 0.28)
-%description devel
-%{summary}
-
-This package contains library source intended for building other packages which
-use import path with %{goipath} prefix.
+%description
+%{common_description}
+%gopkg
%prep
-%forgeautosetup -p1
-
+%goprep
+%patch0 -p1
%install
-%goinstall
-
+%gopkginstall
+%if %{with check}
%check
-%gochecks
-
-
-%files devel -f devel.file-list
-%doc README.md
-%license LICENSE
+%gocheck
+%endif
+%gopkgfiles
%changelog
+* Sun Jun 02 20:23:48 CEST 2019 Robert-Andr Mauchin <zebob.m(a)gmail.com> - 0-0.27.2.20190223gitecaeb7a
+- Update to new macros
+
* Wed Feb 20 2019 Elliott Sales de Andrade <quantum.analyst(a)gmail.com> - 0-0.27.1.20190223gitecaeb7a
- First package for Fedora
4 years, 9 months
Architecture specific change in rpms/golang-github-kyokomi-emoji.git
by githook-noreply@fedoraproject.org
The package rpms/golang-github-kyokomi-emoji.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-kyokomi-emoji.git/c....
Change:
-ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
Thanks.
Full change:
============
commit 2c37a5413e79dab1efb4b5b2ceda66d03b437259
Author: Robert-Andr Mauchin <zebob.m(a)gmail.com>
Date: Sun Jun 2 18:53:01 2019 +0200
Update to new macros
Signed-off-by: Robert-Andr Mauchin <zebob.m(a)gmail.com>
diff --git a/.gitignore b/.gitignore
index 6f8548c..f1a74f1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/1.5.tar.gz
/golang-github-kyokomi-emoji-2.1.0.tar.gz
+/emoji-2.1.0.tar.gz
diff --git a/golang-github-kyokomi-emoji.spec b/golang-github-kyokomi-emoji.spec
index e067b47..fe85793 100644
--- a/golang-github-kyokomi-emoji.spec
+++ b/golang-github-kyokomi-emoji.spec
@@ -1,183 +1,62 @@
-# 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
-
-%if ! 0%{?gobuild:1}
-%define gobuild(o:) go build -ldflags "${LDFLAGS:-} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n')" -a -v -x %{?**};
-%endif
+# Generated by go2rpm
+%bcond_without check
-%global provider github
-%global provider_tld com
-%global project kyokomi
-%global repo emoji
# https://github.com/kyokomi/emoji
-%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
-%global import_path %{provider_prefix}
+%global goipath github.com/kyokomi/emoji
+Version: 2.1.0
-Name: golang-%{provider}-%{project}-%{repo}
-Version: 2.1.0
-Release: 1%{?dist}
-Summary: Emoji terminal output for golang
-License: MIT
-URL: https://%{provider_prefix}
-Source0: https://%{provider_prefix}/archive/v%{version}/%{name}-%{version}.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}
+%gometa
-%if ! 0%{?with_bundled}
-# Remaining dependencies not included in main packages
-%endif
-
-%description
-%{summary}.
-
-%if 0%{?with_devel}
-%package devel
-Summary: %{summary}
-BuildArch: noarch
-
-%if 0%{?with_check} && ! 0%{?with_bundled}
-%endif
+%global common_description %{expand:
+Emoji terminal output for Go.}
+%global golicenses LICENSE
+%global godocs example README.md
-Provides: golang(%{import_path}) = %{version}-%{release}
+Name: %{goname}
+Release: 2%{?dist}
+Summary: Emoji terminal output for Go
-%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}
-
-%if 0%{?with_check} && ! 0%{?with_bundled}
-%endif
+License: MIT
+URL: %{gourl}
+Source0: %{gosource}
+BuildRequires: golang(github.com/PuerkitoBio/goquery)
-%description unit-test-devel
-%{summary}.
+%description
+%{common_description}
-This package contains unit tests for project
-providing packages with %{import_path} prefix.
-%endif
+%gopkg
%prep
-%setup -q -n %{repo}-%{version}
+%goprep
%build
-mkdir -p src/%{provider}.%{provider_tld}/%{project}
-ln -s ../../../ src/%{import_path}
-
-%if ! 0%{?with_bundled}
-export GOPATH=$(pwd):%{gopath}
-%else
-# No dependency directories so far
-export GOPATH=$(pwd):%{gopath}
-%endif
-
-%install
-install -d -p %{buildroot}%{_bindir}
-
-# 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
+for cmd in cmd/* ; do
+ %gobuild -o %{gobuilddir}/bin/$(basename $cmd) %{goipath}/$cmd
done
-%endif
-%if 0%{?with_devel}
-sort -u -o devel.file-list devel.file-list
-%endif
+%install
+%gopkginstall
+install -m 0755 -vd %{buildroot}%{_bindir}
+install -m 0755 -vp %{gobuilddir}/bin/* %{buildroot}%{_bindir}/
+%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}
+%gocheck
%endif
-%if ! 0%{?gotest:1}
-%global gotest go test
-%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
+%files
%license LICENSE
-%doc README.md
-%dir %{gopath}/src/%{provider}.%{provider_tld}/%{project}
-%endif
+%doc example README.md
+%{_bindir}/*
-%if 0%{?with_unit_test} && 0%{?with_devel}
-%files unit-test-devel -f unit-test-devel.file-list
-%license LICENSE
-%doc README.md
-%endif
+%gopkgfiles
%changelog
+* Sun Jun 02 18:38:54 CEST 2019 Robert-Andr Mauchin <zebob.m(a)gmail.com> - 2.1.0-2
+- Update to new macros
+
* Sat Feb 09 2019 Elliott Sales de Andrade <quantum.analyst(a)gmail.com> - 2.1.0-1
- Update to latest version
@@ -207,4 +86,3 @@ export GOPATH=%{buildroot}/%{gopath}:%{gopath}
* Sat Jun 11 2016 Olivier Lemasle <o.lemasle(a)gmail.com> - 1.4-1
- First package for Fedora
-
diff --git a/sources b/sources
index ab9726c..36c9848 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (golang-github-kyokomi-emoji-2.1.0.tar.gz) = 1bfa63f301e06968d85718ca5076eff10a83411089e1ccaff371fbde8e8beb4cd7d03bc95f770b2d407889406a329bb8f7427c2d6dd4edb96f1cb96bbe38c05e
+SHA512 (emoji-2.1.0.tar.gz) = 1bfa63f301e06968d85718ca5076eff10a83411089e1ccaff371fbde8e8beb4cd7d03bc95f770b2d407889406a329bb8f7427c2d6dd4edb96f1cb96bbe38c05e
4 years, 9 months
Architecture specific change in rpms/rb_libtorrent.git
by githook-noreply@fedoraproject.org
The package rpms/rb_libtorrent.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/rb_libtorrent.git/commit/?id=b81d....
Change:
+ExcludeArch: aarch64
Thanks.
Full change:
============
commit b81d7dd1e29803b2cdcb60b9a8c3176494c67dbd
Author: Michael Cronenworth <mike(a)cchtml.com>
Date: Wed Jul 3 14:48:20 2019 -0500
Drop python 2 bindings in F31+
diff --git a/rb_libtorrent.spec b/rb_libtorrent.spec
index 75c1f5b..d528b8b 100644
--- a/rb_libtorrent.spec
+++ b/rb_libtorrent.spec
@@ -16,7 +16,7 @@
Name: rb_libtorrent
Version: 1.1.13
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: A C++ BitTorrent library aiming to be the best alternative
License: BSD
@@ -31,7 +31,7 @@ Patch2: %{name}-boost169.patch
%if 0%{?rhel}
# aarch64 is broken and I have zero interest in fixing it
-ExcludeArch: aarch64
+ExcludeArch: aarch64
%endif
BuildRequires: asio-devel
@@ -40,10 +40,12 @@ BuildRequires: boost-devel
BuildRequires: gcc-c++
BuildRequires: libtommath-devel
BuildRequires: pkgconfig(zlib)
+%if 0%{?fedora} < 31 || 0%{?rhel}
BuildRequires: pkgconfig(python2)
+%endif
BuildRequires: libtool
-BuildRequires: util-linux
-BuildRequires: chrpath
+BuildRequires: util-linux
+BuildRequires: chrpath
%description
%{name} is a C++ library that aims to be a good alternative to all
@@ -86,28 +88,30 @@ show how to make use of its various features. (Due to potential
namespace conflicts, a couple of the examples had to be renamed. See the
included documentation for more details.)
+%if 0%{?fedora} < 31 || 0%{?rhel}
%package python2
Summary: Python bindings for %{name}
License: Boost
-BuildRequires: python2-devel
+BuildRequires: python2-devel
%if 0%{?fedora} > 28
BuildRequires: boost-python2-devel
%endif
BuildRequires: python2-setuptools
-Requires: %{name}%{?_isa} = %{version}-%{release}
-Provides: %{name}-python
-Obsoletes: %{name}-python < 1.0.9
+Requires: %{name}%{?_isa} = %{version}-%{release}
+Provides: %{name}-python
+Obsoletes: %{name}-python < 1.0.9
%description python2
The %{name}-python2 package contains Python language bindings
(the 'libtorrent' module) that allow it to be used from within
Python applications.
+%endif
%if %{with python3}
%package python3
Summary: Python bindings for %{name}
License: Boost
-BuildRequires: python3-devel
+BuildRequires: python3-devel
BuildRequires: pkgconfig(python3)
BuildRequires: boost-python3-devel
BuildRequires: python3-setuptools
@@ -152,6 +156,7 @@ sed -i -e 's|"/lib /usr/lib|"/%{_lib} %{_libdir}|' configure
mkdir -p build/bindings build-python3/bindings
echo build/bindings build-python3/bindings | xargs -n 1 cp -r bindings/python
+%if 0%{?fedora} < 31 || 0%{?rhel}
# Build the lib with Python 2 bindings
export PYTHON=/usr/bin/python%{python2_version}
pushd build
@@ -163,6 +168,23 @@ pushd build
--with-boost-python=boost_python%{python2_version_nodots} \
--with-libiconv \
--enable-export-all
+%else
+# Build the lib with Python 3 bindings
+# This is ugly but can't think of an easier way to build the binding
+export CPPFLAGS="$CPPFLAGS $(python%{python3_version}-config --includes)"
+export LDFLAGS="$LDFLAGS -L%{_builddir}/libtorrent-rasterbar-%{version}/build/src/.libs"
+export PYTHON=/usr/bin/python%{python3_version}
+export PYTHON_LDFLAGS="$PYTHON_LDFLAGS $(python%{python3_version}-config --libs)"
+pushd build
+%configure \
+ --disable-static \
+ --enable-examples \
+ --enable-python-binding \
+ --with-boost-system=boost_system \
+ --with-boost-python=boost_python%{python3_version_nodots} \
+ --with-libiconv \
+ --enable-export-all
+%endif
make V=1 %{?_smp_mflags}
popd
@@ -221,12 +243,16 @@ chrpath -d %{buildroot}%{_bindir}/simple_torrent_client
chrpath -d %{buildroot}%{_bindir}/stats_counters
chrpath -d %{buildroot}%{_bindir}/torrent_client_test
chrpath -d %{buildroot}%{_bindir}/upnp_test
-## Install the python binding module.
+%if 0%{?fedora} < 31 || 0%{?rhel}
+## Install the python 2 binding module.
pushd bindings/python
%{__python2} setup.py install -O1 --skip-build --root %{buildroot}
popd && popd
+%else
+popd
+%endif
-%if %{with python3}
+%if 0%{?with_python3}
pushd build-python3/bindings/python
%{__python3} setup.py install -O1 --skip-build --root %{buildroot}
popd
@@ -261,13 +287,15 @@ find %{buildroot} -name '*.la' -or -name '*.a' | xargs rm -f
%{_bindir}/stats_counters
%{_bindir}/upnp_test
+%if 0%{?fedora} < 31 || 0%{?rhel}
%files python2
%doc AUTHORS ChangeLog
%license COPYING.Boost
%{python2_sitearch}/python_libtorrent-%{version}-py2.?.egg-info
%{python2_sitearch}/libtorrent.so
+%endif
-%if %{with python3}
+%if 0%{?with_python3}
%files python3
%doc AUTHORS ChangeLog
%license COPYING.Boost
@@ -276,6 +304,10 @@ find %{buildroot} -name '*.la' -or -name '*.a' | xargs rm -f
%endif # with python3
%changelog
+* Wed Jul 03 2019 Michael Cronenworth <mike(a)cchtml.com> - 1.1.13-3
+- Drop python 2 bindings in F31+
+ https://fedoraproject.org/wiki/Changes/F31_Mass_Python_2_Package_Removal
+
* Fri May 03 2019 Michael Cronenworth <mike(a)cchtml.com> - 1.1.13-2
- Fix python3 build (RHBZ#1705690)
4 years, 9 months
Architecture specific change in rpms/xsimd.git
by githook-noreply@fedoraproject.org
The package rpms/xsimd.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/xsimd.git/commit/?id=d49d34bdbade....
Change:
+%ifarch armv7l armv7hl armv7hnl
Thanks.
Full change:
============
commit 64a5b5bbd9a3be4b8113b76b5b311aeb2fc685dc
Author: Miro Hronok <miro(a)hroncok.cz>
Date: Wed Jul 3 19:45:30 2019 +0200
Reenable tests (commented out by mistake)
diff --git a/xsimd.spec b/xsimd.spec
index cdc19df..b7a1b06 100644
--- a/xsimd.spec
+++ b/xsimd.spec
@@ -56,8 +56,8 @@ Provides: %{name}-static = %{version}-%{release}
%install
%make_install
-#check
-#make_build xtest
+%check
+%make_build xtest
%files devel
%doc README.md
@@ -68,6 +68,7 @@ Provides: %{name}-static = %{version}-%{release}
%changelog
* Wed Jul 03 2019 Miro Hronok <mhroncok(a)redhat.com> - 7.2.3-2
- Apply upstream workaround for armv7
+- Reenable tests (commented out by mistake)
* Fri Jun 28 2019 Miro Hronok <mhroncok(a)redhat.com> - 7.2.3-1
- Initial package
commit d49d34bdbade7b7e6379d42d23b02d67625cdab0
Author: Miro Hronok <miro(a)hroncok.cz>
Date: Wed Jul 3 19:45:11 2019 +0200
Apply upstream workaround for armv7
diff --git a/292.patch b/292.patch
new file mode 100644
index 0000000..acfd05e
--- /dev/null
+++ b/292.patch
@@ -0,0 +1,419 @@
+From da7ab060cbcf57a20adf1c7d5b013658183f8bc5 Mon Sep 17 00:00:00 2001
+From: Johan Mabille <johan.mabille(a)gmail.com>
+Date: Wed, 3 Jul 2019 17:09:58 +0200
+Subject: [PATCH] Disabled most of the tests when no SIMD instruction set is
+ available
+
+---
+ .travis.yml | 11 ++++++++++
+ .../xsimd/config/xsimd_instruction_set.hpp | 8 ++++---
+ include/xsimd/memory/xsimd_alignment.hpp | 2 +-
+ include/xsimd/memory/xsimd_load_store.hpp | 2 +-
+ include/xsimd/types/xsimd_types_include.hpp | 2 +-
+ test/xsimd_algorithms.cpp | 22 +++++++++++++------
+ test/xsimd_api_test.cpp | 2 +-
+ test/xsimd_basic_math_test.cpp | 5 ++++-
+ test/xsimd_error_gamma_test.cpp | 5 ++++-
+ test/xsimd_exponential_test.cpp | 5 ++++-
+ test/xsimd_fp_manipulation_test.cpp | 5 ++++-
+ test/xsimd_hyperbolic_test.cpp | 5 ++++-
+ test/xsimd_interface_test.cpp | 3 +++
+ test/xsimd_memory_test.cpp | 3 +++
+ test/xsimd_power_test.cpp | 5 ++++-
+ test/xsimd_rounding_test.cpp | 5 ++++-
+ test/xsimd_trigonometric_test.cpp | 5 ++++-
+ 17 files changed, 73 insertions(+), 22 deletions(-)
+
+diff --git a/.travis.yml b/.travis.yml
+index d155b05..36bd25d 100644
+--- a/.travis.yml
++++ b/.travis.yml
+@@ -18,6 +18,14 @@ matrix:
+ packages:
+ - g++-5
+ env: COMPILER=gcc GCC=5
++ - os: linux
++ addons:
++ apt:
++ sources:
++ - ubuntu-toolchain-r-test
++ packages:
++ - g++-6
++ env: COMPILER=gcc GCC=6 FORCE_NO_INSTR_SET=1
+ - os: linux
+ addons:
+ apt:
+@@ -175,6 +183,9 @@ install:
+ else
+ cmake . -DDOWNLOAD_GTEST=ON ;
+ fi
++ - if [[ "$FORCE_NO_INSTR_SET" == 1 ]] ; then
++ cmake . -DDOWNLOAD_GTEST=ON -DXSIMD_FORCE_X86_INSTR_SET=0 ;
++ fi
+ - make -j2 test_xsimd
+ - cd test
+ script:
+diff --git a/include/xsimd/config/xsimd_instruction_set.hpp b/include/xsimd/config/xsimd_instruction_set.hpp
+index ca0f1c1..627537b 100644
+--- a/include/xsimd/config/xsimd_instruction_set.hpp
++++ b/include/xsimd/config/xsimd_instruction_set.hpp
+@@ -138,7 +138,9 @@
+ * PPC INSTRUCTION SET *
+ ***********************/
+
+-#define XSIMD_PPC_VMX_VERSION XSIMD_VERSION_NUMBER(1, 0, 0)
++// We haven't implemented any support for PPC, so we should
++// not enable detection for this instructoin set
++/*#define XSIMD_PPC_VMX_VERSION XSIMD_VERSION_NUMBER(1, 0, 0)
+ #define XSIMD_PPC_VSX_VERSION XSIMD_VERSION_NUMBER(1, 1, 0)
+ #define XSIMD_PPC_QPX_VERSION XSIMD_VERSION_NUMBER(2, 0, 0)
+
+@@ -161,7 +163,7 @@
+ #define XSIMD_PPC_INSTR_SET XSIMD_VERSION_NUMBER_NOT_AVAILABLE
+ #else
+ #define XSIMD_PPC_INSTR_SET_AVAILABLE XSIMD_VERSION_NUMBER_AVAILABLE
+-#endif
++#endif*/
+
+ /***********************
+ * ARM INSTRUCTION SET *
+@@ -224,7 +226,7 @@
+
+ #if !defined(XSIMD_INSTR_SET)
+ #define XSIMD_INSTR_SET XSIMD_VERSION_NUMBER_NOT_AVAILABLE
+-#else
++#elif XSIMD_INSTR_SET != XSIMD_VERSION_NUMBER_NOT_AVAILABLE
+ #define XSIMD_INSTR_SET_AVAILABLE XSIMD_VERSION_NUMBER_AVAILABLE
+ #endif
+
+diff --git a/include/xsimd/memory/xsimd_alignment.hpp b/include/xsimd/memory/xsimd_alignment.hpp
+index bff50ea..301d72a 100644
+--- a/include/xsimd/memory/xsimd_alignment.hpp
++++ b/include/xsimd/memory/xsimd_alignment.hpp
+@@ -40,7 +40,7 @@ namespace xsimd
+ using type = unaligned_mode;
+ };
+
+-#if defined(XSIMD_X86_INSTR_SET_AVAILABLE) || defined(XSIMD_ARM_INSTR_SET_AVAILABLE)
++#if defined(XSIMD_DEFAULT_ALIGNMENT)
+ template <class T>
+ struct allocator_alignment<aligned_allocator<T, XSIMD_DEFAULT_ALIGNMENT>>
+ {
+diff --git a/include/xsimd/memory/xsimd_load_store.hpp b/include/xsimd/memory/xsimd_load_store.hpp
+index b4b6773..45d5e33 100644
+--- a/include/xsimd/memory/xsimd_load_store.hpp
++++ b/include/xsimd/memory/xsimd_load_store.hpp
+@@ -598,7 +598,7 @@ namespace xsimd
+ {
+ }
+
+-#if defined(XSIMD_X86_INSTR_SET_AVAILABLE)
++#if XSIMD_X86_INSTR_SET > XSIMD_INSTR_SET_NOT_AVAILABLE
+
+ template <>
+ inline void prefetch<int32_t>(const int32_t* address)
+diff --git a/include/xsimd/types/xsimd_types_include.hpp b/include/xsimd/types/xsimd_types_include.hpp
+index 39f0a2d..965320c 100644
+--- a/include/xsimd/types/xsimd_types_include.hpp
++++ b/include/xsimd/types/xsimd_types_include.hpp
+@@ -67,7 +67,7 @@
+ #include "xsimd_neon_complex.hpp"
+ #endif
+
+-#if XSIMD_ARM_INSTR_SET == XSIMD_VERSION_NUMBER_NOT_AVAILABLE && XSIMD_X86_INSTR_SET == XSIMD_VERSION_NUMBER_NOT_AVAILABLE
++#if !defined(XSIMD_INSTR_SET_AVAILABLE)
+ #if defined(XSIMD_ENABLE_FALLBACK)
+ #warning "No SIMD instructions enabled, using fallback mode."
+ #else
+diff --git a/test/xsimd_algorithms.cpp b/test/xsimd_algorithms.cpp
+index 75f4e8c..07a4ff1 100644
+--- a/test/xsimd_algorithms.cpp
++++ b/test/xsimd_algorithms.cpp
+@@ -32,12 +32,20 @@ struct unary_functor
+ }
+ };
+
++#ifdef XSIMD_DEFAULT_ALIGNMENT
++template <class T>
++using test_allocator_type = xsimd::aligned_allocator<T, XSIMD_DEFAULT_ALIGNMENT>;
++#else
++template <class T>
++using test_allocator_type = std::allocator<T>;
++#endif
++
+ TEST(xsimd, binary_transform)
+ {
+ std::vector<double> expected(93);
+
+ std::vector<double> a(93, 123), b(93, 123), c(93);
+- std::vector<double, xsimd::aligned_allocator<double, XSIMD_DEFAULT_ALIGNMENT>> aa(93, 123), ba(93, 123), ca(93);
++ std::vector<double, test_allocator_type<double>> aa(93, 123), ba(93, 123), ca(93);
+
+ std::transform(a.begin(), a.end(), b.begin(), expected.begin(),
+ binary_functor{});
+@@ -83,7 +91,7 @@ TEST(xsimd, unary_transform)
+ {
+ std::vector<double> expected(93);
+ std::vector<double> a(93, 123), c(93);
+- std::vector<double, xsimd::aligned_allocator<double, XSIMD_DEFAULT_ALIGNMENT>> aa(93, 123), ca(93);
++ std::vector<double, test_allocator_type<double>> aa(93, 123), ca(93);
+
+ std::transform(a.begin(), a.end(), expected.begin(),
+ unary_functor{});
+@@ -112,7 +120,7 @@ TEST(xsimd, unary_transform)
+ class xsimd_reduce : public ::testing::Test
+ {
+ public:
+- using aligned_vec_t = std::vector<double, xsimd::aligned_allocator<double, XSIMD_DEFAULT_ALIGNMENT>>;
++ using aligned_vec_t = std::vector<double, test_allocator_type<double>>;
+
+ static constexpr std::size_t num_elements = 4 * xsimd::simd_traits<double>::size;
+ static constexpr std::size_t small_num = xsimd::simd_traits<double>::size - 1;
+@@ -211,11 +219,10 @@ TEST_F(xsimd_reduce, using_custom_binary_function)
+ }
+ }
+
++#if XSIMD_X86_INSTR_SET > XSIMD_VERSION_NUMBER_NOT_AVAILABLE || XSIMD_ARM_INSTR_SET > XSIMD_VERSION_NUMBER_NOT_AVAILABLE
+ TEST(xsimd, iterator)
+ {
+- std::vector<float, xsimd::aligned_allocator<float, XSIMD_DEFAULT_ALIGNMENT>> a(10 * 16, 0.2);
+- std::vector<float, xsimd::aligned_allocator<float, XSIMD_DEFAULT_ALIGNMENT>> b(1000, 2.);
+- std::vector<float, xsimd::aligned_allocator<float, XSIMD_DEFAULT_ALIGNMENT>> c(1000, 3.);
++ std::vector<float, test_allocator_type<float>> a(10 * 16, 0.2), b(1000, 2.), c(1000, 3.);
+
+ std::iota(a.begin(), a.end(), 0.f);
+ std::vector<float> a_cpy(a.begin(), a.end());
+@@ -245,7 +252,7 @@ TEST(xsimd, iterator)
+ }
+
+ #ifdef XSIMD_BATCH_DOUBLE_SIZE
+- std::vector<std::complex<double>, xsimd::aligned_allocator<std::complex<double>, XSIMD_DEFAULT_ALIGNMENT>> ca(10 * 16, std::complex<double>(0.2));
++ std::vector<std::complex<double>, test_allocator_type<std::complex<double>>> ca(10 * 16, std::complex<double>(0.2));
+ using cbatch_type = typename xsimd::simd_traits<std::complex<double>>::type;
+ auto cbegin = xsimd::aligned_iterator<cbatch_type>(&ca[0]);
+ auto cend = xsimd::aligned_iterator<cbatch_type>(&ca[0] + a.size());
+@@ -262,3 +269,4 @@ TEST(xsimd, iterator)
+ #endif
+
+ }
++#endif
+diff --git a/test/xsimd_api_test.cpp b/test/xsimd_api_test.cpp
+index 74fbcbb..f224214 100644
+--- a/test/xsimd_api_test.cpp
++++ b/test/xsimd_api_test.cpp
+@@ -36,7 +36,7 @@ namespace xsimd
+ }
+ }
+
+-#if XSIMD_X86_INSTR_SET_AVAILABLE > XSIMD_VERSION_NUMBER_NOT_AVAILABLE
++#if XSIMD_X86_INSTR_SET > XSIMD_VERSION_NUMBER_NOT_AVAILABLE
+ TEST(xsimd, complex_return_type)
+ {
+ using cf_type = std::complex<float>;
+diff --git a/test/xsimd_basic_math_test.cpp b/test/xsimd_basic_math_test.cpp
+index cd62bc0..b192f1b 100644
+--- a/test/xsimd_basic_math_test.cpp
++++ b/test/xsimd_basic_math_test.cpp
+@@ -11,6 +11,8 @@
+
+ #include "gtest/gtest.h"
+
++#ifdef XSIMD_INSTR_SET_AVAILABLE
++
+ #include "xsimd/math/xsimd_basic_math.hpp"
+ #include "xsimd/memory/xsimd_aligned_allocator.hpp"
+ #include "xsimd/types/xsimd_types_include.hpp"
+@@ -105,4 +107,5 @@ TEST(xsimd, fallback_double_basic_math)
+ bool res = xsimd::test_basic_math<double, 3, 32>(out, "fallback double");
+ EXPECT_TRUE(res);
+ }
+-#endif
+\ No newline at end of file
++#endif
++#endif // XSIMD_INSTR_SET_AVAILABLE
+diff --git a/test/xsimd_error_gamma_test.cpp b/test/xsimd_error_gamma_test.cpp
+index 8241ef3..c70904b 100644
+--- a/test/xsimd_error_gamma_test.cpp
++++ b/test/xsimd_error_gamma_test.cpp
+@@ -11,6 +11,8 @@
+
+ #include "gtest/gtest.h"
+
++#ifdef XSIMD_INSTR_SET_AVAILABLE
++
+ #include "xsimd/math/xsimd_error.hpp"
+ #include "xsimd/math/xsimd_gamma.hpp"
+ #include "xsimd/memory/xsimd_aligned_allocator.hpp"
+@@ -106,4 +108,5 @@ TEST(xsimd, fallback_double_error_gamma)
+ bool res = xsimd::test_error_gamma<double, 3, 32>(out, "fallback double");
+ EXPECT_TRUE(res);
+ }
+-#endif
+\ No newline at end of file
++#endif
++#endif // XSIMD_INSTR_SET_AVAILABLE
+diff --git a/test/xsimd_exponential_test.cpp b/test/xsimd_exponential_test.cpp
+index 7a6f4b3..43ec983 100644
+--- a/test/xsimd_exponential_test.cpp
++++ b/test/xsimd_exponential_test.cpp
+@@ -11,6 +11,8 @@
+
+ #include "gtest/gtest.h"
+
++#ifdef XSIMD_INSTR_SET_AVAILABLE
++
+ #include "xsimd/math/xsimd_exponential.hpp"
+ #include "xsimd/math/xsimd_logarithm.hpp"
+ #include "xsimd/memory/xsimd_aligned_allocator.hpp"
+@@ -106,4 +108,5 @@ TEST(xsimd, fallback_double_exponential)
+ bool res = xsimd::test_exponential<double, 3, 32>(out, "fallback double");
+ EXPECT_TRUE(res);
+ }
+-#endif
+\ No newline at end of file
++#endif
++#endif // XSIMD_INSTR_SET_AVAILABLE
+diff --git a/test/xsimd_fp_manipulation_test.cpp b/test/xsimd_fp_manipulation_test.cpp
+index c2d7f67..d19ed3e 100644
+--- a/test/xsimd_fp_manipulation_test.cpp
++++ b/test/xsimd_fp_manipulation_test.cpp
+@@ -11,6 +11,8 @@
+
+ #include "gtest/gtest.h"
+
++#ifdef XSIMD_INSTR_SET_AVAILABLE
++
+ #include "xsimd/math/xsimd_fp_manipulation.hpp"
+ #include "xsimd/memory/xsimd_aligned_allocator.hpp"
+ #include "xsimd/types/xsimd_types_include.hpp"
+@@ -105,4 +107,5 @@ TEST(xsimd, fallback_double_fp_manipulation)
+ bool res = xsimd::test_fp_manipulation<double, 3, 32>(out, "fallback double");
+ EXPECT_TRUE(res);
+ }
+-#endif
+\ No newline at end of file
++#endif
++#endif // XSIMD_INSTR_SET_AVAILABLE
+diff --git a/test/xsimd_hyperbolic_test.cpp b/test/xsimd_hyperbolic_test.cpp
+index 23f2506..9a76ec4 100644
+--- a/test/xsimd_hyperbolic_test.cpp
++++ b/test/xsimd_hyperbolic_test.cpp
+@@ -11,6 +11,8 @@
+
+ #include "gtest/gtest.h"
+
++#ifdef XSIMD_INSTR_SET_AVAILABLE
++
+ #include "xsimd/math/xsimd_hyperbolic.hpp"
+ #include "xsimd/memory/xsimd_aligned_allocator.hpp"
+ #include "xsimd/types/xsimd_types_include.hpp"
+@@ -105,4 +107,5 @@ TEST(xsimd, fallback_double_hyperbolic)
+ bool res = xsimd::test_hyperbolic<double, 3, 32>(out, "fallback double");
+ EXPECT_TRUE(res);
+ }
+-#endif
+\ No newline at end of file
++#endif
++#endif // XSIMD_INSTR_SET_AVAILABLE
+diff --git a/test/xsimd_interface_test.cpp b/test/xsimd_interface_test.cpp
+index ebbfe44..976b04a 100644
+--- a/test/xsimd_interface_test.cpp
++++ b/test/xsimd_interface_test.cpp
+@@ -12,6 +12,8 @@
+
+ #include "gtest/gtest.h"
+
++#ifdef XSIMD_INSTR_SET_AVAILABLE
++
+ #include "xsimd/xsimd.hpp"
+
+ namespace xsimd
+@@ -109,3 +111,4 @@ namespace xsimd
+ EXPECT_EQ(t.ivec, t.ires);
+ }
+ }
++#endif // XSIMD_INSTR_SET_AVAILABLE
+diff --git a/test/xsimd_memory_test.cpp b/test/xsimd_memory_test.cpp
+index 754c5ec..1e48762 100644
+--- a/test/xsimd_memory_test.cpp
++++ b/test/xsimd_memory_test.cpp
+@@ -11,6 +11,8 @@
+
+ #include "gtest/gtest.h"
+
++#ifdef XSIMD_INSTR_SET_AVAILABLE
++
+ #include "xsimd/memory/xsimd_alignment.hpp"
+
+ namespace xsimd
+@@ -31,3 +33,4 @@ namespace xsimd
+ EXPECT_TRUE((std::is_same<mock_align, unaligned_mode>::value));
+ }
+ }
++#endif // XSIMD_INSTR_SET_AVAILABLE
+diff --git a/test/xsimd_power_test.cpp b/test/xsimd_power_test.cpp
+index 99475c6..3b6376a 100644
+--- a/test/xsimd_power_test.cpp
++++ b/test/xsimd_power_test.cpp
+@@ -11,6 +11,8 @@
+
+ #include "gtest/gtest.h"
+
++#ifdef XSIMD_INSTR_SET_AVAILABLE
++
+ #include "xsimd/math/xsimd_power.hpp"
+ #include "xsimd/memory/xsimd_aligned_allocator.hpp"
+ #include "xsimd/types/xsimd_types_include.hpp"
+@@ -105,4 +107,5 @@ TEST(xsimd, fallback_double_power)
+ bool res = xsimd::test_power<double, 3, 32>(out, "fallback double");
+ EXPECT_TRUE(res);
+ }
+-#endif
+\ No newline at end of file
++#endif
++#endif // XSIMD_INSTR_SET_AVAILABLE
+diff --git a/test/xsimd_rounding_test.cpp b/test/xsimd_rounding_test.cpp
+index 420ca3a..7fca3e4 100644
+--- a/test/xsimd_rounding_test.cpp
++++ b/test/xsimd_rounding_test.cpp
+@@ -11,6 +11,8 @@
+
+ #include "gtest/gtest.h"
+
++#ifdef XSIMD_INSTR_SET_AVAILABLE
++
+ #include "xsimd/math/xsimd_rounding.hpp"
+ #include "xsimd/memory/xsimd_aligned_allocator.hpp"
+ #include "xsimd/types/xsimd_types_include.hpp"
+@@ -105,4 +107,5 @@ TEST(xsimd, fallback_double_rounding)
+ bool res = xsimd::test_rounding<double, 3, 32>(out, "fallback double");
+ EXPECT_TRUE(res);
+ }
+-#endif
+\ No newline at end of file
++#endif
++#endif // XSIMD_INSTR_SET_AVAILABLE
+diff --git a/test/xsimd_trigonometric_test.cpp b/test/xsimd_trigonometric_test.cpp
+index 2fba7f9..9998711 100644
+--- a/test/xsimd_trigonometric_test.cpp
++++ b/test/xsimd_trigonometric_test.cpp
+@@ -11,6 +11,8 @@
+
+ #include "gtest/gtest.h"
+
++#ifdef XSIMD_INSTR_SET_AVAILABLE
++
+ #include "xsimd/math/xsimd_trigonometric.hpp"
+ #include "xsimd/memory/xsimd_aligned_allocator.hpp"
+ #include "xsimd/types/xsimd_types_include.hpp"
+@@ -105,4 +107,5 @@ TEST(xsimd, fallback_double_trigonometric)
+ bool res = xsimd::test_trigonometric<double, 3, 32>(out, "fallback double");
+ EXPECT_TRUE(res);
+ }
+-#endif
+\ No newline at end of file
++#endif
++#endif // XSIMD_INSTR_SET_AVAILABLE
+--
+2.21.0
+
diff --git a/xsimd.spec b/xsimd.spec
index e66f98d..cdc19df 100644
--- a/xsimd.spec
+++ b/xsimd.spec
@@ -1,12 +1,16 @@
Name: xsimd
Version: 7.2.3
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: C++ wrappers for SIMD intrinsics
License: BSD
URL: https://xsimd.readthedocs.io/
%global github https://github.com/QuantStack/xsimd
Source0: %{github}/archive/%{version}/%{name}-%{version}.tar.gz
+# Workaround for armv7hl build failures
+# https://github.com/QuantStack/xsimd/pull/292 rebased
+Patch1: 292.patch
+
BuildRequires: cmake
BuildRequires: gcc-c++
BuildRequires: gtest-devel
@@ -15,7 +19,7 @@ BuildRequires: gtest-devel
%global debug_package %{nil}
# https://github.com/QuantStack/xsimd/issues/289
-ExcludeArch: armv7hl ppc64le s390x
+ExcludeArch: ppc64le s390x
%global _description \
SIMD (Single Instruction, Multiple Data) is a feature of microprocessors that \
@@ -39,10 +43,14 @@ Provides: %{name}-static = %{version}-%{release}
%prep
-%autosetup
+%autosetup -p1
%build
-%cmake -DBUILD_TESTS=ON .
+%cmake -DBUILD_TESTS=ON \
+%ifarch armv7l armv7hl armv7hnl
+-DXSIMD_FORCE_ARM_INSTR_SET=70000000 \
+%endif
+.
%make_build
%install
@@ -58,5 +66,8 @@ Provides: %{name}-static = %{version}-%{release}
%{_libdir}/cmake/%{name}/
%changelog
+* Wed Jul 03 2019 Miro Hronok <mhroncok(a)redhat.com> - 7.2.3-2
+- Apply upstream workaround for armv7
+
* Fri Jun 28 2019 Miro Hronok <mhroncok(a)redhat.com> - 7.2.3-1
- Initial package
4 years, 9 months