Architecture specific change in rpms/qt6-qt3d.git - Arch-excludes - Fedora mailing-lists

4 Oct 2021

The package rpms/qt6-qt3d.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/qt6-qt3d.git/commit/?id=9fe8be7bfbb6....
Change:
+ExcludeArch: s390x
Thanks.
Full change:
============
commit 7fba8fd5377d58f51393c93425c1cc7ef9fb8f6c
Author: Jan Grulich jgrulich@redhat.com
Date:   Thu Sep 30 13:38:45 2021 +0200
6.2.0

diff --git a/.gitignore b/.gitignore
index ab15962..9144120 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@
 /qt3d-everywhere-src-6.2.0-beta4.tar.xz
 /qt3d-everywhere-src-6.2.0-rc.tar.xz
 /qt3d-everywhere-src-6.2.0-rc2.tar.xz
+/qt3d-everywhere-src-6.2.0.tar.xz
diff --git a/qt6-qt3d.spec b/qt6-qt3d.spec
index e347b50..681efd6 100644
--- a/qt6-qt3d.spec
+++ b/qt6-qt3d.spec
@@ -4,8 +4,8 @@ ExcludeArch: s390x
%global qt_module qt3d
-%global unstable 1
-%if 0%{unstable}
+#global unstable 1
+%if 0%{?unstable}
 %global prerelease rc2
 %endif
@@ -21,7 +21,7 @@ Url:     http://www.qt.io
 %global majmin %(echo %{version} | cut -d. -f1-2)
 %global  qt_version %(echo %{version} | cut -d~ -f1)
-%if 0%{unstable}
+%if 0%{?unstable}
 Source0: https://download.qt.io/development_releases/qt/%%7Bmajmin%7D/%%7Bqt_version%...
 %else
 Source0: https://download.qt.io/official_releases/qt/%%7Bmajmin%7D/%%7Bversion%7D/sub...
@@ -202,6 +202,9 @@ popd
%changelog
+* Thu Sep 30 2021 Jan Grulich jgrulich@redhat.com - 6.2.0-1
+- 6.2.0
+
 * Mon Sep 27 2021 Jan Grulich jgrulich@redhat.com - 6.2.0~rc2-1
 - 6.2.0 - rc2
diff --git a/sources b/sources
index b9a67b4..ee6f3bb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (qt3d-everywhere-src-6.2.0-rc2.tar.xz) = 951413cf6daf08a3cd701df73451b0ae5bd71d2b2fc34a51c76c83b31dec11567057fdba375605502c260cc3fdd71620d1ba065dc31943c331ac9cc390225c67
+SHA512 (qt3d-everywhere-src-6.2.0.tar.xz) = 589d31d23b098717621c4c22e4024eb7f544ce2c2bdbbbc7cd7f695f5bbc589f4da5be34aa129dc8616a41279e4620d65d98382006be248242e78e25a74a6b5a
commit 6604673f6b974a23152432c794d9b483536f3c99
Author: Jan Grulich jgrulich@redhat.com
Date:   Mon Sep 27 14:14:34 2021 +0200
6.2.0 - rc2
diff --git a/.gitignore b/.gitignore
index 6d2650c..ab15962 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
 /qt3d-everywhere-src-6.1.2.tar.xz
 /qt3d-everywhere-src-6.2.0-beta4.tar.xz
 /qt3d-everywhere-src-6.2.0-rc.tar.xz
+/qt3d-everywhere-src-6.2.0-rc2.tar.xz
diff --git a/qt6-qt3d.spec b/qt6-qt3d.spec
index b424cf0..e347b50 100644
--- a/qt6-qt3d.spec
+++ b/qt6-qt3d.spec
@@ -6,7 +6,7 @@ ExcludeArch: s390x
%global unstable 1
 %if 0%{unstable}
-%global prerelease rc
+%global prerelease rc2
 %endif
Summary: Qt6 - Qt3D QML bindings and C++ APIs
@@ -202,6 +202,9 @@ popd
%changelog
+* Mon Sep 27 2021 Jan Grulich jgrulich@redhat.com - 6.2.0~rc2-1
+- 6.2.0 - rc2
+
 * Sat Sep 18 2021 Jan Grulich jgrulich@redhat.com - 6.2.0~rc-1
 - 6.2.0 - rc
diff --git a/sources b/sources
index 28c8f14..b9a67b4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (qt3d-everywhere-src-6.2.0-rc.tar.xz) = 71de8503255c9dc9749ec87478def0bf1d5c1b9f53907edda5626dc38516f4f1a0b01ab4af73e72046c89dc6d4abc2b7aeb1ec55f9d616b76b6d0a6486c0e840
+SHA512 (qt3d-everywhere-src-6.2.0-rc2.tar.xz) = 951413cf6daf08a3cd701df73451b0ae5bd71d2b2fc34a51c76c83b31dec11567057fdba375605502c260cc3fdd71620d1ba065dc31943c331ac9cc390225c67
commit 7d7969512c94f6e7b5bed46c04529f511408702e
Author: Jan Grulich jgrulich@redhat.com
Date:   Sun Sep 19 13:26:28 2021 +0200
6.2.0 - rc
diff --git a/.gitignore b/.gitignore
index e62f40d..6d2650c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
 /qt3d-everywhere-src-6.1.1.tar.xz
 /qt3d-everywhere-src-6.1.2.tar.xz
 /qt3d-everywhere-src-6.2.0-beta4.tar.xz
+/qt3d-everywhere-src-6.2.0-rc.tar.xz
diff --git a/qt6-qt3d.spec b/qt6-qt3d.spec
index b3304a2..b424cf0 100644
--- a/qt6-qt3d.spec
+++ b/qt6-qt3d.spec
@@ -6,7 +6,7 @@ ExcludeArch: s390x
%global unstable 1
 %if 0%{unstable}
-%global prerelease beta4
+%global prerelease rc
 %endif
Summary: Qt6 - Qt3D QML bindings and C++ APIs
@@ -202,6 +202,9 @@ popd
%changelog
+* Sat Sep 18 2021 Jan Grulich jgrulich@redhat.com - 6.2.0~rc-1
+- 6.2.0 - rc
+
 * Mon Sep 13 2021 Jan Grulich jgrulich@redhat.com - 6.2.0~beta4-1
 - 6.2.0 - beta4
diff --git a/sources b/sources
index 49c4feb..28c8f14 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (qt3d-everywhere-src-6.2.0-beta4.tar.xz) = 060e82ab72a45e7eae96094c454e7426f0bda443028d76ec50897151080cd834ec23bf9936160e2f706978b46d15644be2de4ad160905a05c3838836045c9b49
+SHA512 (qt3d-everywhere-src-6.2.0-rc.tar.xz) = 71de8503255c9dc9749ec87478def0bf1d5c1b9f53907edda5626dc38516f4f1a0b01ab4af73e72046c89dc6d4abc2b7aeb1ec55f9d616b76b6d0a6486c0e840
commit 9fe8be7bfbb643c9927ce3c47499d9364af1888a
Author: Jan Grulich jgrulich@redhat.com
Date:   Tue Sep 14 08:21:09 2021 +0200
6.2.0 - beta4
diff --git a/.gitignore b/.gitignore
index 42e55ba..e62f40d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 /qt3d-everywhere-src-6.1.0.tar.xz
 /qt3d-everywhere-src-6.1.1.tar.xz
 /qt3d-everywhere-src-6.1.2.tar.xz
+/qt3d-everywhere-src-6.2.0-beta4.tar.xz
diff --git a/qt3d-assimp-fix-build.patch b/qt3d-assimp-fix-build.patch
index 3a712ae..87d4c30 100644
--- a/qt3d-assimp-fix-build.patch
+++ b/qt3d-assimp-fix-build.patch
@@ -1,8 +1,8 @@
 diff --git a/src/3rdparty/assimp/src/code/Common/Importer.h b/src/3rdparty/assimp/src/code/Common/Importer.h
-index eb70bc3..c9165be 100644
+index e7da7f4..c41dd53 100644
 --- a/src/3rdparty/assimp/src/code/Common/Importer.h
 +++ b/src/3rdparty/assimp/src/code/Common/Importer.h
-@@ -49,6 +49,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+@@ -50,6 +50,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  #include <string>
  #include <assimp/matrix4x4.h>
@@ -13,12 +13,12 @@ index eb70bc3..c9165be 100644
namespace Assimp    {
 diff --git a/src/3rdparty/assimp/src/include/assimp/Importer.hpp b/src/3rdparty/assimp/src/include/assimp/Importer.hpp
-index 9078fbf..ab76f93 100644
+index 09b5b68..327c71f 100644
 --- a/src/3rdparty/assimp/src/include/assimp/Importer.hpp
 +++ b/src/3rdparty/assimp/src/include/assimp/Importer.hpp
-@@ -59,6 +59,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- // Public ASSIMP data structures
- #include <assimp/types.h>
+@@ -61,6 +61,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ 
+ #include <exception>
+#include <exception>
 +#include <stdexcept>
diff --git a/qt6-qt3d.spec b/qt6-qt3d.spec
index 17d6b33..b3304a2 100644
--- a/qt6-qt3d.spec
+++ b/qt6-qt3d.spec
@@ -1,8 +1,17 @@
+# FIXME: qt6-qtdeclarative doesn't build on S390x
+# BUG: https://bugreports.qt.io/browse/QTBUG-93101
+ExcludeArch: s390x
+
 %global qt_module qt3d
+%global unstable 1
+%if 0%{unstable}
+%global prerelease beta4
+%endif
+
 Summary: Qt6 - Qt3D QML bindings and C++ APIs
 Name:    qt6-%{qt_module}
-Version: 6.1.2
+Version: 6.2.0%{?unstable:~%{prerelease}}
 Release: 1%{?dist}
# See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details
@@ -10,7 +19,13 @@ Release: 1%{?dist}
 License: LGPLv2 with exceptions or GPLv3 with exceptions
 Url:     http://www.qt.io
 %global majmin %(echo %{version} | cut -d. -f1-2)
-Source0: https://download.qt.io/official_releases/additional_libraries/%%7Bqt_module%...
+%global  qt_version %(echo %{version} | cut -d~ -f1)
+
+%if 0%{unstable}
+Source0: https://download.qt.io/development_releases/qt/%%7Bmajmin%7D/%%7Bqt_version%...
+%else
+Source0: https://download.qt.io/official_releases/qt/%%7Bmajmin%7D/%%7Bversion%7D/sub...
+%endif
 Source1: qt3dcore-config-multilib_p.h
Patch0:  qt3d-assimp-fix-build.patch
@@ -49,7 +64,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
%prep
-%autosetup -n %{qt_module}-everywhere-src-%{version} -p1
+%autosetup -n %{qt_module}-everywhere-src-%{qt_version}%{?unstable:-%{prerelease}} -p1
%build
@@ -187,6 +202,9 @@ popd
%changelog
+* Mon Sep 13 2021 Jan Grulich jgrulich@redhat.com - 6.2.0~beta4-1
+- 6.2.0 - beta4
+
 * Thu Aug 12 2021 Jan Grulich jgrulich@redhat.com - 6.1.2-1
 - 6.1.2
diff --git a/sources b/sources
index ebe210f..49c4feb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (qt3d-everywhere-src-6.1.2.tar.xz) = ac20920390509bcaca823062ed07b9d76e26f5140f7f9349acf40604f97d20f5f3338b8da40c756543293020e6e76e0fc2ffe0aecae51a6e7f344619d98a9125
+SHA512 (qt3d-everywhere-src-6.2.0-beta4.tar.xz) = 060e82ab72a45e7eae96094c454e7426f0bda443028d76ec50897151080cd834ec23bf9936160e2f706978b46d15644be2de4ad160905a05c3838836045c9b49

    