jchaloup pushed to golang-github-hashicorp-raft (master).
"Autogenerate some parts using the new macros"
by notificationsï¼ fedoraproject.org
From 288e08c14715cd2e46f8dea2531edf3ac92f78e0 Mon Sep 17 00:00:00 2001
From: Jan Chaloupka <jchaloup(a)redhat.com>
Date: Feb 28 2018 19:28:22 +0000
Subject: Autogenerate some parts using the new macros
---
diff --git a/golang-github-hashicorp-raft.spec b/golang-github-hashicorp-raft.spec
index 9beec28..dbe2268 100644
--- a/golang-github-hashicorp-raft.spec
+++ b/golang-github-hashicorp-raft.spec
@@ -1,162 +1,56 @@
-%if 0%{?fedora} || 0%{?rhel} == 6
-%global with_devel 1
-%global with_bundled 0
-%global with_debug 0
-# Test fails in koji
-%global with_check 0
-%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
-
-%global provider github
-%global provider_tld com
-%global project hashicorp
-%global repo raft
-# https://github.com/hashicorp/raft
-%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
-%global import_path %{provider_prefix}
+# http://github.com/hashicorp/raft
+%global provider_prefix github.com/hashicorp/raft
+%global gobaseipath %{provider_prefix}
%global commit d136cd15dfb7876fd7c89cad1995bc4f19ceb294
-%global shortcommit %(c=%{commit}; echo ${c:0:7})
+%global commitdate 20151117
-Name: golang-%{provider}-%{project}-%{repo}
+%gocraftmeta -i
+
+Name: %{goname}
Version: 0
-Release: 0.11.git%{shortcommit}%{?dist}
+Release: 0.12.%{commitdate}git%{shortcommit}%{?dist}
Summary: Golang implementation of the Raft consensus protocol
License: MPLv2.0
-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 %{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}
BuildRequires: golang(github.com/armon/go-metrics)
BuildRequires: golang(github.com/hashicorp/go-msgpack/codec)
-%endif
-
-Requires: golang(github.com/armon/go-metrics)
-Requires: golang(github.com/hashicorp/go-msgpack/codec)
-
-Provides: golang(%{import_path}) = %{version}-%{release}
-Provides: golang(%{import_path}/bench) = %{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
-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}
-
-%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
-%{summary}
-
-This package contains unit tests for project
-providing packages with %{import_path} prefix.
-%endif
+%{gobaseipath} prefix.
%prep
-%setup -q -n %{repo}-%{commit}
-
-%build
+%gosetup
%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" \! -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.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.file-list
-done
-%endif
-
-%if 0%{?with_devel}
-sort -u -o devel.file-list devel.file-list
-%endif
+%goinstall
%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
-
-%if ! 0%{?gotest:1}
-%global gotest go test
-%endif
-
-%gotest %{import_path}
-%endif
+%gochecks %{gobaseipath}
#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 -f unit-test.file-list
-%license LICENSE
-%doc README.md
-%endif
%changelog
+* Wed Feb 28 2018 Jan Chaloupka <jchaloup(a)redhat.com> - 0-0.12.20151117gitd136cd1
+- Autogenerate some parts using the new macros
+
* Wed Feb 07 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 0-0.11.gitd136cd1
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
@@ -195,4 +89,3 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath}
- First package for Fedora
resolves: #1212068
-
https://src.fedoraproject.org/rpms/golang-github-hashicorp-raft/c/288e08c...
5Â years, 3Â months
jchaloup pushed to golang-github-hawkular-hawkular-client-go
(master). "Autogenerate some parts using the new macros"
by notificationsï¼ fedoraproject.org
From d4d6c61ee117414e1a23f5a83d237231b9132010 Mon Sep 17 00:00:00 2001
From: Jan Chaloupka <jchaloup(a)redhat.com>
Date: Feb 28 2018 19:27:34 +0000
Subject: Autogenerate some parts using the new macros
---
diff --git a/golang-github-hawkular-hawkular-client-go.spec b/golang-github-hawkular-hawkular-client-go.spec
index 2eb1af4..6cd3372 100644
--- a/golang-github-hawkular-hawkular-client-go.spec
+++ b/golang-github-hawkular-hawkular-client-go.spec
@@ -1,152 +1,53 @@
-%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
-
-%global provider github
-%global provider_tld com
-%global project hawkular
-%global repo hawkular-client-go
-# https://github.com/hawkular/hawkular-client-go
-%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
-%global import_path %{provider_prefix}
+# http://github.com/hawkular/hawkular-client-go
+%global provider_prefix github.com/hawkular/hawkular-client-go
+%global gobaseipath %{provider_prefix}
%global commit 06bf87e3e131208c321ebd5d21576d94809537a1
-%global shortcommit %(c=%{commit}; echo ${c:0:7})
-Name: golang-%{provider}-%{project}-%{repo}
+%gocraftmeta -i
+
+Name: %{goname}
Version: 0.3.4
-Release: 8%{?dist}
+Release: 9%{?dist}
Summary: Golang client for Hawkular
License: ASL 2.0
-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 %{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}
BuildRequires: golang(github.com/stretchr/testify/require)
-%endif
-
-Requires: golang(github.com/stretchr/testify/require)
-
-Provides: golang(%{import_path}/metrics) = %{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
-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
-%{summary}
-
-This package contains unit tests for project
-providing packages with %{import_path} prefix.
-%endif
+%{gobaseipath} prefix.
%prep
-%setup -q -n %{repo}-%{commit}
-
-%build
+%gosetup
%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" \! -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.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.file-list
-done
-%endif
-
-%if 0%{?with_devel}
-sort -u -o devel.file-list devel.file-list
-%endif
+%goinstall
%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
-%if ! 0%{?gotest:1}
-%global gotest go test
-%endif
-# needs Hawkular to run
-#%%gotest %%{import_path}/metrics
-%endif
+%gochecks %{gobaseipath}/metrics
#define license tag if not already defined
%{!?_licensedir:%global license %doc}
-%if 0%{?with_devel}
%files devel -f devel.file-list
%license LICENSE
-%dir %{gopath}/src/%{provider}.%{provider_tld}/%{project}
-%endif
-
-%if 0%{?with_unit_test} && 0%{?with_devel}
-%files unit-test -f unit-test.file-list
-%license LICENSE
-%endif
%changelog
+* Wed Feb 28 2018 Jan Chaloupka <jchaloup(a)redhat.com> - 0.3.4-9
+- Autogenerate some parts using the new macros
+
* Wed Feb 07 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.3.4-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
@@ -172,4 +73,3 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath}
- First package for Fedora
resolves: #1270006
-
https://src.fedoraproject.org/rpms/golang-github-hawkular-hawkular-client...
5Â years, 3Â months
berrange pushed to qemu (master). "Avoid breakage in tests due to
stricter crypto policies (..more)"
by notificationsï¼ fedoraproject.org
From 29249a79a8e7ba865a4c10211571ff0f2d051860 Mon Sep 17 00:00:00 2001
From: Daniel P. Berrangé <berrange(a)redhat.com>
Date: Feb 28 2018 18:54:48 +0000
Subject: Avoid breakage in tests due to stricter crypto policies
Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com>
---
diff --git a/0001-crypto-ensure-we-use-a-predictable-TLS-priority-sett.patch b/0001-crypto-ensure-we-use-a-predictable-TLS-priority-sett.patch
new file mode 100644
index 0000000..69e19e1
--- /dev/null
+++ b/0001-crypto-ensure-we-use-a-predictable-TLS-priority-sett.patch
@@ -0,0 +1,48 @@
+From 11e1a77f98b2663a6fb0b640bff2ceedc6fc79f8 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange(a)redhat.com>
+Date: Wed, 28 Feb 2018 14:04:38 +0000
+Subject: [PATCH] crypto: ensure we use a predictable TLS priority setting
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The TLS test cert generation relies on a fixed set of algorithms that are
+only usable under GNUTLS' default priority setting. When building QEMU
+with a custom distro specific priority setting, this can cause the TLS
+tests to fail. By forcing the tests to always use "NORMAL" priority we
+can make them more robust.
+
+Reviewed-by: Eric Blake <eblake(a)redhat.com>
+Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com>
+---
+ tests/test-crypto-tlssession.c | 1 +
+ tests/test-io-channel-tls.c | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/tests/test-crypto-tlssession.c b/tests/test-crypto-tlssession.c
+index 1a4a066d76..82f21c27f2 100644
+--- a/tests/test-crypto-tlssession.c
++++ b/tests/test-crypto-tlssession.c
+@@ -75,6 +75,7 @@ static QCryptoTLSCreds *test_tls_creds_create(QCryptoTLSCredsEndpoint endpoint,
+ "server" : "client"),
+ "dir", certdir,
+ "verify-peer", "yes",
++ "priority", "NORMAL",
+ /* We skip initial sanity checks here because we
+ * want to make sure that problems are being
+ * detected at the TLS session validation stage,
+diff --git a/tests/test-io-channel-tls.c b/tests/test-io-channel-tls.c
+index a210d01ba5..47ba603e8d 100644
+--- a/tests/test-io-channel-tls.c
++++ b/tests/test-io-channel-tls.c
+@@ -78,6 +78,7 @@ static QCryptoTLSCreds *test_tls_creds_create(QCryptoTLSCredsEndpoint endpoint,
+ "server" : "client"),
+ "dir", certdir,
+ "verify-peer", "yes",
++ "priority", "NORMAL",
+ /* We skip initial sanity checks here because we
+ * want to make sure that problems are being
+ * detected at the TLS session validation stage,
+--
+2.14.3
+
diff --git a/qemu.spec b/qemu.spec
index 3156741..aef2776 100644
--- a/qemu.spec
+++ b/qemu.spec
@@ -148,6 +148,9 @@ Patch0002: 0001-Remove-problematic-evdev-86-key-from-en-us-keymap.patch
# Non-deterministic python hash iterator sort ordering
Patch0003: 0001-qapi-ensure-stable-sort-ordering-when-checking-QAPI-.patch
+# Avoid breakage in tests due to stricter crypto policies
+Patch0004: 0001-crypto-ensure-we-use-a-predictable-TLS-priority-sett.patch
+
# documentation deps
BuildRequires: texinfo
# For /usr/bin/pod2man
@@ -1985,6 +1988,7 @@ getent passwd qemu >/dev/null || \
- Honour CC/LD flags for ksmctl
- Fix non-deterministic test failure
- Use explicit "python2" binary to avoid "python" brokeness (rhbz#1550010)
+- Avoid breakage in TLS tests due to stricter crypto policies
* Fri Feb 09 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 2:2.11.0-4.1
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
https://src.fedoraproject.org/rpms/qemu/c/29249a79a8e7ba865a4c10211571ff0...
5Â years, 3Â months
berrange pushed to qemu (master). "Explicitly use python2 binary
(..more)"
by notificationsï¼ fedoraproject.org
From 52904050aa05317ca6ef2250d48502de7e259799 Mon Sep 17 00:00:00 2001
From: Daniel P. Berrangé <berrange(a)redhat.com>
Date: Feb 28 2018 18:02:52 +0000
Subject: Explicitly use python2 binary
The /usr/bin/python binary has started spewing text to stderr, even when
not connected to a tty, which breaks QEMU test suite.
Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com>
---
diff --git a/qemu.spec b/qemu.spec
index eeb1b4f..3156741 100644
--- a/qemu.spec
+++ b/qemu.spec
@@ -1056,6 +1056,7 @@ run_configure() {
--disable-strip \
--disable-werror \
--enable-kvm \
+ --python=/usr/bin/python2 \
%ifarch s390 %{mips64}
--enable-tcg-interpreter \
%endif
@@ -1983,6 +1984,7 @@ getent passwd qemu >/dev/null || \
- Improve License tag
- Honour CC/LD flags for ksmctl
- Fix non-deterministic test failure
+- Use explicit "python2" binary to avoid "python" brokeness (rhbz#1550010)
* Fri Feb 09 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 2:2.11.0-4.1
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
https://src.fedoraproject.org/rpms/qemu/c/52904050aa05317ca6ef2250d48502d...
5Â years, 3Â months
berrange pushed to qemu (master). "Bump release for new build
(..more)"
by notificationsï¼ fedoraproject.org
From 603dd9e50ad6f8b09eb5686028906d47d47f6aec Mon Sep 17 00:00:00 2001
From: Daniel P. Berrangé <berrange(a)redhat.com>
Date: Feb 27 2018 16:31:19 +0000
Subject: Bump release for new build
Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com>
---
diff --git a/qemu.spec b/qemu.spec
index feac33c..eeb1b4f 100644
--- a/qemu.spec
+++ b/qemu.spec
@@ -104,7 +104,7 @@ Requires: %{name}-block-ssh = %{epoch}:%{version}-%{release}
Summary: QEMU is a FAST! processor emulator
Name: qemu
Version: 2.11.0
-Release: 4%{?rcrel}%{?dist}.1
+Release: 5%{?rcrel}%{?dist}
Epoch: 2
License: GPLv2 and BSD and MIT and CC-BY
URL: http://www.qemu.org/
@@ -145,6 +145,9 @@ Patch0001: 0001-memfd-fix-configure-test.patch
# hacky fix for https://bugs.launchpad.net/qemu/+bug/1738283
Patch0002: 0001-Remove-problematic-evdev-86-key-from-en-us-keymap.patch
+# Non-deterministic python hash iterator sort ordering
+Patch0003: 0001-qapi-ensure-stable-sort-ordering-when-checking-QAPI-.patch
+
# documentation deps
BuildRequires: texinfo
# For /usr/bin/pod2man
@@ -1976,6 +1979,11 @@ getent passwd qemu >/dev/null || \
%changelog
+* Tue Feb 27 2018 Daniel P. Berrange <berrange(a)redhat.com> - 2:2.11.0-5
+- Improve License tag
+- Honour CC/LD flags for ksmctl
+- Fix non-deterministic test failure
+
* Fri Feb 09 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 2:2.11.0-4.1
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
https://src.fedoraproject.org/rpms/qemu/c/603dd9e50ad6f8b09eb5686028906d4...
5Â years, 3Â months
berrange pushed to qemu (master). "Non-deterministic python hash
iterator sort ordering (..more)"
by notificationsï¼ fedoraproject.org
From 28d4d1f5e7d906c721659c166a9530f3d9db5bda Mon Sep 17 00:00:00 2001
From: Daniel P. Berrangé <berrange(a)redhat.com>
Date: Feb 27 2018 16:30:20 +0000
Subject: Non-deterministic python hash iterator sort ordering
Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com>
---
diff --git a/0001-qapi-ensure-stable-sort-ordering-when-checking-QAPI-.patch b/0001-qapi-ensure-stable-sort-ordering-when-checking-QAPI-.patch
new file mode 100644
index 0000000..2fb9de0
--- /dev/null
+++ b/0001-qapi-ensure-stable-sort-ordering-when-checking-QAPI-.patch
@@ -0,0 +1,37 @@
+From f7a5376d4b667cf6c83c1d640e32d22456d7b5ee Mon Sep 17 00:00:00 2001
+From: "Daniel P. Berrange" <berrange(a)redhat.com>
+Date: Tue, 16 Jan 2018 13:42:10 +0000
+Subject: [PATCH] qapi: ensure stable sort ordering when checking QAPI entities
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Some early python 3.x versions will have different default
+ordering when calling the 'values()' method on a dict, compared
+to python 2.x and later 3.x versions. Explicitly sort the items
+to get a stable ordering.
+
+Reviewed-by: Philippe Mathieu-Daudé <f4bug(a)amsat.org>
+Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com>
+Message-Id: <20180116134217.8725-8-berrange(a)redhat.com>
+Signed-off-by: Eduardo Habkost <ehabkost(a)redhat.com>
+---
+ scripts/qapi.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/scripts/qapi.py b/scripts/qapi.py
+index 1fdd189c0d..58f995b07f 100644
+--- a/scripts/qapi.py
++++ b/scripts/qapi.py
+@@ -1678,7 +1678,7 @@ class QAPISchema(object):
+ assert False
+
+ def check(self):
+- for ent in self._entity_dict.values():
++ for (name, ent) in sorted(self._entity_dict.items()):
+ ent.check(self)
+
+ def visit(self, visitor):
+--
+2.14.3
+
https://src.fedoraproject.org/rpms/qemu/c/28d4d1f5e7d906c721659c166a9530f...
5Â years, 3Â months
jchaloup pushed to golang-github-hashicorp-mdns (master).
"Autogenerate some parts using the new macros"
by notificationsï¼ fedoraproject.org
From 27d0ce3cf1b6714509c581a3af721304d199f2c3 Mon Sep 17 00:00:00 2001
From: Jan Chaloupka <jchaloup(a)redhat.com>
Date: Feb 28 2018 19:29:07 +0000
Subject: Autogenerate some parts using the new macros
---
diff --git a/change-import-path-of-go.net.patch b/change-import-path-of-go.net.patch
index cd8c54f..1b262e5 100644
--- a/change-import-path-of-go.net.patch
+++ b/change-import-path-of-go.net.patch
@@ -1,6 +1,6 @@
-From c5bd3da1e38694687503a1e94b54acfe59bea4ec Mon Sep 17 00:00:00 2001
+From e2934e04352c802de629c2038be834d40bfcf326 Mon Sep 17 00:00:00 2001
From: Jan Chaloupka <jchaloup(a)redhat.com>
-Date: Wed, 15 Apr 2015 16:51:16 +0200
+Date: Wed, 28 Feb 2018 20:20:59 +0100
Subject: [PATCH] change import path of go.net
---
@@ -8,7 +8,7 @@ Subject: [PATCH] change import path of go.net
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/client.go b/client.go
-index a7359ae..48cc6d1 100644
+index a7359ae..766a763 100644
--- a/client.go
+++ b/client.go
@@ -8,8 +8,8 @@ import (
@@ -17,11 +17,11 @@ index a7359ae..48cc6d1 100644
- "github.com/hashicorp/go.net/ipv4"
- "github.com/hashicorp/go.net/ipv6"
-+ "code.google.com/p/go.net/ipv4"
-+ "code.google.com/p/go.net/ipv6"
++ "golang.org/x/net/ipv4"
++ "golang.org/x/net/ipv6"
"github.com/miekg/dns"
)
--
-1.9.3
+2.7.5
diff --git a/golang-github-hashicorp-mdns.spec b/golang-github-hashicorp-mdns.spec
index 492c5f7..9d48b82 100644
--- a/golang-github-hashicorp-mdns.spec
+++ b/golang-github-hashicorp-mdns.spec
@@ -1,165 +1,59 @@
-%if 0%{?fedora} || 0%{?rhel} == 6
-%global with_devel 1
-%global with_bundled 0
-%global with_debug 0
-# Tests need Internet access
-%global with_check 0
-%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
-
-%global provider github
-%global provider_tld com
-%global project hashicorp
-%global repo mdns
-# https://github.com/hashicorp/mdns
-%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
-%global import_path %{provider_prefix}
+# http://github.com/hashicorp/mdns
+%global provider_prefix github.com/hashicorp/mdns
+%global gobaseipath %{provider_prefix}
%global commit 2b439d37011456df8ff83a70ffd1cd6046410113
-%global shortcommit %(c=%{commit}; echo ${c:0:7})
+%global commitdate 20150317
-Name: golang-%{provider}-%{project}-%{repo}
+%gocraftmeta -i
+
+Name: %{goname}
Version: 0
-Release: 0.11.git%{shortcommit}%{?dist}
+Release: 0.12.%{commitdate}git%{shortcommit}%{?dist}
Summary: Simple mDNS client/server library in Golang
License: MIT
-URL: https://%{provider_prefix}
-Source0: https://%{provider_prefix}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz
+URL: %{gourl}
+Source0: %{gosource}
Patch0: change-import-path-of-go.net.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}
-
%description
%{summary}
-%if 0%{?with_devel}
%package devel
Summary: %{summary}
BuildArch: noarch
-%if 0%{?with_check}
-BuildRequires: golang(code.google.com/p/go.net/ipv4)
-BuildRequires: golang(code.google.com/p/go.net/ipv6)
+BuildRequires: golang(golang.org/x/net/ipv4)
+BuildRequires: golang(golang.org/x/net/ipv6)
BuildRequires: golang(github.com/miekg/dns)
-%endif
-
-Requires: golang(code.google.com/p/go.net/ipv4)
-Requires: golang(code.google.com/p/go.net/ipv6)
-Requires: golang(github.com/miekg/dns)
-
-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
-
-%if 0%{?with_unit_test} && 0%{?with_devel}
-%package unit-test
-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}
-
-%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
-%{summary}
-
-This package contains unit tests for project
-providing packages with %{import_path} prefix.
-%endif
+%{gobaseipath} prefix.
%prep
-%setup -q -n %{repo}-%{commit}
+%gosetup
%patch0 -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
-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.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.file-list
-done
-%endif
-
-%if 0%{?with_devel}
-sort -u -o devel.file-list devel.file-list
-%endif
+%goinstall
%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
-
-%if ! 0%{?gotest:1}
-%global gotest go test
-%endif
-
-%gotest %{import_path}
-%endif
+%gochecks %{gobaseipath}
#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 -f unit-test.file-list
-%license LICENSE
-%doc README.md
-%endif
%changelog
+* Wed Feb 28 2018 Jan Chaloupka <jchaloup(a)redhat.com> - 0-0.12.20150317git2b439d3
+- Autogenerate some parts using the new macros
+
* Wed Feb 07 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 0-0.11.git2b439d3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
https://src.fedoraproject.org/rpms/golang-github-hashicorp-mdns/c/27d0ce3...
5Â years, 3Â months
adamwill pushed to pcl (master). "Use -g1 to try and reduce memory
usage during ARM compile"
by notificationsï¼ fedoraproject.org
From d9d039cc6df7aa5120c6060b2759196485632a5e Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam(a)redhat.com>
Date: Feb 28 2018 20:04:18 +0000
Subject: Use -g1 to try and reduce memory usage during ARM compile
---
diff --git a/pcl.spec b/pcl.spec
index d080345..cb57c7a 100644
--- a/pcl.spec
+++ b/pcl.spec
@@ -99,6 +99,11 @@ sed -i "s/, 'sphinxcontrib.doxylink.doxylink'//g" doc/advanced/content/conf.py d
%build
mkdir build
pushd build
+# try to reduce memory usage of compile process (can cause OOM errors
+# esp. on ARM builders)
+%ifarch %{arm}
+%global optflags %(echo %{optflags} | sed 's/-g /-g1 /')
+%endif
%cmake \
-DWITH_DOCS=ON \
-DWITH_CUDA=OFF \
https://src.fedoraproject.org/rpms/pcl/c/d9d039cc6df7aa5120c6060b27591964...
5Â years, 3Â months
bowlofeggs pushed to python-webtest (master). "Use python2 explicitly
during build, install, and testing. (..more)"
by notificationsï¼ fedoraproject.org
From 4b69a8121609a6001e478eef6f9e8dfe489a6076 Mon Sep 17 00:00:00 2001
From: Randy Barlow <randy(a)electronsweatshop.com>
Date: Feb 28 2018 19:56:38 +0000
Subject: Use python2 explicitly during build, install, and testing.
Signed-off-by: Randy Barlow <randy(a)electronsweatshop.com>
---
diff --git a/python-webtest.spec b/python-webtest.spec
index 6652073..4e74552 100644
--- a/python-webtest.spec
+++ b/python-webtest.spec
@@ -9,7 +9,7 @@
Name: python-webtest
Version: 2.0.29
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Helper to test WSGI applications
Group: Development/Languages
@@ -97,12 +97,16 @@ find tests -type f -exec sed -i "s|import mock|from unittest import mock|" {} \;
popd
%endif
+# https://github.com/Pylons/webtest/pull/190
+chmod -x docs/contributing.rst
+
+
%build
-%{__python} setup.py build
+%py2_build
%if 0%{?with_python3}
pushd %{py3dir}
-%{__python3} setup.py build
+%py3_build
popd
%endif
@@ -110,14 +114,15 @@ popd
%{__rm} -rf %{buildroot}
%if 0%{?with_python3}
pushd %{py3dir}
-%{__python3} setup.py install -O1 --skip-build --root %{buildroot}
+%py3_install
popd
%endif
-%{__python} setup.py install -O1 --skip-build --root %{buildroot}
+%py2_install
+
%check
-PYTHONPATH=$(pwd) nosetests
+PYTHONPATH=$(pwd) nosetests-2
%if 0%{?with_python3}
pushd %{py3dir}
@@ -139,6 +144,9 @@ popd
%endif
%changelog
+* Wed Feb 28 2018 Randy Barlow <bowlofeggs(a)fedoraproject.org> - 2.0.29-5
+- Use python2 explicitly during build, install, and testing.
+
* Wed Feb 28 2018 Iryna Shcherbina <ishcherb(a)redhat.com> - 2.0.29-4
- Update Python 2 dependency declarations to new packaging standards
(See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3)
https://src.fedoraproject.org/rpms/python-webtest/c/4b69a8121609a6001e478...
5Â years, 3Â months