Architecture specific change in rpms/python-numpy-stl.git
by githook-noreply＠fedoraproject.org
The package rpms/python-numpy-stl.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/python-numpy-stl.git/commit/?id=4...
https://src.fedoraproject.org/cgit/rpms/python-numpy-stl.git/commit/?id=8....
Change:
+%ifnarch armv7hl
-%ifnarch armv7hl
Thanks.
Full change:
============
commit 4219577b60840c948fa0bc417ac23b9e0ea32097
Author: Miro Hronok <miro(a)hroncok.cz>
Date: Mon Dec 10 15:23:52 2018 +0100
Update to 2.8.0, fixes a long-standing bug with ASCII STL files
Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1589520
diff --git a/.gitignore b/.gitignore
index d19d78e..5bcbd35 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@
/numpy-stl-2.4.1.tar.gz
/numpy-stl-v2.6.0.tar.xz
/numpy-stl-v2.7.0.tar.xz
+/numpy-stl-v2.8.0.tar.xz
diff --git a/python-numpy-stl.spec b/python-numpy-stl.spec
index ed8b0a9..60fcf66 100644
--- a/python-numpy-stl.spec
+++ b/python-numpy-stl.spec
@@ -1,7 +1,7 @@
%global pypi_name numpy-stl
Name: python-%{pypi_name}
-Version: 2.7.0
+Version: 2.8.0
Release: 1%{?dist}
Summary: Library for reading, writing and modifying STL files
@@ -20,6 +20,13 @@ BuildRequires: python3-setuptools
BuildRequires: python3-sphinx
BuildRequires: python3-utils >= 1.6.2
+%ifnarch armv7hl
+# the test is optional based on the presence of PyQt5
+# xvfb somehow fails on this arch
+BuildRequires: python3-PyQt5
+BuildRequires: /usr/bin/xvfb-run
+%endif
+
%?python_enable_dependency_generator
%description
@@ -53,6 +60,8 @@ rm -rf %{pypi_name}.egg-info
# Remove pytest config - it assumes coverage and is not otherwise needed
rm pytest.ini
+# https://github.com/WoLpH/numpy-stl/pull/96
+sed -i 's/warnings.ImportWarning/ImportWarning/' tests/test_ascii.py
%build
%py3_build
@@ -66,7 +75,7 @@ rm -rf html/.{doctrees,buildinfo}
%check
-%{__python3} setup.py pytest
+%{__python3} setup.py pytest --addopts -v
%files -n python3-%{pypi_name}
@@ -82,6 +91,9 @@ rm -rf html/.{doctrees,buildinfo}
%doc html
%changelog
+* Mon Dec 10 2018 Miro Hronok <mhroncok(a)redhat.com> - 2.8.0-1
+- Update to 2.8.0, fixes a long-standing bug with ASCII STL files (#1589520)
+
* Wed Aug 01 2018 Miro Hronok <mhroncok(a)redhat.com> - 2.7.0-1
- Update to 2.7.0 (#1595001)
- Make doc subpackage noarch
diff --git a/sources b/sources
index ee52875..23e97ef 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (numpy-stl-v2.7.0.tar.xz) = 257216cbc94b5ba837a370351a284a1395101ae56b8a61db74379ab4204d3bca2cf3d8dff076d89f2a46ea6a1771c9c6dd54be6329d32e859486063be30ccb7c
+SHA512 (numpy-stl-v2.8.0.tar.xz) = 402b17393f6748ed8cc09994a038f49fe4dec31b6f06f824a9a26903bdf32941e6f15b7027a5449f1486f41aa91458e001f70ace00012ee52d74fb4c0c22b38a
commit f869aec3dd0cbd792974e849f742017de9460b9e
Author: Miro Hronok <miro(a)hroncok.cz>
Date: Wed Aug 1 17:51:23 2018 +0200
Update to 2.7.0 (#1595001), make doc noarch
diff --git a/.gitignore b/.gitignore
index dcdd683..d19d78e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
/numpy-stl-2.3.2.tar.gz
/numpy-stl-2.4.1.tar.gz
/numpy-stl-v2.6.0.tar.xz
+/numpy-stl-v2.7.0.tar.xz
diff --git a/numpy-stl-python37.patch b/numpy-stl-python37.patch
deleted file mode 100644
index 65c930b..0000000
--- a/numpy-stl-python37.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From c472e634aa6aa4c42adef5601541b641c79f6bf0 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro(a)hroncok.cz>
-Date: Mon, 25 Jun 2018 13:18:24 +0200
-Subject: [PATCH] Support Python 3.7 (PEP 479)
-
-See https://www.python.org/dev/peps/pep-0479/
-Fixes https://github.com/WoLpH/numpy-stl/issues/82
----
- .travis.yml | 7 +++++++
- stl/stl.py | 2 +-
- tox.ini | 5 ++++-
- 3 files changed, 12 insertions(+), 2 deletions(-)
-
-diff --git a/.travis.yml b/.travis.yml
-index a5af03b..b1b1aad 100644
---- a/.travis.yml
-+++ b/.travis.yml
-@@ -13,6 +13,13 @@ env:
- - TOX_ENV=py34-nix
- - TOX_ENV=py35-nix
- - TOX_ENV=py36-nix
-+matrix:
-+ include:
-+ - env: TOX_ENV=py37-nix
-+ python: '3.7-dev'
-+ install: pip install coveralls flake8 tox
-+ # be more verbose not to timeout:
-+ script: tox -vv -e $TOX_ENV
- install:
- - pip install -r tests/requirements.txt
- - pip install coveralls flake8 tox
-diff --git a/stl/stl.py b/stl/stl.py
-index f4007ed..ec8225d 100644
---- a/stl/stl.py
-+++ b/stl/stl.py
-@@ -214,7 +214,7 @@ def get(prefix=''):
- except AssertionError as e: # pragma: no cover
- raise RuntimeError(recoverable[0], e)
- except StopIteration:
-- raise
-+ return
-
- @classmethod
- def _load_ascii(cls, fh, header, speedups=True):
-diff --git a/tox.ini b/tox.ini
-index 275a844..f8a1057 100644
---- a/tox.ini
-+++ b/tox.ini
-@@ -1,5 +1,5 @@
- [tox]
--envlist = {py27,py33,py34,py35,py36}-{windows-32,windows-64,nix}, docs, flake8
-+envlist = {py27,py33,py34,py35,py36,py37}-{windows-32,windows-64,nix}, docs, flake8
- skip_missing_interpreters = True
-
- [testenv]
-@@ -12,6 +12,7 @@ basepython =
- py34-nix: python3.4
- py35-nix: python3.5
- py36-nix: python3.6
-+ py37-nix: python3.7
- py27-windows-32: C:\\Python27\\python.exe
- py27-windows-64: C:\\Python27-x64\\python.exe
- py34-windows-32: C:\\Python34\\python.exe
-@@ -20,6 +21,8 @@ basepython =
- py35-windows-64: C:\\Python35-x64\\python.exe
- py36-windows-32: C:\\Python36\\python.exe
- py36-windows-64: C:\\Python36-x64\\python.exe
-+ py37-windows-32: C:\\Python37\\python.exe
-+ py37-windows-64: C:\\Python37-x64\\python.exe
-
- [testenv:flake8]
- basepython=python
diff --git a/python-numpy-stl.spec b/python-numpy-stl.spec
index 3b25f01..ed8b0a9 100644
--- a/python-numpy-stl.spec
+++ b/python-numpy-stl.spec
@@ -1,17 +1,14 @@
%global pypi_name numpy-stl
Name: python-%{pypi_name}
-Version: 2.6.0
-Release: 2%{?dist}
+Version: 2.7.0
+Release: 1%{?dist}
Summary: Library for reading, writing and modifying STL files
License: BSD
URL: https://github.com/WoLpH/numpy-stl/
Source0: %{url}/releases/download/v%{version}/%{pypi_name}-v%{version}.tar.xz
-# https://github.com/WoLpH/numpy-stl/pull/83
-Patch0: %{pypi_name}-python37.patch
-
BuildRequires: gcc
BuildRequires: python3-devel
@@ -45,6 +42,7 @@ fastest STL editing libraries for Python available.
%package doc
Summary: %{name} documentation
Suggests: python3-%{pypi_name}
+BuildArch: noarch
%description doc
Documentation for %{name}.
@@ -84,6 +82,10 @@ rm -rf html/.{doctrees,buildinfo}
%doc html
%changelog
+* Wed Aug 01 2018 Miro Hronok <mhroncok(a)redhat.com> - 2.7.0-1
+- Update to 2.7.0 (#1595001)
+- Make doc subpackage noarch
+
* Sat Jul 14 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.6.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
diff --git a/sources b/sources
index 5865784..ee52875 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (numpy-stl-v2.6.0.tar.xz) = 85f070df8dcfc59088e18c76397eab4179713324fb312d8676fe6751c7491e7e6e1591bf35d50dc3375d2de9cecd3ade2fda765e06393796099fdf4a092f9c1a
+SHA512 (numpy-stl-v2.7.0.tar.xz) = 257216cbc94b5ba837a370351a284a1395101ae56b8a61db74379ab4204d3bca2cf3d8dff076d89f2a46ea6a1771c9c6dd54be6329d32e859486063be30ccb7c
commit c7b8468156339ada75eac508aadd61958ac20988
Author: Miro Hronok <miro(a)hroncok.cz>
Date: Sun Jul 15 16:28:06 2018 +0200
BR gcc
diff --git a/python-numpy-stl.spec b/python-numpy-stl.spec
index 5a1d949..3b25f01 100644
--- a/python-numpy-stl.spec
+++ b/python-numpy-stl.spec
@@ -12,6 +12,8 @@ Source0: %{url}/releases/download/v%{version}/%{pypi_name}-v%{version}.ta
# https://github.com/WoLpH/numpy-stl/pull/83
Patch0: %{pypi_name}-python37.patch
+BuildRequires: gcc
+
BuildRequires: python3-devel
BuildRequires: python3-Cython
BuildRequires: python3-numpy
commit ac3d598f4512138d8216bd03f4e915abab92676d
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Sat Jul 14 01:10:53 2018 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/python-numpy-stl.spec b/python-numpy-stl.spec
index 741eaae..5a1d949 100644
--- a/python-numpy-stl.spec
+++ b/python-numpy-stl.spec
@@ -2,7 +2,7 @@
Name: python-%{pypi_name}
Version: 2.6.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Library for reading, writing and modifying STL files
License: BSD
@@ -82,6 +82,9 @@ rm -rf html/.{doctrees,buildinfo}
%doc html
%changelog
+* Sat Jul 14 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.6.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
* Mon Jun 25 2018 Miro Hronok <mhroncok(a)redhat.com> - 2.6.0-1
- Update to 2.6.0 (#1577429)
- Add a patch to support Python 3.7
commit 4e2814120c212bb4813e69e17fcb165a7c40876c
Author: Miro Hronok <miro(a)hroncok.cz>
Date: Mon Jun 25 17:00:51 2018 +0200
Update to 2.6.0 (#1577429)
- Add a patch to support Python 3.7
diff --git a/.gitignore b/.gitignore
index 0e36a82..dcdd683 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
/numpy-stl-2.2.3.tar.gz
/numpy-stl-2.3.2.tar.gz
/numpy-stl-2.4.1.tar.gz
+/numpy-stl-v2.6.0.tar.xz
diff --git a/numpy-stl-allclose.patch b/numpy-stl-allclose.patch
deleted file mode 100644
index f3468ea..0000000
--- a/numpy-stl-allclose.patch
+++ /dev/null
@@ -1,212 +0,0 @@
-From d1c02b07eb8cb3534b91c771e4b158885606bc1c Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro(a)hroncok.cz>
-Date: Fri, 11 May 2018 15:52:47 +0200
-Subject: [PATCH] Use numpy.allclose() in tests to check float arrays equality
-
-On some platforms, a regular (a == b).all() might not work due to
-float32 not being very precise. In one particular case, we also
-increase the tolerance for allclose(), because on ppc64le 3
-rotations are enough to divert too much from the mathematically
-correct result.
-
-We cannot increase the precision, because STL has 32bit floats.
-
-Fixes https://github.com/WoLpH/numpy-stl/issues/78
----
- tests/test_mesh.py | 47 ++++++++++++++++++++++-------------------------
- tests/test_rotate.py | 50 ++++++++++++++++++++++++++------------------------
- 2 files changed, 48 insertions(+), 49 deletions(-)
-
-diff --git a/tests/test_mesh.py b/tests/test_mesh.py
-index 6c9906a..d272126 100644
---- a/tests/test_mesh.py
-+++ b/tests/test_mesh.py
-@@ -33,12 +33,9 @@ def test_units_2d():
- mesh = Mesh(data, remove_empty_areas=False)
- mesh.update_units()
-
-- assert (mesh.areas == [.5, .5]).all()
-- assert (mesh.normals == [[0, 0, 1.],
-- [0, 0, -1.]]).all()
--
-- assert (mesh.units == [[0, 0, 1],
-- [0, 0, -1]]).all()
-+ assert numpy.allclose(mesh.areas, [.5, .5])
-+ assert numpy.allclose(mesh.normals, [[0, 0, 1.], [0, 0, -1.]])
-+ assert numpy.allclose(mesh.units, [[0, 0, 1], [0, 0, -1]])
-
-
- def test_units_3d():
-@@ -51,7 +48,7 @@ def test_units_3d():
- mesh.update_units()
-
- assert (mesh.areas - 2 ** .5) < 0.0001
-- assert (mesh.normals == [0, -1, 1]).all()
-+ assert numpy.allclose(mesh.normals, [0, -1, 1])
-
- units = mesh.units[0]
- assert units[0] == 0
-@@ -102,28 +99,28 @@ def test_duplicate_polygons():
- mesh = Mesh(data, remove_duplicate_polygons=True)
- assert mesh.data.size == 3
-
-- assert (mesh.vectors[0] == numpy.array([[1, 0, 0],
-- [0, 0, 0],
-- [0, 0, 0]])).all()
-- assert (mesh.vectors[1] == numpy.array([[2, 0, 0],
-- [0, 0, 0],
-- [0, 0, 0]])).all()
-- assert (mesh.vectors[2] == numpy.array([[0, 0, 0],
-- [0, 0, 0],
-- [0, 0, 0]])).all()
-+ assert numpy.allclose(mesh.vectors[0], numpy.array([[1, 0, 0],
-+ [0, 0, 0],
-+ [0, 0, 0]]))
-+ assert numpy.allclose(mesh.vectors[1], numpy.array([[2, 0, 0],
-+ [0, 0, 0],
-+ [0, 0, 0]]))
-+ assert numpy.allclose(mesh.vectors[2], numpy.array([[0, 0, 0],
-+ [0, 0, 0],
-+ [0, 0, 0]]))
-
- mesh = Mesh(data, remove_duplicate_polygons=RemoveDuplicates.ALL)
- assert mesh.data.size == 3
-
-- assert (mesh.vectors[0] == numpy.array([[1, 0, 0],
-- [0, 0, 0],
-- [0, 0, 0]])).all()
-- assert (mesh.vectors[1] == numpy.array([[2, 0, 0],
-- [0, 0, 0],
-- [0, 0, 0]])).all()
-- assert (mesh.vectors[2] == numpy.array([[0, 0, 0],
-- [0, 0, 0],
-- [0, 0, 0]])).all()
-+ assert numpy.allclose(mesh.vectors[0], numpy.array([[1, 0, 0],
-+ [0, 0, 0],
-+ [0, 0, 0]]))
-+ assert numpy.allclose(mesh.vectors[1], numpy.array([[2, 0, 0],
-+ [0, 0, 0],
-+ [0, 0, 0]]))
-+ assert numpy.allclose(mesh.vectors[2], numpy.array([[0, 0, 0],
-+ [0, 0, 0],
-+ [0, 0, 0]]))
-
-
- def test_remove_all_duplicate_polygons():
-diff --git a/tests/test_rotate.py b/tests/test_rotate.py
-index 65900ea..5275fad 100644
---- a/tests/test_rotate.py
-+++ b/tests/test_rotate.py
-@@ -49,14 +49,16 @@ def test_rotation():
- # substracting .5
- data['vectors'] += .5
-
-- assert (mesh.vectors == numpy.array([
-+ # We use a slightly higher absolute tolerance here, for ppc64le
-+ # https://github.com/WoLpH/numpy-stl/issues/78
-+ assert numpy.allclose(mesh.vectors, numpy.array([
- [[1, 0, 0], [0, 1, 0], [0, 0, 0]],
- [[0, 1, 0], [1, 0, 0], [1, 1, 0]],
- [[0, 1, 1], [0, 1, 0], [1, 1, 1]],
- [[1, 1, 0], [0, 1, 0], [1, 1, 1]],
- [[0, 0, 1], [0, 1, 1], [0, 1, 0]],
- [[0, 0, 1], [0, 0, 0], [0, 1, 0]],
-- ])).all()
-+ ]), atol=1e-07)
-
-
- def test_rotation_over_point():
-@@ -127,13 +129,13 @@ def test_no_rotation():
-
- # Rotate by 0 degrees
- mesh.rotate([0.5, 0.0, 0.0], math.radians(0))
-- assert (mesh.vectors == numpy.array([
-- [[0, 1, 1], [1, 0, 1], [0, 0, 1]]])).all()
-+ assert numpy.allclose(mesh.vectors, numpy.array([
-+ [[0, 1, 1], [1, 0, 1], [0, 0, 1]]]))
-
- # Use a zero rotation matrix
- mesh.rotate([0.0, 0.0, 0.0], math.radians(90))
-- assert (mesh.vectors == numpy.array([
-- [[0, 1, 1], [1, 0, 1], [0, 0, 1]]])).all()
-+ assert numpy.allclose(mesh.vectors, numpy.array([
-+ [[0, 1, 1], [1, 0, 1], [0, 0, 1]]]))
-
-
- def test_no_translation():
-@@ -144,13 +146,13 @@ def test_no_translation():
- [0, 0, 1]])
-
- mesh = Mesh(data, remove_empty_areas=False)
-- assert (mesh.vectors == numpy.array([
-- [[0, 1, 1], [1, 0, 1], [0, 0, 1]]])).all()
-+ assert numpy.allclose(mesh.vectors, numpy.array([
-+ [[0, 1, 1], [1, 0, 1], [0, 0, 1]]]))
-
- # Translate mesh with a zero vector
- mesh.translate([0.0, 0.0, 0.0])
-- assert (mesh.vectors == numpy.array([
-- [[0, 1, 1], [1, 0, 1], [0, 0, 1]]])).all()
-+ assert numpy.allclose(mesh.vectors, numpy.array([
-+ [[0, 1, 1], [1, 0, 1], [0, 0, 1]]]))
-
-
- def test_translation():
-@@ -161,13 +163,13 @@ def test_translation():
- [0, 0, 1]])
-
- mesh = Mesh(data, remove_empty_areas=False)
-- assert (mesh.vectors == numpy.array([
-- [[0, 1, 1], [1, 0, 1], [0, 0, 1]]])).all()
-+ assert numpy.allclose(mesh.vectors, numpy.array([
-+ [[0, 1, 1], [1, 0, 1], [0, 0, 1]]]))
-
- # Translate mesh with vector [1, 2, 3]
- mesh.translate([1.0, 2.0, 3.0])
-- assert (mesh.vectors == numpy.array([
-- [[1, 3, 4], [2, 2, 4], [1, 2, 4]]])).all()
-+ assert numpy.allclose(mesh.vectors, numpy.array([
-+ [[1, 3, 4], [2, 2, 4], [1, 2, 4]]]))
-
-
- def test_no_transformation():
-@@ -178,14 +180,14 @@ def test_no_transformation():
- [0, 0, 1]])
-
- mesh = Mesh(data, remove_empty_areas=False)
-- assert (mesh.vectors == numpy.array([
-- [[0, 1, 1], [1, 0, 1], [0, 0, 1]]])).all()
-+ assert numpy.allclose(mesh.vectors, numpy.array([
-+ [[0, 1, 1], [1, 0, 1], [0, 0, 1]]]))
-
- # Transform mesh with identity matrix
- mesh.transform(numpy.eye(4))
-- assert (mesh.vectors == numpy.array([
-- [[0, 1, 1], [1, 0, 1], [0, 0, 1]]])).all()
-- assert numpy.all(mesh.areas == 0.5)
-+ assert numpy.allclose(mesh.vectors, numpy.array([
-+ [[0, 1, 1], [1, 0, 1], [0, 0, 1]]]))
-+ assert numpy.allclose(mesh.areas, 0.5)
-
-
- def test_transformation():
-@@ -196,14 +198,14 @@ def test_transformation():
- [0, 0, 1]])
-
- mesh = Mesh(data, remove_empty_areas=False)
-- assert (mesh.vectors == numpy.array([
-- [[0, 1, 1], [1, 0, 1], [0, 0, 1]]])).all()
-+ assert numpy.allclose(mesh.vectors, numpy.array([
-+ [[0, 1, 1], [1, 0, 1], [0, 0, 1]]]))
-
- # Transform mesh with identity matrix
- tr = numpy.zeros((4, 4))
- tr[0:3, 0:3] = Mesh.rotation_matrix([0, 0, 1], 0.5 * numpy.pi)
- tr[0:3, 3] = [1, 2, 3]
- mesh.transform(tr)
-- assert (mesh.vectors == numpy.array([
-- [[0, 2, 4], [1, 3, 4], [1, 2, 4]]])).all()
-- assert numpy.all(mesh.areas == 0.5)
-+ assert numpy.allclose(mesh.vectors, numpy.array([
-+ [[0, 2, 4], [1, 3, 4], [1, 2, 4]]]))
-+ assert numpy.allclose(mesh.areas, 0.5)
diff --git a/numpy-stl-python37.patch b/numpy-stl-python37.patch
new file mode 100644
index 0000000..65c930b
--- /dev/null
+++ b/numpy-stl-python37.patch
@@ -0,0 +1,72 @@
+From c472e634aa6aa4c42adef5601541b641c79f6bf0 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro(a)hroncok.cz>
+Date: Mon, 25 Jun 2018 13:18:24 +0200
+Subject: [PATCH] Support Python 3.7 (PEP 479)
+
+See https://www.python.org/dev/peps/pep-0479/
+Fixes https://github.com/WoLpH/numpy-stl/issues/82
+---
+ .travis.yml | 7 +++++++
+ stl/stl.py | 2 +-
+ tox.ini | 5 ++++-
+ 3 files changed, 12 insertions(+), 2 deletions(-)
+
+diff --git a/.travis.yml b/.travis.yml
+index a5af03b..b1b1aad 100644
+--- a/.travis.yml
++++ b/.travis.yml
+@@ -13,6 +13,13 @@ env:
+ - TOX_ENV=py34-nix
+ - TOX_ENV=py35-nix
+ - TOX_ENV=py36-nix
++matrix:
++ include:
++ - env: TOX_ENV=py37-nix
++ python: '3.7-dev'
++ install: pip install coveralls flake8 tox
++ # be more verbose not to timeout:
++ script: tox -vv -e $TOX_ENV
+ install:
+ - pip install -r tests/requirements.txt
+ - pip install coveralls flake8 tox
+diff --git a/stl/stl.py b/stl/stl.py
+index f4007ed..ec8225d 100644
+--- a/stl/stl.py
++++ b/stl/stl.py
+@@ -214,7 +214,7 @@ def get(prefix=''):
+ except AssertionError as e: # pragma: no cover
+ raise RuntimeError(recoverable[0], e)
+ except StopIteration:
+- raise
++ return
+
+ @classmethod
+ def _load_ascii(cls, fh, header, speedups=True):
+diff --git a/tox.ini b/tox.ini
+index 275a844..f8a1057 100644
+--- a/tox.ini
++++ b/tox.ini
+@@ -1,5 +1,5 @@
+ [tox]
+-envlist = {py27,py33,py34,py35,py36}-{windows-32,windows-64,nix}, docs, flake8
++envlist = {py27,py33,py34,py35,py36,py37}-{windows-32,windows-64,nix}, docs, flake8
+ skip_missing_interpreters = True
+
+ [testenv]
+@@ -12,6 +12,7 @@ basepython =
+ py34-nix: python3.4
+ py35-nix: python3.5
+ py36-nix: python3.6
++ py37-nix: python3.7
+ py27-windows-32: C:\\Python27\\python.exe
+ py27-windows-64: C:\\Python27-x64\\python.exe
+ py34-windows-32: C:\\Python34\\python.exe
+@@ -20,6 +21,8 @@ basepython =
+ py35-windows-64: C:\\Python35-x64\\python.exe
+ py36-windows-32: C:\\Python36\\python.exe
+ py36-windows-64: C:\\Python36-x64\\python.exe
++ py37-windows-32: C:\\Python37\\python.exe
++ py37-windows-64: C:\\Python37-x64\\python.exe
+
+ [testenv:flake8]
+ basepython=python
diff --git a/python-numpy-stl.spec b/python-numpy-stl.spec
index ac19a86..741eaae 100644
--- a/python-numpy-stl.spec
+++ b/python-numpy-stl.spec
@@ -1,16 +1,16 @@
%global pypi_name numpy-stl
Name: python-%{pypi_name}
-Version: 2.4.1
-Release: 2%{?dist}
+Version: 2.6.0
+Release: 1%{?dist}
Summary: Library for reading, writing and modifying STL files
License: BSD
URL: https://github.com/WoLpH/numpy-stl/
-Source0: https://files.pythonhosted.org/packages/source/n/%{pypi_name}/%{pypi_name...
+Source0: %{url}/releases/download/v%{version}/%{pypi_name}-v%{version}.tar.xz
-# https://github.com/WoLpH/numpy-stl/issues/78
-Patch0: %{pypi_name}-allclose.patch
+# https://github.com/WoLpH/numpy-stl/pull/83
+Patch0: %{pypi_name}-python37.patch
BuildRequires: python3-devel
BuildRequires: python3-Cython
@@ -47,9 +47,12 @@ Suggests: python3-%{pypi_name}
Documentation for %{name}.
%prep
-%autosetup -n %{pypi_name}-%{version} -p1
+%autosetup -n %{pypi_name}-v%{version} -p1
# Remove bundled egg-info
rm -rf %{pypi_name}.egg-info
+# Remove pytest config - it assumes coverage and is not otherwise needed
+rm pytest.ini
+
%build
%py3_build
@@ -79,6 +82,10 @@ rm -rf html/.{doctrees,buildinfo}
%doc html
%changelog
+* Mon Jun 25 2018 Miro Hronok <mhroncok(a)redhat.com> - 2.6.0-1
+- Update to 2.6.0 (#1577429)
+- Add a patch to support Python 3.7
+
* Tue Jun 19 2018 Miro Hronok <mhroncok(a)redhat.com> - 2.4.1-2
- Rebuilt for Python 3.7
diff --git a/sources b/sources
index 4cc1697..5865784 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (numpy-stl-2.4.1.tar.gz) = d45d4606f6f622b7514faa30457b46e1e0ddf258c20953a74de9b37e9f4d8830f441bc8ad031a0a263d029e4da870f5c78e568d25a1d53ade526e4f85f8bfa7f
+SHA512 (numpy-stl-v2.6.0.tar.xz) = 85f070df8dcfc59088e18c76397eab4179713324fb312d8676fe6751c7491e7e6e1591bf35d50dc3375d2de9cecd3ade2fda765e06393796099fdf4a092f9c1a
commit f3f8b5e4f8c97b4ca7684f41e42b7580880fb312
Author: Miro Hronok <miro(a)hroncok.cz>
Date: Tue Jun 19 11:10:59 2018 +0200
Rebuilt for Python 3.7
diff --git a/python-numpy-stl.spec b/python-numpy-stl.spec
index 7593132..ac19a86 100644
--- a/python-numpy-stl.spec
+++ b/python-numpy-stl.spec
@@ -2,7 +2,7 @@
Name: python-%{pypi_name}
Version: 2.4.1
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Library for reading, writing and modifying STL files
License: BSD
@@ -79,6 +79,9 @@ rm -rf html/.{doctrees,buildinfo}
%doc html
%changelog
+* Tue Jun 19 2018 Miro Hronok <mhroncok(a)redhat.com> - 2.4.1-2
+- Rebuilt for Python 3.7
+
* Fri May 11 2018 Miro Hronok <mhroncok(a)redhat.com> - 2.4.1-1
- Updated to 2.4.1 (#1475307)
- Enable automatic dependency generator, drop nine from BRs
commit 0255b74368c1a41afaf1acb14f9d765c4835ea0d
Author: Miro Hronok <miro(a)hroncok.cz>
Date: Fri May 11 16:02:16 2018 +0200
Add tolerance to tests that check float equality
Fixes test failure on ppc64le.
diff --git a/numpy-stl-allclose.patch b/numpy-stl-allclose.patch
new file mode 100644
index 0000000..f3468ea
--- /dev/null
+++ b/numpy-stl-allclose.patch
@@ -0,0 +1,212 @@
+From d1c02b07eb8cb3534b91c771e4b158885606bc1c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro(a)hroncok.cz>
+Date: Fri, 11 May 2018 15:52:47 +0200
+Subject: [PATCH] Use numpy.allclose() in tests to check float arrays equality
+
+On some platforms, a regular (a == b).all() might not work due to
+float32 not being very precise. In one particular case, we also
+increase the tolerance for allclose(), because on ppc64le 3
+rotations are enough to divert too much from the mathematically
+correct result.
+
+We cannot increase the precision, because STL has 32bit floats.
+
+Fixes https://github.com/WoLpH/numpy-stl/issues/78
+---
+ tests/test_mesh.py | 47 ++++++++++++++++++++++-------------------------
+ tests/test_rotate.py | 50 ++++++++++++++++++++++++++------------------------
+ 2 files changed, 48 insertions(+), 49 deletions(-)
+
+diff --git a/tests/test_mesh.py b/tests/test_mesh.py
+index 6c9906a..d272126 100644
+--- a/tests/test_mesh.py
++++ b/tests/test_mesh.py
+@@ -33,12 +33,9 @@ def test_units_2d():
+ mesh = Mesh(data, remove_empty_areas=False)
+ mesh.update_units()
+
+- assert (mesh.areas == [.5, .5]).all()
+- assert (mesh.normals == [[0, 0, 1.],
+- [0, 0, -1.]]).all()
+-
+- assert (mesh.units == [[0, 0, 1],
+- [0, 0, -1]]).all()
++ assert numpy.allclose(mesh.areas, [.5, .5])
++ assert numpy.allclose(mesh.normals, [[0, 0, 1.], [0, 0, -1.]])
++ assert numpy.allclose(mesh.units, [[0, 0, 1], [0, 0, -1]])
+
+
+ def test_units_3d():
+@@ -51,7 +48,7 @@ def test_units_3d():
+ mesh.update_units()
+
+ assert (mesh.areas - 2 ** .5) < 0.0001
+- assert (mesh.normals == [0, -1, 1]).all()
++ assert numpy.allclose(mesh.normals, [0, -1, 1])
+
+ units = mesh.units[0]
+ assert units[0] == 0
+@@ -102,28 +99,28 @@ def test_duplicate_polygons():
+ mesh = Mesh(data, remove_duplicate_polygons=True)
+ assert mesh.data.size == 3
+
+- assert (mesh.vectors[0] == numpy.array([[1, 0, 0],
+- [0, 0, 0],
+- [0, 0, 0]])).all()
+- assert (mesh.vectors[1] == numpy.array([[2, 0, 0],
+- [0, 0, 0],
+- [0, 0, 0]])).all()
+- assert (mesh.vectors[2] == numpy.array([[0, 0, 0],
+- [0, 0, 0],
+- [0, 0, 0]])).all()
++ assert numpy.allclose(mesh.vectors[0], numpy.array([[1, 0, 0],
++ [0, 0, 0],
++ [0, 0, 0]]))
++ assert numpy.allclose(mesh.vectors[1], numpy.array([[2, 0, 0],
++ [0, 0, 0],
++ [0, 0, 0]]))
++ assert numpy.allclose(mesh.vectors[2], numpy.array([[0, 0, 0],
++ [0, 0, 0],
++ [0, 0, 0]]))
+
+ mesh = Mesh(data, remove_duplicate_polygons=RemoveDuplicates.ALL)
+ assert mesh.data.size == 3
+
+- assert (mesh.vectors[0] == numpy.array([[1, 0, 0],
+- [0, 0, 0],
+- [0, 0, 0]])).all()
+- assert (mesh.vectors[1] == numpy.array([[2, 0, 0],
+- [0, 0, 0],
+- [0, 0, 0]])).all()
+- assert (mesh.vectors[2] == numpy.array([[0, 0, 0],
+- [0, 0, 0],
+- [0, 0, 0]])).all()
++ assert numpy.allclose(mesh.vectors[0], numpy.array([[1, 0, 0],
++ [0, 0, 0],
++ [0, 0, 0]]))
++ assert numpy.allclose(mesh.vectors[1], numpy.array([[2, 0, 0],
++ [0, 0, 0],
++ [0, 0, 0]]))
++ assert numpy.allclose(mesh.vectors[2], numpy.array([[0, 0, 0],
++ [0, 0, 0],
++ [0, 0, 0]]))
+
+
+ def test_remove_all_duplicate_polygons():
+diff --git a/tests/test_rotate.py b/tests/test_rotate.py
+index 65900ea..5275fad 100644
+--- a/tests/test_rotate.py
++++ b/tests/test_rotate.py
+@@ -49,14 +49,16 @@ def test_rotation():
+ # substracting .5
+ data['vectors'] += .5
+
+- assert (mesh.vectors == numpy.array([
++ # We use a slightly higher absolute tolerance here, for ppc64le
++ # https://github.com/WoLpH/numpy-stl/issues/78
++ assert numpy.allclose(mesh.vectors, numpy.array([
+ [[1, 0, 0], [0, 1, 0], [0, 0, 0]],
+ [[0, 1, 0], [1, 0, 0], [1, 1, 0]],
+ [[0, 1, 1], [0, 1, 0], [1, 1, 1]],
+ [[1, 1, 0], [0, 1, 0], [1, 1, 1]],
+ [[0, 0, 1], [0, 1, 1], [0, 1, 0]],
+ [[0, 0, 1], [0, 0, 0], [0, 1, 0]],
+- ])).all()
++ ]), atol=1e-07)
+
+
+ def test_rotation_over_point():
+@@ -127,13 +129,13 @@ def test_no_rotation():
+
+ # Rotate by 0 degrees
+ mesh.rotate([0.5, 0.0, 0.0], math.radians(0))
+- assert (mesh.vectors == numpy.array([
+- [[0, 1, 1], [1, 0, 1], [0, 0, 1]]])).all()
++ assert numpy.allclose(mesh.vectors, numpy.array([
++ [[0, 1, 1], [1, 0, 1], [0, 0, 1]]]))
+
+ # Use a zero rotation matrix
+ mesh.rotate([0.0, 0.0, 0.0], math.radians(90))
+- assert (mesh.vectors == numpy.array([
+- [[0, 1, 1], [1, 0, 1], [0, 0, 1]]])).all()
++ assert numpy.allclose(mesh.vectors, numpy.array([
++ [[0, 1, 1], [1, 0, 1], [0, 0, 1]]]))
+
+
+ def test_no_translation():
+@@ -144,13 +146,13 @@ def test_no_translation():
+ [0, 0, 1]])
+
+ mesh = Mesh(data, remove_empty_areas=False)
+- assert (mesh.vectors == numpy.array([
+- [[0, 1, 1], [1, 0, 1], [0, 0, 1]]])).all()
++ assert numpy.allclose(mesh.vectors, numpy.array([
++ [[0, 1, 1], [1, 0, 1], [0, 0, 1]]]))
+
+ # Translate mesh with a zero vector
+ mesh.translate([0.0, 0.0, 0.0])
+- assert (mesh.vectors == numpy.array([
+- [[0, 1, 1], [1, 0, 1], [0, 0, 1]]])).all()
++ assert numpy.allclose(mesh.vectors, numpy.array([
++ [[0, 1, 1], [1, 0, 1], [0, 0, 1]]]))
+
+
+ def test_translation():
+@@ -161,13 +163,13 @@ def test_translation():
+ [0, 0, 1]])
+
+ mesh = Mesh(data, remove_empty_areas=False)
+- assert (mesh.vectors == numpy.array([
+- [[0, 1, 1], [1, 0, 1], [0, 0, 1]]])).all()
++ assert numpy.allclose(mesh.vectors, numpy.array([
++ [[0, 1, 1], [1, 0, 1], [0, 0, 1]]]))
+
+ # Translate mesh with vector [1, 2, 3]
+ mesh.translate([1.0, 2.0, 3.0])
+- assert (mesh.vectors == numpy.array([
+- [[1, 3, 4], [2, 2, 4], [1, 2, 4]]])).all()
++ assert numpy.allclose(mesh.vectors, numpy.array([
++ [[1, 3, 4], [2, 2, 4], [1, 2, 4]]]))
+
+
+ def test_no_transformation():
+@@ -178,14 +180,14 @@ def test_no_transformation():
+ [0, 0, 1]])
+
+ mesh = Mesh(data, remove_empty_areas=False)
+- assert (mesh.vectors == numpy.array([
+- [[0, 1, 1], [1, 0, 1], [0, 0, 1]]])).all()
++ assert numpy.allclose(mesh.vectors, numpy.array([
++ [[0, 1, 1], [1, 0, 1], [0, 0, 1]]]))
+
+ # Transform mesh with identity matrix
+ mesh.transform(numpy.eye(4))
+- assert (mesh.vectors == numpy.array([
+- [[0, 1, 1], [1, 0, 1], [0, 0, 1]]])).all()
+- assert numpy.all(mesh.areas == 0.5)
++ assert numpy.allclose(mesh.vectors, numpy.array([
++ [[0, 1, 1], [1, 0, 1], [0, 0, 1]]]))
++ assert numpy.allclose(mesh.areas, 0.5)
+
+
+ def test_transformation():
+@@ -196,14 +198,14 @@ def test_transformation():
+ [0, 0, 1]])
+
+ mesh = Mesh(data, remove_empty_areas=False)
+- assert (mesh.vectors == numpy.array([
+- [[0, 1, 1], [1, 0, 1], [0, 0, 1]]])).all()
++ assert numpy.allclose(mesh.vectors, numpy.array([
++ [[0, 1, 1], [1, 0, 1], [0, 0, 1]]]))
+
+ # Transform mesh with identity matrix
+ tr = numpy.zeros((4, 4))
+ tr[0:3, 0:3] = Mesh.rotation_matrix([0, 0, 1], 0.5 * numpy.pi)
+ tr[0:3, 3] = [1, 2, 3]
+ mesh.transform(tr)
+- assert (mesh.vectors == numpy.array([
+- [[0, 2, 4], [1, 3, 4], [1, 2, 4]]])).all()
+- assert numpy.all(mesh.areas == 0.5)
++ assert numpy.allclose(mesh.vectors, numpy.array([
++ [[0, 2, 4], [1, 3, 4], [1, 2, 4]]]))
++ assert numpy.allclose(mesh.areas, 0.5)
diff --git a/python-numpy-stl.spec b/python-numpy-stl.spec
index 8c1bd71..7593132 100644
--- a/python-numpy-stl.spec
+++ b/python-numpy-stl.spec
@@ -9,7 +9,8 @@ License: BSD
URL: https://github.com/WoLpH/numpy-stl/
Source0: https://files.pythonhosted.org/packages/source/n/%{pypi_name}/%{pypi_name...
-Patch0: allclose.patch
+# https://github.com/WoLpH/numpy-stl/issues/78
+Patch0: %{pypi_name}-allclose.patch
BuildRequires: python3-devel
BuildRequires: python3-Cython
@@ -82,6 +83,7 @@ rm -rf html/.{doctrees,buildinfo}
- Updated to 2.4.1 (#1475307)
- Enable automatic dependency generator, drop nine from BRs
- Enable tests on armv7hl once again (it works now)
+- Add tolerance to tests that check float equality, fixes test failure on ppc64le
* Wed Feb 14 2018 Miro Hronok <mhroncok(a)redhat.com> - 2.3.2-1
- Updated to 2.3.2 to fix FTBFS
commit 8db33278e76e3c2190dcc712329a0afb6cf06552
Author: Miro Hronok <miro(a)hroncok.cz>
Date: Fri May 11 14:56:07 2018 +0200
Enable tests on armv7hl once again (it works now)
diff --git a/python-numpy-stl.spec b/python-numpy-stl.spec
index 3da1f47..8c1bd71 100644
--- a/python-numpy-stl.spec
+++ b/python-numpy-stl.spec
@@ -9,6 +9,8 @@ License: BSD
URL: https://github.com/WoLpH/numpy-stl/
Source0: https://files.pythonhosted.org/packages/source/n/%{pypi_name}/%{pypi_name...
+Patch0: allclose.patch
+
BuildRequires: python3-devel
BuildRequires: python3-Cython
BuildRequires: python3-numpy
@@ -60,10 +62,7 @@ rm -rf html/.{doctrees,buildinfo}
%check
-# The tests on armv7hl fail with Bus errors, will investigate later
-%ifnarch armv7hl
%{__python3} setup.py pytest
-%endif
%files -n python3-%{pypi_name}
@@ -82,6 +81,7 @@ rm -rf html/.{doctrees,buildinfo}
* Fri May 11 2018 Miro Hronok <mhroncok(a)redhat.com> - 2.4.1-1
- Updated to 2.4.1 (#1475307)
- Enable automatic dependency generator, drop nine from BRs
+- Enable tests on armv7hl once again (it works now)
* Wed Feb 14 2018 Miro Hronok <mhroncok(a)redhat.com> - 2.3.2-1
- Updated to 2.3.2 to fix FTBFS
commit 02d7f1820b920831353ed8f5d7687640f3191f36
Author: Miro Hronok <miro(a)hroncok.cz>
Date: Fri May 11 14:54:38 2018 +0200
Enable automatic dependency generator, drop nine from BRs
diff --git a/python-numpy-stl.spec b/python-numpy-stl.spec
index 69b8aec..3da1f47 100644
--- a/python-numpy-stl.spec
+++ b/python-numpy-stl.spec
@@ -11,7 +11,6 @@ Source0: https://files.pythonhosted.org/packages/source/n/%{pypi_name}/%{
BuildRequires: python3-devel
BuildRequires: python3-Cython
-BuildRequires: python3-nine
BuildRequires: python3-numpy
BuildRequires: python3-pytest
BuildRequires: python3-pytest-runner
@@ -19,6 +18,8 @@ BuildRequires: python3-setuptools
BuildRequires: python3-sphinx
BuildRequires: python3-utils >= 1.6.2
+%?python_enable_dependency_generator
+
%description
Simple library to make working with STL files (and 3D objects in general) fast
and easy. Due to all operations heavily relying on numpy this is one of the
@@ -28,10 +29,8 @@ fastest STL editing libraries for Python available.
Summary: %{summary}
%{?python_provide:%python_provide python3-%{pypi_name}}
-Requires: python3-numpy
-Requires: python3-nine
-Requires: python3-utils >= 1.6.2
-Requires: python3-setuptools
+# for entrypoints
+Requires: %{py3_dist setuptools}
%description -n python3-%{pypi_name}
Simple library to make working with STL files (and 3D objects in general) fast
@@ -82,6 +81,7 @@ rm -rf html/.{doctrees,buildinfo}
%changelog
* Fri May 11 2018 Miro Hronok <mhroncok(a)redhat.com> - 2.4.1-1
- Updated to 2.4.1 (#1475307)
+- Enable automatic dependency generator, drop nine from BRs
* Wed Feb 14 2018 Miro Hronok <mhroncok(a)redhat.com> - 2.3.2-1
- Updated to 2.3.2 to fix FTBFS
commit 82c9266da326caa24baadf7326d5f5e71bac8041
Author: Miro Hronok <miro(a)hroncok.cz>
Date: Fri May 11 14:36:39 2018 +0200
Updated to 2.4.1 (#1475307)
diff --git a/.gitignore b/.gitignore
index c2b1851..0e36a82 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
/numpy-stl-2.2.2.tar.gz
/numpy-stl-2.2.3.tar.gz
/numpy-stl-2.3.2.tar.gz
+/numpy-stl-2.4.1.tar.gz
diff --git a/python-numpy-stl.spec b/python-numpy-stl.spec
index 98f2dce..69b8aec 100644
--- a/python-numpy-stl.spec
+++ b/python-numpy-stl.spec
@@ -1,7 +1,7 @@
%global pypi_name numpy-stl
Name: python-%{pypi_name}
-Version: 2.3.2
+Version: 2.4.1
Release: 1%{?dist}
Summary: Library for reading, writing and modifying STL files
@@ -80,6 +80,9 @@ rm -rf html/.{doctrees,buildinfo}
%doc html
%changelog
+* Fri May 11 2018 Miro Hronok <mhroncok(a)redhat.com> - 2.4.1-1
+- Updated to 2.4.1 (#1475307)
+
* Wed Feb 14 2018 Miro Hronok <mhroncok(a)redhat.com> - 2.3.2-1
- Updated to 2.3.2 to fix FTBFS
diff --git a/sources b/sources
index 81c6aa6..4cc1697 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (numpy-stl-2.3.2.tar.gz) = 7ff0429947b75f4933d27bbfdc22db0cec681472a9eeaff078b91711b6896770e293572a957c98e5080c7423c8f1bd7c582120579fc1a6d7f7ef155bc5b3c0cc
+SHA512 (numpy-stl-2.4.1.tar.gz) = d45d4606f6f622b7514faa30457b46e1e0ddf258c20953a74de9b37e9f4d8830f441bc8ad031a0a263d029e4da870f5c78e568d25a1d53ade526e4f85f8bfa7f
5 years, 4 months
Architecture specific change in rpms/python-numpy-stl.git
by githook-noreply＠fedoraproject.org
The package rpms/python-numpy-stl.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/python-numpy-stl.git/commit/?id=4....
Change:
+%ifnarch armv7hl
Thanks.
Full change:
============
commit 4219577b60840c948fa0bc417ac23b9e0ea32097
Author: Miro Hronok <miro(a)hroncok.cz>
Date: Mon Dec 10 15:23:52 2018 +0100
Update to 2.8.0, fixes a long-standing bug with ASCII STL files
Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1589520
diff --git a/.gitignore b/.gitignore
index d19d78e..5bcbd35 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@
/numpy-stl-2.4.1.tar.gz
/numpy-stl-v2.6.0.tar.xz
/numpy-stl-v2.7.0.tar.xz
+/numpy-stl-v2.8.0.tar.xz
diff --git a/python-numpy-stl.spec b/python-numpy-stl.spec
index ed8b0a9..60fcf66 100644
--- a/python-numpy-stl.spec
+++ b/python-numpy-stl.spec
@@ -1,7 +1,7 @@
%global pypi_name numpy-stl
Name: python-%{pypi_name}
-Version: 2.7.0
+Version: 2.8.0
Release: 1%{?dist}
Summary: Library for reading, writing and modifying STL files
@@ -20,6 +20,13 @@ BuildRequires: python3-setuptools
BuildRequires: python3-sphinx
BuildRequires: python3-utils >= 1.6.2
+%ifnarch armv7hl
+# the test is optional based on the presence of PyQt5
+# xvfb somehow fails on this arch
+BuildRequires: python3-PyQt5
+BuildRequires: /usr/bin/xvfb-run
+%endif
+
%?python_enable_dependency_generator
%description
@@ -53,6 +60,8 @@ rm -rf %{pypi_name}.egg-info
# Remove pytest config - it assumes coverage and is not otherwise needed
rm pytest.ini
+# https://github.com/WoLpH/numpy-stl/pull/96
+sed -i 's/warnings.ImportWarning/ImportWarning/' tests/test_ascii.py
%build
%py3_build
@@ -66,7 +75,7 @@ rm -rf html/.{doctrees,buildinfo}
%check
-%{__python3} setup.py pytest
+%{__python3} setup.py pytest --addopts -v
%files -n python3-%{pypi_name}
@@ -82,6 +91,9 @@ rm -rf html/.{doctrees,buildinfo}
%doc html
%changelog
+* Mon Dec 10 2018 Miro Hronok <mhroncok(a)redhat.com> - 2.8.0-1
+- Update to 2.8.0, fixes a long-standing bug with ASCII STL files (#1589520)
+
* Wed Aug 01 2018 Miro Hronok <mhroncok(a)redhat.com> - 2.7.0-1
- Update to 2.7.0 (#1595001)
- Make doc subpackage noarch
diff --git a/sources b/sources
index ee52875..23e97ef 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (numpy-stl-v2.7.0.tar.xz) = 257216cbc94b5ba837a370351a284a1395101ae56b8a61db74379ab4204d3bca2cf3d8dff076d89f2a46ea6a1771c9c6dd54be6329d32e859486063be30ccb7c
+SHA512 (numpy-stl-v2.8.0.tar.xz) = 402b17393f6748ed8cc09994a038f49fe4dec31b6f06f824a9a26903bdf32941e6f15b7027a5449f1486f41aa91458e001f70ace00012ee52d74fb4c0c22b38a
5 years, 4 months
Architecture specific change in rpms/python-numpy-stl.git
by githook-noreply＠fedoraproject.org
The package rpms/python-numpy-stl.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/python-numpy-stl.git/commit/?id=4....
Change:
+%ifnarch armv7hl
Thanks.
Full change:
============
commit 4219577b60840c948fa0bc417ac23b9e0ea32097
Author: Miro Hronok <miro(a)hroncok.cz>
Date: Mon Dec 10 15:23:52 2018 +0100
Update to 2.8.0, fixes a long-standing bug with ASCII STL files
Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1589520
diff --git a/.gitignore b/.gitignore
index d19d78e..5bcbd35 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@
/numpy-stl-2.4.1.tar.gz
/numpy-stl-v2.6.0.tar.xz
/numpy-stl-v2.7.0.tar.xz
+/numpy-stl-v2.8.0.tar.xz
diff --git a/python-numpy-stl.spec b/python-numpy-stl.spec
index ed8b0a9..60fcf66 100644
--- a/python-numpy-stl.spec
+++ b/python-numpy-stl.spec
@@ -1,7 +1,7 @@
%global pypi_name numpy-stl
Name: python-%{pypi_name}
-Version: 2.7.0
+Version: 2.8.0
Release: 1%{?dist}
Summary: Library for reading, writing and modifying STL files
@@ -20,6 +20,13 @@ BuildRequires: python3-setuptools
BuildRequires: python3-sphinx
BuildRequires: python3-utils >= 1.6.2
+%ifnarch armv7hl
+# the test is optional based on the presence of PyQt5
+# xvfb somehow fails on this arch
+BuildRequires: python3-PyQt5
+BuildRequires: /usr/bin/xvfb-run
+%endif
+
%?python_enable_dependency_generator
%description
@@ -53,6 +60,8 @@ rm -rf %{pypi_name}.egg-info
# Remove pytest config - it assumes coverage and is not otherwise needed
rm pytest.ini
+# https://github.com/WoLpH/numpy-stl/pull/96
+sed -i 's/warnings.ImportWarning/ImportWarning/' tests/test_ascii.py
%build
%py3_build
@@ -66,7 +75,7 @@ rm -rf html/.{doctrees,buildinfo}
%check
-%{__python3} setup.py pytest
+%{__python3} setup.py pytest --addopts -v
%files -n python3-%{pypi_name}
@@ -82,6 +91,9 @@ rm -rf html/.{doctrees,buildinfo}
%doc html
%changelog
+* Mon Dec 10 2018 Miro Hronok <mhroncok(a)redhat.com> - 2.8.0-1
+- Update to 2.8.0, fixes a long-standing bug with ASCII STL files (#1589520)
+
* Wed Aug 01 2018 Miro Hronok <mhroncok(a)redhat.com> - 2.7.0-1
- Update to 2.7.0 (#1595001)
- Make doc subpackage noarch
diff --git a/sources b/sources
index ee52875..23e97ef 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (numpy-stl-v2.7.0.tar.xz) = 257216cbc94b5ba837a370351a284a1395101ae56b8a61db74379ab4204d3bca2cf3d8dff076d89f2a46ea6a1771c9c6dd54be6329d32e859486063be30ccb7c
+SHA512 (numpy-stl-v2.8.0.tar.xz) = 402b17393f6748ed8cc09994a038f49fe4dec31b6f06f824a9a26903bdf32941e6f15b7027a5449f1486f41aa91458e001f70ace00012ee52d74fb4c0c22b38a
5 years, 4 months
Architecture specific change in rpms/subunit.git
by githook-noreply＠fedoraproject.org
The package rpms/subunit.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/subunit.git/commit/?id=b4d8f988f7....
Change:
+%ifarch aarch64
Thanks.
Full change:
============
commit b4d8f988f7c9cfd25f255122e9a628b7b26a1b06
Author: Haikel Guemar <hguemar(a)fedoraproject.org>
Date: Mon Dec 10 15:49:27 2018 +0100
Workaround on python3 test failure (aarch64)
diff --git a/subunit.spec b/subunit.spec
index 68138a8..0245488 100644
--- a/subunit.spec
+++ b/subunit.spec
@@ -4,6 +4,11 @@
%bcond_with python3
%endif
+#FIXME(hguemar): python3 test failure on aarch64
+%ifarch aarch64
+%global disable_tests 1
+%endif
+
Name: subunit
Version: 1.3.0
Release: 4%{?dist}
@@ -346,7 +351,7 @@ make check
# Make sure subunit.iso8601 is importable from buildroot
PYTHONPATH=%{buildroot}%{python2_sitelib} %{__python2} -c "import subunit.iso8601"
-%if %{with python3}
+%if %{with python3} && 0%{?!disable_tests}
# Run the tests for python3
pushd python3
export PYTHON=%{__python3}
5 years, 4 months
Architecture specific change in rpms/nss.git
by githook-noreply＠fedoraproject.org
The package rpms/nss.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/nss.git/commit/?id=cab16c04905b87....
Change:
+%ifnarch noarch
Thanks.
Full change:
============
commit cab16c04905b8743f56e443909222d90adf4549b
Author: Daiki Ueno <dueno(a)redhat.com>
Date: Mon Dec 10 15:36:58 2018 +0100
Revert "Switch to gyp buildsystem"
It turned out that libpkix cannot be enabled in gyp build.
This reverts commit 390eaefc52f9dbe7b4a7fc2615564f36eade14c2.
diff --git a/iquote.patch b/iquote.patch
new file mode 100644
index 0000000..6e4adcd
--- /dev/null
+++ b/iquote.patch
@@ -0,0 +1,13 @@
+diff -up nss/coreconf/location.mk.iquote nss/coreconf/location.mk
+--- nss/coreconf/location.mk.iquote 2017-07-27 16:09:32.000000000 +0200
++++ nss/coreconf/location.mk 2017-09-06 13:23:14.633611555 +0200
+@@ -75,4 +75,9 @@ ifndef SQLITE_LIB_NAME
+ SQLITE_LIB_NAME = sqlite3
+ endif
+
++# Prefer in-tree headers over system headers
++ifdef IN_TREE_FREEBL_HEADERS_FIRST
++ INCLUDES += -iquote $(DIST)/../public/nss -iquote $(DIST)/../private/nss
++endif
++
+ MK_LOCATION = included
diff --git a/nss.spec b/nss.spec
index 32be1b6..0478c84 100644
--- a/nss.spec
+++ b/nss.spec
@@ -64,9 +64,6 @@ BuildRequires: gawk
BuildRequires: psmisc
BuildRequires: perl-interpreter
BuildRequires: gcc-c++
-BuildRequires: gyp
-BuildRequires: ninja-build
-BuildRequires: /usr/bin/python
Source0: https://ftp.mozilla.org/pub/security/nss/releases/%{nss_release_tag}/src/...
Source1: nss-util.pc.in
@@ -97,6 +94,18 @@ Source28: nss-p11-kit.config
# Upstream: https://bugzilla.mozilla.org/show_bug.cgi?id=617723
Patch2: nss-539183.patch
+# This patch uses the GCC -iquote option documented at
+# http://gcc.gnu.org/onlinedocs/gcc/Directory-Options.html#Directory-Options
+# to give the in-tree headers a higher priority over the system headers,
+# when they are included through the quote form (#include "file.h").
+#
+# This ensures a build even when system headers are older. Such is the
+# case when starting an update with API changes or even private export
+# changes.
+#
+# Once the buildroot aha been bootstrapped the patch may be removed
+# but it doesn't hurt to keep it.
+Patch4: iquote.patch
%description
Network Security Services (NSS) is a set of libraries designed to
@@ -233,32 +242,60 @@ popd
%build
+export FREEBL_NO_DEPEND=1
+
+# Must export FREEBL_LOWHASH=1 for nsslowhash.h so that it gets
+# copied to dist and the rpm install phase can find it
+# This due of the upstream changes to fix
+# https://bugzilla.mozilla.org/show_bug.cgi?id=717906
+export FREEBL_LOWHASH=1
+
# uncomment if the iquote patch is activated
export IN_TREE_FREEBL_HEADERS_FIRST=1
export NSS_FORCE_FIPS=1
+# Enable compiler optimizations and disable debugging code
+export BUILD_OPT=1
+
# Uncomment to disable optimizations
#RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed -e 's/-O2/-O0/g'`
#export RPM_OPT_FLAGS
# Generate symbolic info for debuggers
-export CFLAGS=$RPM_OPT_FLAGS
+export XCFLAGS=$RPM_OPT_FLAGS
+
export LDFLAGS=$RPM_LD_FLAGS
+export DSO_LDOPTS=$RPM_LD_FLAGS
+
export PKG_CONFIG_ALLOW_SYSTEM_LIBS=1
export PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1
-export NSPR_INCLUDE_DIR=`/usr/bin/pkg-config --cflags-only-I nspr | sed -e 's/-I//' -e 's/ *$//'`
+export NSPR_INCLUDE_DIR=`/usr/bin/pkg-config --cflags-only-I nspr | sed 's/-I//'`
export NSPR_LIB_DIR=%{_libdir}
+export NSS_USE_SYSTEM_SQLITE=1
+
+export NSS_ALLOW_SSLKEYLOGFILE=1
+
+%ifnarch noarch
+%if 0%{__isa_bits} == 64
+export USE_64=1
+%endif
+%endif
+
+##### phase 2: build the rest of nss
+make -C ./nss/coreconf
+make -C ./nss/lib/dbm
+
# Set the policy file location
# if set NSS will always check for the policy file and load if it exists
export POLICY_FILE="nss.config"
# location of the policy file
export POLICY_PATH="/etc/crypto-policies/back-ends"
-nss/build.sh --gcc --opt --with-nspr="$NSPR_INCLUDE_DIR" --system-sqlite --enable-fips
+make -C ./nss
# build the man pages clean
pushd ./nss
@@ -371,6 +408,20 @@ done
%check
%if %{with tests}
+# Begin -- copied from the build section
+
+export FREEBL_NO_DEPEND=1
+
+export BUILD_OPT=1
+
+%ifnarch noarch
+%if 0%{__isa_bits} == 64
+export USE_64=1
+%endif
+%endif
+
+# End -- copied from the build section
+
# This is necessary because the test suite tests algorithms that are
# disabled by the system policy.
export NSS_IGNORE_SYSTEM_POLICY=1
@@ -491,7 +542,7 @@ mkdir -p $RPM_BUILD_ROOT%{_mandir}/man5
# Copy the binary libraries we want
for file in libnssutil3.so libsoftokn3.so libnssdbm3.so libfreebl3.so libfreeblpriv3.so libnss3.so libnsssysinit.so libsmime3.so libssl3.so
do
- install -p -m 755 dist/Release/lib/$file $RPM_BUILD_ROOT/%{_libdir}
+ install -p -m 755 dist/*.OBJ/lib/$file $RPM_BUILD_ROOT/%{_libdir}
done
# Install the empty NSS db files
@@ -508,19 +559,19 @@ install -p -m 644 %{SOURCE15} $RPM_BUILD_ROOT/%{_sysconfdir}/pki/nssdb/pkcs11.tx
# Copy the development libraries we want
for file in libcrmf.a libnssb.a libnssckfw.a
do
- install -p -m 644 nss/out/Release/$file $RPM_BUILD_ROOT/%{_libdir}
+ install -p -m 644 dist/*.OBJ/lib/$file $RPM_BUILD_ROOT/%{_libdir}
done
# Copy the binaries we want
for file in certutil cmsutil crlutil modutil nss-policy-check pk12util signver ssltap
do
- install -p -m 755 dist/Release/bin/$file $RPM_BUILD_ROOT/%{_bindir}
+ install -p -m 755 dist/*.OBJ/bin/$file $RPM_BUILD_ROOT/%{_bindir}
done
# Copy the binaries we ship as unsupported
for file in bltest ecperf fbectest fipstest shlibsign atob btoa derdump listsuites ocspclnt pp selfserv signtool strsclnt symkeyutil tstclnt vfyserv vfychain
do
- install -p -m 755 dist/Release/bin/$file $RPM_BUILD_ROOT/%{unsupported_tools_directory}
+ install -p -m 755 dist/*.OBJ/bin/$file $RPM_BUILD_ROOT/%{unsupported_tools_directory}
done
# Copy the include files we want
@@ -538,7 +589,7 @@ done
# Copy the static freebl library
for file in libfreebl.a
do
-install -p -m 644 nss/out/Release/$file $RPM_BUILD_ROOT/%{_libdir}
+install -p -m 644 dist/*.OBJ/lib/$file $RPM_BUILD_ROOT/%{_libdir}
done
# Copy the template files we want
@@ -853,7 +904,6 @@ update-crypto-policies
- Update to NSS 3.41
* Thu Dec 6 2018 Daiki Ueno <dueno(a)redhat.com> - 3.40.1-3
-- Switch to gyp buildsystem
- Remove unnecessary patches
* Thu Dec 6 2018 Daiki Ueno <dueno(a)redhat.com> - 3.40.1-2
5 years, 4 months
Architecture specific change in rpms/eclipse-ptp.git
by githook-noreply＠fedoraproject.org
The package rpms/eclipse-ptp.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/eclipse-ptp.git/commit/?id=b95ccf....
Change:
-%ifarch ppc64 ppc64p7
Thanks.
Full change:
============
commit b95ccf3089d4e5a37683c2a9e861462a7fa32d16
Author: Mat Booth <mat.booth(a)redhat.com>
Date: Mon Dec 10 10:38:00 2018 +0000
Update to 2018-12 release
diff --git a/.gitignore b/.gitignore
index 297e3e7..fc87879 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,4 @@
/org.eclipse.ptp-9b58f4f94fb270ce003a9ba35f78feebdf7b9d57.tar.xz
/org.eclipse.ptp-dd13c35f4d93aa5c4aa964c5872a84a2a81aee3b.tar.xz
/org.eclipse.ptp-40bcb0ece8e4c271effedb728392f39b0dfeff5f.tar.xz
+/org.eclipse.ptp-e0083dcb17aa3d30c9227e7552702960aadad44a.tar.xz
diff --git a/eclipse-ptp.spec b/eclipse-ptp.spec
index 1813f57..8e2b2ef 100644
--- a/eclipse-ptp.spec
+++ b/eclipse-ptp.spec
@@ -1,4 +1,4 @@
-%global ptp_git_tag 40bcb0ece8e4c271effedb728392f39b0dfeff5f
+%global ptp_git_tag e0083dcb17aa3d30c9227e7552702960aadad44a
%ifarch %{ix86}
%global eclipse_arch x86
@@ -6,17 +6,14 @@
%ifarch %{arm}
%global eclipse_arch arm
%endif
-%ifarch ppc64 ppc64p7
- %global eclipse_arch ppc64
-%endif
%ifarch s390x x86_64 aarch64 ppc64le
%global eclipse_arch %{_arch}
%endif
Summary: Eclipse Parallel Tools Platform
Name: eclipse-ptp
-Version: 9.2.0
-Release: 3%{?dist}
+Version: 9.2.1
+Release: 1%{?dist}
License: EPL-1.0
URL: http://www.eclipse.org/ptp
@@ -175,10 +172,6 @@ guarantees to discover and explore all non-deterministic matches at run-time.
%package sci
Summary: PTP Scalable Communication Infrastructure (SCI)
BuildArch: noarch
-# This package has no automatic requires because it genuinely doesn't
-# require anything, so need to add a dep on the filesystem for correct
-# directory ownership
-Requires: eclipse-filesystem
%description sci
Parallel Tools Platform components that implements the Scalable Communication
@@ -363,6 +356,9 @@ ln -s %{_prefix}/lib/eclipse/droplets/ptp-sdm/plugins/$plugin/os/linux/%{eclipse
%changelog
+* Mon Dec 10 2018 Mat Booth <mat.booth(a)redhat.com> - 9.2.1-1
+- Update to 2018-12 release
+
* Wed Sep 12 2018 Mat Booth <mat.booth(a)redhat.com> - 9.2.0-3
- Amend license tag
diff --git a/sources b/sources
index 0e1a197..5dcda3d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (org.eclipse.ptp-40bcb0ece8e4c271effedb728392f39b0dfeff5f.tar.xz) = aaa84b56ada1b6de5a9d10418c057e01ae8c93e917b49ae229283d23f156116bf098af7e32516f036deea2192ddcb78c0e51bfe675cb1da1f5c01ab2b1544b53
+SHA512 (org.eclipse.ptp-e0083dcb17aa3d30c9227e7552702960aadad44a.tar.xz) = 34249dc34928b10ade5d48b5b6177e07ced92defcf00ba21498272e3f56d11b4bddc26848b483b8ec5dcf48b204ad1d576a38d7c24931e3cb8fbb7e4f24bbab8
5 years, 4 months
Architecture specific change in rpms/eclipse-ptp.git
by githook-noreply＠fedoraproject.org
The package rpms/eclipse-ptp.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/eclipse-ptp.git/commit/?id=b95ccf....
Change:
-%ifarch ppc64 ppc64p7
Thanks.
Full change:
============
commit b95ccf3089d4e5a37683c2a9e861462a7fa32d16
Author: Mat Booth <mat.booth(a)redhat.com>
Date: Mon Dec 10 10:38:00 2018 +0000
Update to 2018-12 release
diff --git a/.gitignore b/.gitignore
index 297e3e7..fc87879 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,4 @@
/org.eclipse.ptp-9b58f4f94fb270ce003a9ba35f78feebdf7b9d57.tar.xz
/org.eclipse.ptp-dd13c35f4d93aa5c4aa964c5872a84a2a81aee3b.tar.xz
/org.eclipse.ptp-40bcb0ece8e4c271effedb728392f39b0dfeff5f.tar.xz
+/org.eclipse.ptp-e0083dcb17aa3d30c9227e7552702960aadad44a.tar.xz
diff --git a/eclipse-ptp.spec b/eclipse-ptp.spec
index 1813f57..8e2b2ef 100644
--- a/eclipse-ptp.spec
+++ b/eclipse-ptp.spec
@@ -1,4 +1,4 @@
-%global ptp_git_tag 40bcb0ece8e4c271effedb728392f39b0dfeff5f
+%global ptp_git_tag e0083dcb17aa3d30c9227e7552702960aadad44a
%ifarch %{ix86}
%global eclipse_arch x86
@@ -6,17 +6,14 @@
%ifarch %{arm}
%global eclipse_arch arm
%endif
-%ifarch ppc64 ppc64p7
- %global eclipse_arch ppc64
-%endif
%ifarch s390x x86_64 aarch64 ppc64le
%global eclipse_arch %{_arch}
%endif
Summary: Eclipse Parallel Tools Platform
Name: eclipse-ptp
-Version: 9.2.0
-Release: 3%{?dist}
+Version: 9.2.1
+Release: 1%{?dist}
License: EPL-1.0
URL: http://www.eclipse.org/ptp
@@ -175,10 +172,6 @@ guarantees to discover and explore all non-deterministic matches at run-time.
%package sci
Summary: PTP Scalable Communication Infrastructure (SCI)
BuildArch: noarch
-# This package has no automatic requires because it genuinely doesn't
-# require anything, so need to add a dep on the filesystem for correct
-# directory ownership
-Requires: eclipse-filesystem
%description sci
Parallel Tools Platform components that implements the Scalable Communication
@@ -363,6 +356,9 @@ ln -s %{_prefix}/lib/eclipse/droplets/ptp-sdm/plugins/$plugin/os/linux/%{eclipse
%changelog
+* Mon Dec 10 2018 Mat Booth <mat.booth(a)redhat.com> - 9.2.1-1
+- Update to 2018-12 release
+
* Wed Sep 12 2018 Mat Booth <mat.booth(a)redhat.com> - 9.2.0-3
- Amend license tag
diff --git a/sources b/sources
index 0e1a197..5dcda3d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (org.eclipse.ptp-40bcb0ece8e4c271effedb728392f39b0dfeff5f.tar.xz) = aaa84b56ada1b6de5a9d10418c057e01ae8c93e917b49ae229283d23f156116bf098af7e32516f036deea2192ddcb78c0e51bfe675cb1da1f5c01ab2b1544b53
+SHA512 (org.eclipse.ptp-e0083dcb17aa3d30c9227e7552702960aadad44a.tar.xz) = 34249dc34928b10ade5d48b5b6177e07ced92defcf00ba21498272e3f56d11b4bddc26848b483b8ec5dcf48b204ad1d576a38d7c24931e3cb8fbb7e4f24bbab8
5 years, 4 months
Architecture specific change in rpms/firefox.git
by githook-noreply＠fedoraproject.org
The package rpms/firefox.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/firefox.git/commit/?id=4ed6b0c90a....
Change:
+%ifarch x86_64 ppc ppc64 ppc64le aarch64
Thanks.
Full change:
============
commit 4ed6b0c90a08686b99dd7fda0c04cc50e66d1ec4
Author: Martin Stransky <stransky(a)redhat.com>
Date: Mon Dec 10 10:38:32 2018 +0100
Enabled only 2 parallel build tasks on i686/arm, use gold linker with gcc
diff --git a/firefox.spec b/firefox.spec
index 85aa5e0..cf6542c 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -576,15 +576,21 @@ echo "ac_add_options --enable-linker=lld" >> .mozconfig
%else
export CC=gcc
export CXX=g++
+echo "ac_add_options --enable-linker=gold" >> .mozconfig
%endif
-%if %{?build_with_pgo}
+%if 0%{?build_with_pgo}
echo "ac_add_options MOZ_PGO=1" >> .mozconfig
%endif
MOZ_SMP_FLAGS=-j1
-# On x86 architectures, Mozilla can build up to 4 jobs at once in parallel,
+# On x86_64 architectures, Mozilla can build up to 4 jobs at once in parallel,
# however builds tend to fail on other arches when building in parallel.
-%ifarch %{ix86} x86_64 ppc ppc64 ppc64le aarch64
+%ifarch %{ix86} %{arm}
+[ -z "$RPM_BUILD_NCPUS" ] && \
+ RPM_BUILD_NCPUS="`/usr/bin/getconf _NPROCESSORS_ONLN`"
+[ "$RPM_BUILD_NCPUS" -ge 2 ] && MOZ_SMP_FLAGS=-j2
+%endif
+%ifarch x86_64 ppc ppc64 ppc64le aarch64
[ -z "$RPM_BUILD_NCPUS" ] && \
RPM_BUILD_NCPUS="`/usr/bin/getconf _NPROCESSORS_ONLN`"
[ "$RPM_BUILD_NCPUS" -ge 2 ] && MOZ_SMP_FLAGS=-j2
@@ -592,7 +598,6 @@ MOZ_SMP_FLAGS=-j1
[ "$RPM_BUILD_NCPUS" -ge 8 ] && MOZ_SMP_FLAGS=-j8
%endif
-#make -f client.mk build STRIP="/bin/true" MOZ_MAKE_FLAGS="$MOZ_SMP_FLAGS" MOZ_SERVICES_SYNC="1"
export MOZ_MAKE_FLAGS="$MOZ_SMP_FLAGS"
export MOZ_SERVICES_SYNC="1"
export STRIP=/bin/true
5 years, 4 months
Architecture specific change in rpms/firefox.git
by githook-noreply＠fedoraproject.org
The package rpms/firefox.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/firefox.git/commit/?id=4ed6b0c90a....
Change:
+%ifarch x86_64 ppc ppc64 ppc64le aarch64
Thanks.
Full change:
============
commit 4ed6b0c90a08686b99dd7fda0c04cc50e66d1ec4
Author: Martin Stransky <stransky(a)redhat.com>
Date: Mon Dec 10 10:38:32 2018 +0100
Enabled only 2 parallel build tasks on i686/arm, use gold linker with gcc
diff --git a/firefox.spec b/firefox.spec
index 85aa5e0..cf6542c 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -576,15 +576,21 @@ echo "ac_add_options --enable-linker=lld" >> .mozconfig
%else
export CC=gcc
export CXX=g++
+echo "ac_add_options --enable-linker=gold" >> .mozconfig
%endif
-%if %{?build_with_pgo}
+%if 0%{?build_with_pgo}
echo "ac_add_options MOZ_PGO=1" >> .mozconfig
%endif
MOZ_SMP_FLAGS=-j1
-# On x86 architectures, Mozilla can build up to 4 jobs at once in parallel,
+# On x86_64 architectures, Mozilla can build up to 4 jobs at once in parallel,
# however builds tend to fail on other arches when building in parallel.
-%ifarch %{ix86} x86_64 ppc ppc64 ppc64le aarch64
+%ifarch %{ix86} %{arm}
+[ -z "$RPM_BUILD_NCPUS" ] && \
+ RPM_BUILD_NCPUS="`/usr/bin/getconf _NPROCESSORS_ONLN`"
+[ "$RPM_BUILD_NCPUS" -ge 2 ] && MOZ_SMP_FLAGS=-j2
+%endif
+%ifarch x86_64 ppc ppc64 ppc64le aarch64
[ -z "$RPM_BUILD_NCPUS" ] && \
RPM_BUILD_NCPUS="`/usr/bin/getconf _NPROCESSORS_ONLN`"
[ "$RPM_BUILD_NCPUS" -ge 2 ] && MOZ_SMP_FLAGS=-j2
@@ -592,7 +598,6 @@ MOZ_SMP_FLAGS=-j1
[ "$RPM_BUILD_NCPUS" -ge 8 ] && MOZ_SMP_FLAGS=-j8
%endif
-#make -f client.mk build STRIP="/bin/true" MOZ_MAKE_FLAGS="$MOZ_SMP_FLAGS" MOZ_SERVICES_SYNC="1"
export MOZ_MAKE_FLAGS="$MOZ_SMP_FLAGS"
export MOZ_SERVICES_SYNC="1"
export STRIP=/bin/true
5 years, 4 months
Architecture specific change in rpms/firefox.git
by githook-noreply＠fedoraproject.org
The package rpms/firefox.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/firefox.git/commit/?id=4ed6b0c90a....
Change:
+%ifarch x86_64 ppc ppc64 ppc64le aarch64
Thanks.
Full change:
============
commit 4ed6b0c90a08686b99dd7fda0c04cc50e66d1ec4
Author: Martin Stransky <stransky(a)redhat.com>
Date: Mon Dec 10 10:38:32 2018 +0100
Enabled only 2 parallel build tasks on i686/arm, use gold linker with gcc
diff --git a/firefox.spec b/firefox.spec
index 85aa5e0..cf6542c 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -576,15 +576,21 @@ echo "ac_add_options --enable-linker=lld" >> .mozconfig
%else
export CC=gcc
export CXX=g++
+echo "ac_add_options --enable-linker=gold" >> .mozconfig
%endif
-%if %{?build_with_pgo}
+%if 0%{?build_with_pgo}
echo "ac_add_options MOZ_PGO=1" >> .mozconfig
%endif
MOZ_SMP_FLAGS=-j1
-# On x86 architectures, Mozilla can build up to 4 jobs at once in parallel,
+# On x86_64 architectures, Mozilla can build up to 4 jobs at once in parallel,
# however builds tend to fail on other arches when building in parallel.
-%ifarch %{ix86} x86_64 ppc ppc64 ppc64le aarch64
+%ifarch %{ix86} %{arm}
+[ -z "$RPM_BUILD_NCPUS" ] && \
+ RPM_BUILD_NCPUS="`/usr/bin/getconf _NPROCESSORS_ONLN`"
+[ "$RPM_BUILD_NCPUS" -ge 2 ] && MOZ_SMP_FLAGS=-j2
+%endif
+%ifarch x86_64 ppc ppc64 ppc64le aarch64
[ -z "$RPM_BUILD_NCPUS" ] && \
RPM_BUILD_NCPUS="`/usr/bin/getconf _NPROCESSORS_ONLN`"
[ "$RPM_BUILD_NCPUS" -ge 2 ] && MOZ_SMP_FLAGS=-j2
@@ -592,7 +598,6 @@ MOZ_SMP_FLAGS=-j1
[ "$RPM_BUILD_NCPUS" -ge 8 ] && MOZ_SMP_FLAGS=-j8
%endif
-#make -f client.mk build STRIP="/bin/true" MOZ_MAKE_FLAGS="$MOZ_SMP_FLAGS" MOZ_SERVICES_SYNC="1"
export MOZ_MAKE_FLAGS="$MOZ_SMP_FLAGS"
export MOZ_SERVICES_SYNC="1"
export STRIP=/bin/true
5 years, 4 months