The package rpms/qt6-qtserialbus.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-qtserialbus.git/commit/?id=3b....
Change:
+ExcludeArch: s390x
Thanks.
Full change:
============
commit 116ab7ae487fb0227656820185986ef4149f96d7
Author: Jan Grulich <jgrulich(a)redhat.com>
Date: Thu Sep 30 13:38:45 2021 +0200
6.2.0
diff --git a/.gitignore b/.gitignore
index 2754e08..85fac92 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/qtserialbus-everywhere-src-6.2.0-rc.tar.xz
/qtserialbus-everywhere-src-6.2.0-rc2.tar.xz
+/qtserialbus-everywhere-src-6.2.0.tar.xz
diff --git a/qt6-qtserialbus.spec b/qt6-qtserialbus.spec
index 5a4c69a..19cf203 100644
--- a/qt6-qtserialbus.spec
+++ b/qt6-qtserialbus.spec
@@ -4,8 +4,8 @@ ExcludeArch: s390x
%global qt_module qtserialbus
-%global unstable 1
-%if 0%{unstable}
+#global unstable 1
+%if 0%{?unstable}
%global prerelease rc2
%endif
@@ -20,7 +20,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/%{majmin}/%{qt_version}/su...
%else
Source0:
https://download.qt.io/official_releases/qt/%{majmin}/%{version}/submodul...
@@ -104,6 +104,9 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
%changelog
+* Thu Sep 30 2021 Jan Grulich <jgrulich(a)redhat.com> - 6.2.0-1
+- 6.2.0
+
* Mon Sep 27 2021 Jan Grulich <jgrulich(a)redhat.com> - 6.2.0~rc2-1
- 6.2.0 - rc2
diff --git a/sources b/sources
index a0b43a2..ea72f65 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (qtserialbus-everywhere-src-6.2.0-rc2.tar.xz) =
579a477da9b8b699de68aea6357de4d49fcfa250928cd391f049411eae4213af90a460b1cb8c26ff10201b585665591b0fa6735ede7da8d368d78f40113b3548
+SHA512 (qtserialbus-everywhere-src-6.2.0.tar.xz) =
56d07e7467cc225fe33aee654adf2dd03baecac4fda76d14c87e3a9df7f0aad16461053a5c0b063ed4ff301460fe78ce54fa5fce6171620f7989059f6e6ce94d
commit 0c99ff126f30b5e2f92e6351b37889587f2ff785
Author: Jan Grulich <jgrulich(a)redhat.com>
Date: Mon Sep 27 14:14:34 2021 +0200
6.2.0 - rc2
diff --git a/.gitignore b/.gitignore
index 6dd57a3..2754e08 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/qtserialbus-everywhere-src-6.2.0-rc.tar.xz
+/qtserialbus-everywhere-src-6.2.0-rc2.tar.xz
diff --git a/qt6-qtserialbus.spec b/qt6-qtserialbus.spec
index f144bfc..5a4c69a 100644
--- a/qt6-qtserialbus.spec
+++ b/qt6-qtserialbus.spec
@@ -6,7 +6,7 @@ ExcludeArch: s390x
%global unstable 1
%if 0%{unstable}
-%global prerelease rc
+%global prerelease rc2
%endif
Summary: Qt6 - SerialBus component
@@ -104,5 +104,8 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
%changelog
+* Mon Sep 27 2021 Jan Grulich <jgrulich(a)redhat.com> - 6.2.0~rc2-1
+- 6.2.0 - rc2
+
* Thu Sep 16 2021 Jan Grulich <jgrulich(a)redhat.com> - 6.2.0~rc-1
- 6.2.0 - rc
diff --git a/sources b/sources
index 01f43e2..a0b43a2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (qtserialbus-everywhere-src-6.2.0-rc.tar.xz) =
d399ce65d9cfc7c7387f6c0daed9d796458d314f99df025edfccf50efada6eec98d5ff2dbfe6800d457abbe9adb82339b6adb9800834efc95f73105bc163ff1a
+SHA512 (qtserialbus-everywhere-src-6.2.0-rc2.tar.xz) =
579a477da9b8b699de68aea6357de4d49fcfa250928cd391f049411eae4213af90a460b1cb8c26ff10201b585665591b0fa6735ede7da8d368d78f40113b3548
commit 1cbbeb65ca2d7d57200a6ad09e680314d70dacce
Author: Jan Grulich <jgrulich(a)redhat.com>
Date: Mon Sep 20 13:16:49 2021 +0200
Add missing patch
diff --git a/qtserialbus-everywhere-src-5.12.3-SIOCGSTAMP.patch
b/qtserialbus-everywhere-src-5.12.3-SIOCGSTAMP.patch
new file mode 100644
index 0000000..b37b8d2
--- /dev/null
+++ b/qtserialbus-everywhere-src-5.12.3-SIOCGSTAMP.patch
@@ -0,0 +1,16 @@
+diff --git a/src/plugins/canbus/socketcan/socketcanbackend.cpp
b/src/plugins/canbus/socketcan/socketcanbackend.cpp
+index 572fef8..68e8b3f 100644
+--- a/src/plugins/canbus/socketcan/socketcanbackend.cpp
++++ b/src/plugins/canbus/socketcan/socketcanbackend.cpp
+@@ -56,6 +56,11 @@
+ #include <sys/ioctl.h>
+ #include <sys/time.h>
+
++// Seems that kernel 5.2.0 renames this define to SIOCGSTAMP_OLD
++#ifndef SIOCGSTAMP
++#define SIOCGSTAMP 0x8906 /* Get stamp (timeval) */
++#endif
++
+ #ifndef CANFD_BRS
+ # define CANFD_BRS 0x01 /* bit rate switch (second bitrate for payload data) */
+ #endif
commit 3b4d2eca2edf35762d3518f7b6bf321a25edd3e6
Author: Jan Grulich <jgrulich(a)redhat.com>
Date: Mon Sep 20 13:04:22 2021 +0200
6.2.0 - rc
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..6dd57a3
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/qtserialbus-everywhere-src-6.2.0-rc.tar.xz
diff --git a/README.md b/README.md
deleted file mode 100644
index ec3e854..0000000
--- a/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# qt6-qtserialbus
-
-The qt6-qtserialbus package
diff --git a/qt6-qtserialbus.spec b/qt6-qtserialbus.spec
new file mode 100644
index 0000000..f144bfc
--- /dev/null
+++ b/qt6-qtserialbus.spec
@@ -0,0 +1,108 @@
+# FIXME: qt6-qtdeclarative doesn't build on S390x
+# BUG:
https://bugreports.qt.io/browse/QTBUG-93101
+ExcludeArch: s390x
+
+%global qt_module qtserialbus
+
+%global unstable 1
+%if 0%{unstable}
+%global prerelease rc
+%endif
+
+Summary: Qt6 - SerialBus component
+Name: qt6-%{qt_module}
+Version: 6.2.0%{?unstable:~%{prerelease}}
+Release: 1%{?dist}
+
+# See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
+License: LGPLv2 with exceptions or GPLv3 with exceptions
+Url:
http://www.qt.io
+%global majmin %(echo %{version} | cut -d. -f1-2)
+%global qt_version %(echo %{version} | cut -d~ -f1)
+
+%if 0%{unstable}
+Source0:
https://download.qt.io/development_releases/qt/%{majmin}/%{qt_version}/su...
+%else
+Source0:
https://download.qt.io/official_releases/qt/%{majmin}/%{version}/submodul...
+%endif
+
+## upstreamable patches
+# workaround FTBFS against kernel-header-5.2.0+
+Patch100: qtserialbus-everywhere-src-5.12.3-SIOCGSTAMP.patch
+
+BuildRequires: cmake
+BuildRequires: gcc-c++
+BuildRequires: ninja-build
+BuildRequires: qt6-rpm-macros
+BuildRequires: qt6-qtbase-devel >= %{version}
+BuildRequires: qt6-qtbase-private-devel
+#libQt6Core.so.6(Qt_5_PRIVATE_API)(64bit)
+%{?_qt6:Requires: %{_qt6}%{?_isa} = %{_qt6_version}}
+BuildRequires: qt6-qtserialport-devel >= %{version}
+
+BuildRequires: pkgconfig(xkbcommon) >= 0.5.0
+BuildRequires: openssl-devel
+
+%description
+Qt Serial Bus (API) provides classes and functions to access the various
+industrial serial buses and protocols, such as CAN, ModBus, and others.
+
+%package devel
+Summary: Development files for %{name}
+Requires: %{name}%{?_isa} = %{version}-%{release}
+Requires: qt6-qtbase-devel%{?_isa}
+%description devel
+%{summary}.
+
+%package examples
+Summary: Programming examples for %{name}
+Requires: %{name}%{?_isa} = %{version}-%{release}
+%description examples
+%{summary}.
+
+
+%prep
+%autosetup -n %{qt_module}-everywhere-src-%{qt_version}%{?unstable:-%{prerelease}} -p1
+
+
+%build
+%cmake_qt6
+
+%cmake_build
+
+
+%install
+%cmake_install
+
+
+%ldconfig_scriptlets
+
+%files
+%license LICENSE.*
+%{_qt6_libdir}/libQt6SerialBus.so.6*
+%{_qt6_bindir}/canbusutil
+%{_qt6_plugindir}/canbus
+
+%files devel
+%{_qt6_headerdir}/QtSerialBus/
+%{_qt6_libdir}/libQt6SerialBus.so
+%{_qt6_libdir}/libQt6SerialBus.prl
+%{_qt6_libdir}/cmake/Qt6BuildInternals/StandaloneTests/QtSerialBusTestsConfig.cmake
+%dir %{_qt6_libdir}/cmake/Qt6SerialBus/
+%{_qt6_libdir}/cmake/Qt6SerialBus/*.cmake
+%dir %{_qt6_libdir}/cmake/Qt6SerialBusTools/
+%{_qt6_libdir}/cmake/Qt6SerialBusTools/*.cmake
+%{_qt6_archdatadir}/mkspecs/modules/*
+%{_qt6_libdir}/metatypes/qt6*_metatypes.json
+%{_qt6_datadir}/modules/*.json
+
+# no examples, yet
+%if 0%{?_qt6_examplesdir:1}
+%files examples
+%{_qt6_examplesdir}/
+%endif
+
+
+%changelog
+* Thu Sep 16 2021 Jan Grulich <jgrulich(a)redhat.com> - 6.2.0~rc-1
+- 6.2.0 - rc
diff --git a/sources b/sources
new file mode 100644
index 0000000..01f43e2
--- /dev/null
+++ b/sources
@@ -0,0 +1 @@
+SHA512 (qtserialbus-everywhere-src-6.2.0-rc.tar.xz) =
d399ce65d9cfc7c7387f6c0daed9d796458d314f99df025edfccf50efada6eec98d5ff2dbfe6800d457abbe9adb82339b6adb9800834efc95f73105bc163ff1a