Architecture specific change in rpms/qt6-qtdatavis3d.git
by githook-noreply@fedoraproject.org
The package rpms/qt6-qtdatavis3d.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-qtdatavis3d.git/commit/?id=66....
Change:
+ExcludeArch: s390x
Thanks.
Full change:
============
commit 61ee93de9fbfa40a0bbb2b7cd6a95c45073ec46f
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 8873951..2046e48 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
/qtdatavis3d-everywhere-src-6.2.0-beta4.tar.xz
/qtdatavis3d-everywhere-src-6.2.0-rc.tar.xz
/qtdatavis3d-everywhere-src-6.2.0-rc2.tar.xz
+/qtdatavis3d-everywhere-src-6.2.0.tar.xz
diff --git a/qt6-qtdatavis3d.spec b/qt6-qtdatavis3d.spec
index 0593d3c..c86160f 100644
--- a/qt6-qtdatavis3d.spec
+++ b/qt6-qtdatavis3d.spec
@@ -4,8 +4,8 @@ ExcludeArch: s390x
%global qt_module qtdatavis3d
-%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...
@@ -91,6 +91,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 de034ec..7e1077a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (qtdatavis3d-everywhere-src-6.2.0-rc2.tar.xz) = 7fae73f4ad3a2c49d1855e9cadb5f2c7420589b4af37f04012c754845fbcaee108a6f678e0f0254b6a5adfe6938bbc889b609ff18c49068f3d8735c2a401db95
+SHA512 (qtdatavis3d-everywhere-src-6.2.0.tar.xz) = a5468c48f36168e09955a8838753349ec39dc077727e20c86dfd16f5ee10b86fb70715db22ccf193f9c5756112d96af21e0f6047f90e0e7edb1fa4108d3df677
commit 3c7cef338d5603df79eb52fcd64dceda8838d380
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 96c3741..8873951 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
/qtdatavis3d-everywhere-src-6.1.2.tar.xz
/qtdatavis3d-everywhere-src-6.2.0-beta4.tar.xz
/qtdatavis3d-everywhere-src-6.2.0-rc.tar.xz
+/qtdatavis3d-everywhere-src-6.2.0-rc2.tar.xz
diff --git a/qt6-qtdatavis3d.spec b/qt6-qtdatavis3d.spec
index 7d85104..0593d3c 100644
--- a/qt6-qtdatavis3d.spec
+++ b/qt6-qtdatavis3d.spec
@@ -6,7 +6,7 @@ ExcludeArch: s390x
%global unstable 1
%if 0%{unstable}
-%global prerelease rc
+%global prerelease rc2
%endif
Summary: Qt6 - Qt Data Visualization component
@@ -91,6 +91,9 @@ 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
+
* Sat Sep 18 2021 Jan Grulich <jgrulich(a)redhat.com> - 6.2.0~rc-1
- 6.2.0 - rc
diff --git a/sources b/sources
index a8af67f..de034ec 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (qtdatavis3d-everywhere-src-6.2.0-rc.tar.xz) = 2b977b3111940889bdcaa0df8afba822f187dd5a43847f42850d71ffd92084abf2a4f84a85cbc18bcb91ce2fdcec071e52fc1ee3a9e4c76a8d2ac94f1b348b2f
+SHA512 (qtdatavis3d-everywhere-src-6.2.0-rc2.tar.xz) = 7fae73f4ad3a2c49d1855e9cadb5f2c7420589b4af37f04012c754845fbcaee108a6f678e0f0254b6a5adfe6938bbc889b609ff18c49068f3d8735c2a401db95
commit 0aa80386f71c1dbf16ed2e38a210760097d71cc4
Author: Jan Grulich <jgrulich(a)redhat.com>
Date: Sun Sep 19 13:27:18 2021 +0200
6.2.0 - rc
diff --git a/.gitignore b/.gitignore
index b3d7e01..96c3741 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
/qtdatavis3d-everywhere-src-6.1.1.tar.xz
/qtdatavis3d-everywhere-src-6.1.2.tar.xz
/qtdatavis3d-everywhere-src-6.2.0-beta4.tar.xz
+/qtdatavis3d-everywhere-src-6.2.0-rc.tar.xz
diff --git a/qt6-qtdatavis3d.spec b/qt6-qtdatavis3d.spec
index 8c7ff4e..7d85104 100644
--- a/qt6-qtdatavis3d.spec
+++ b/qt6-qtdatavis3d.spec
@@ -6,7 +6,7 @@ ExcludeArch: s390x
%global unstable 1
%if 0%{unstable}
-%global prerelease beta4
+%global prerelease rc
%endif
Summary: Qt6 - Qt Data Visualization component
@@ -91,6 +91,9 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
%changelog
+* Sat Sep 18 2021 Jan Grulich <jgrulich(a)redhat.com> - 6.2.0~rc-1
+- 6.2.0 - rc
+
* Mon Sep 13 2021 Jan Grulich <jgrulich(a)redhat.com> - 6.2.0~beta4-1
- 6.2.0 - beta4
diff --git a/sources b/sources
index 6a9bbf4..a8af67f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (qtdatavis3d-everywhere-src-6.2.0-beta4.tar.xz) = fc31829fdc0391212e15fb1f2ad82a77707c7a003663db41bc35600bfe8b82d38454c5b750a6ca063479e237a9d92ddb598ead7be9eb8bc7b52cb9e3e6887624
+SHA512 (qtdatavis3d-everywhere-src-6.2.0-rc.tar.xz) = 2b977b3111940889bdcaa0df8afba822f187dd5a43847f42850d71ffd92084abf2a4f84a85cbc18bcb91ce2fdcec071e52fc1ee3a9e4c76a8d2ac94f1b348b2f
commit 6654e490b2eeefb201d47cdfe598bb14aab72e95
Author: Jan Grulich <jgrulich(a)redhat.com>
Date: Tue Sep 14 08:06:51 2021 +0200
6.2.0 - beta4
diff --git a/.gitignore b/.gitignore
index 74ae310..b3d7e01 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/qtdatavis3d-everywhere-src-6.1.1.tar.xz
/qtdatavis3d-everywhere-src-6.1.2.tar.xz
+/qtdatavis3d-everywhere-src-6.2.0-beta4.tar.xz
diff --git a/qt6-qtdatavis3d.spec b/qt6-qtdatavis3d.spec
index 3a82f12..8c7ff4e 100644
--- a/qt6-qtdatavis3d.spec
+++ b/qt6-qtdatavis3d.spec
@@ -1,20 +1,37 @@
+# FIXME: qt6-qtdeclarative doesn't build on S390x
+# BUG: https://bugreports.qt.io/browse/QTBUG-93101
+ExcludeArch: s390x
+
%global qt_module qtdatavis3d
+%global unstable 1
+%if 0%{unstable}
+%global prerelease beta4
+%endif
+
Summary: Qt6 - Qt Data Visualization component
Name: qt6-%{qt_module}
-Version: 6.1.2
+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
BuildRequires: cmake
BuildRequires: gcc-c++
BuildRequires: ninja-build
BuildRequires: qt6-qtbase-devel >= %{version}
+BuildRequires: qt6-qtbase-private-devel
+%{?_qt6:Requires: %{_qt6}%{?_isa} = %{_qt6_version}}
BuildRequires: qt6-qtdeclarative-devel >= %{version}
BuildRequires: pkgconfig(xkbcommon)
BuildRequires: openssl-devel
@@ -39,7 +56,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
%prep
-%setup -q -n %{qt_module}-everywhere-src-%{version}
+%autosetup -n %{qt_module}-everywhere-src-%{qt_version}%{?unstable:-%{prerelease}} -p1
%build
@@ -64,6 +81,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
%{_qt6_libdir}/cmake/Qt6BuildInternals/StandaloneTests/QtDataVisualizationTestsConfig.cmake
%{_qt6_libdir}/cmake/Qt6Qml/QmlPlugins/Qt6DataVisualizationQml2*.cmake
%{_qt6_datadir}/modules/*.json
+%{_qt6_libdir}/metatypes/qt6*_metatypes.json
%if 0%{?_qt6_examplesdir:1}
# no examples, yet
@@ -73,6 +91,9 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
%changelog
+* Mon Sep 13 2021 Jan Grulich <jgrulich(a)redhat.com> - 6.2.0~beta4-1
+- 6.2.0 - beta4
+
* Thu Aug 12 2021 Jan Grulich <jgrulich(a)redhat.com> - 6.1.2-1
- 6.1.2
diff --git a/sources b/sources
index 23aea09..6a9bbf4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (qtdatavis3d-everywhere-src-6.1.2.tar.xz) = 36a078eb20ea7d3149f93223ea0d7072204abf0d77db238a69c622279cbc00eabcca6a72414b350958e388c719388b7fe94ce2c2ce7a828ccf76c8590d6ad31b
+SHA512 (qtdatavis3d-everywhere-src-6.2.0-beta4.tar.xz) = fc31829fdc0391212e15fb1f2ad82a77707c7a003663db41bc35600bfe8b82d38454c5b750a6ca063479e237a9d92ddb598ead7be9eb8bc7b52cb9e3e6887624
1 year, 8 months
Architecture specific change in rpms/qt6-qtcharts.git
by githook-noreply@fedoraproject.org
The package rpms/qt6-qtcharts.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-qtcharts.git/commit/?id=4c4ac....
Change:
+ExcludeArch: s390x
Thanks.
Full change:
============
commit 7fe152152f3a6c2b22a0fbc2f1ba05c2c502888d
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 8d28607..d172caf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
/qtcharts-everywhere-src-6.2.0-beta4.tar.xz
/qtcharts-everywhere-src-6.2.0-rc.tar.xz
/qtcharts-everywhere-src-6.2.0-rc2.tar.xz
+/qtcharts-everywhere-src-6.2.0.tar.xz
diff --git a/qt6-qtcharts.spec b/qt6-qtcharts.spec
index 71fb296..522f201 100644
--- a/qt6-qtcharts.spec
+++ b/qt6-qtcharts.spec
@@ -4,8 +4,8 @@ ExcludeArch: s390x
%global qt_module qtcharts
-%global unstable 1
-%if 0%{unstable}
+#global unstable 1
+%if 0%{?unstable}
%global prerelease rc2
%endif
@@ -19,7 +19,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...
@@ -93,6 +93,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 6d48e6e..dc42ce4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (qtcharts-everywhere-src-6.2.0-rc2.tar.xz) = d09df23af1632d281179d2ae40efaacdac5a6a9b7805abea141ae1d701fff7ebe1a40edb7576eef8fb7bdfcff361d829ea7f83e6cf23f52e99212b8262e8c3f3
+SHA512 (qtcharts-everywhere-src-6.2.0.tar.xz) = 73e3f26571ae253db09f4b60be64a1d90c7363877e55745302864e5e897391514d7d7cef9300307cd3c5bf78307da7be07291764164fac4c59ac38badecc5161
commit 2129c951d242afa4be9777ecfa9a68a68697f2a5
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 fa78e9a..8d28607 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
/qtcharts-everywhere-src-6.1.2.tar.xz
/qtcharts-everywhere-src-6.2.0-beta4.tar.xz
/qtcharts-everywhere-src-6.2.0-rc.tar.xz
+/qtcharts-everywhere-src-6.2.0-rc2.tar.xz
diff --git a/qt6-qtcharts.spec b/qt6-qtcharts.spec
index efcdc60..71fb296 100644
--- a/qt6-qtcharts.spec
+++ b/qt6-qtcharts.spec
@@ -6,7 +6,7 @@ ExcludeArch: s390x
%global unstable 1
%if 0%{unstable}
-%global prerelease rc
+%global prerelease rc2
%endif
Summary: Qt6 - Charts component
@@ -93,6 +93,9 @@ 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
+
* Sat Sep 18 2021 Jan Grulich <jgrulich(a)redhat.com> - 6.2.0~rc-1
- 6.2.0 - rc
diff --git a/sources b/sources
index 0f18d05..6d48e6e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (qtcharts-everywhere-src-6.2.0-rc.tar.xz) = cae6ab133d0000ea809a8fc0161ab57f96936500bf92ed4da475d9d911f0fcd2f01c1d1ca9bc50624e2d8d066b6ed41e0eb766e49574abecb52876d1e8486813
+SHA512 (qtcharts-everywhere-src-6.2.0-rc2.tar.xz) = d09df23af1632d281179d2ae40efaacdac5a6a9b7805abea141ae1d701fff7ebe1a40edb7576eef8fb7bdfcff361d829ea7f83e6cf23f52e99212b8262e8c3f3
commit 73787232bf6531080a53e373b169d1478875d8df
Author: Jan Grulich <jgrulich(a)redhat.com>
Date: Sun Sep 19 13:27:08 2021 +0200
6.2.0 - rc
diff --git a/.gitignore b/.gitignore
index 2307fa6..fa78e9a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
/qtcharts-everywhere-src-6.1.1.tar.xz
/qtcharts-everywhere-src-6.1.2.tar.xz
/qtcharts-everywhere-src-6.2.0-beta4.tar.xz
+/qtcharts-everywhere-src-6.2.0-rc.tar.xz
diff --git a/qt6-qtcharts.spec b/qt6-qtcharts.spec
index eb5469d..efcdc60 100644
--- a/qt6-qtcharts.spec
+++ b/qt6-qtcharts.spec
@@ -6,7 +6,7 @@ ExcludeArch: s390x
%global unstable 1
%if 0%{unstable}
-%global prerelease beta4
+%global prerelease rc
%endif
Summary: Qt6 - Charts component
@@ -93,6 +93,9 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
%changelog
+* Sat Sep 18 2021 Jan Grulich <jgrulich(a)redhat.com> - 6.2.0~rc-1
+- 6.2.0 - rc
+
* Mon Sep 13 2021 Jan Grulich <jgrulich(a)redhat.com> - 6.2.0~beta4-1
- 6.2.0 - beta4
diff --git a/sources b/sources
index 1a476d1..0f18d05 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (qtcharts-everywhere-src-6.2.0-beta4.tar.xz) = 74e235447d974d24db5a3fa9ff7f972939f92e54e20aba5b1081702509b4676df3636c6181e0b1891cdb4824d563d81d7987495b13ccc3fdb4a60f2387b49589
+SHA512 (qtcharts-everywhere-src-6.2.0-rc.tar.xz) = cae6ab133d0000ea809a8fc0161ab57f96936500bf92ed4da475d9d911f0fcd2f01c1d1ca9bc50624e2d8d066b6ed41e0eb766e49574abecb52876d1e8486813
commit 4c4acb50c9998fe378a732e62a45e32bf24cc2a8
Author: Jan Grulich <jgrulich(a)redhat.com>
Date: Tue Sep 14 08:39:32 2021 +0200
6.2.0 - beta4
diff --git a/.gitignore b/.gitignore
index 4f83681..2307fa6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/qtcharts-everywhere-src-6.1.1.tar.xz
/qtcharts-everywhere-src-6.1.2.tar.xz
+/qtcharts-everywhere-src-6.2.0-beta4.tar.xz
diff --git a/qt6-qtcharts.spec b/qt6-qtcharts.spec
index 7e477b1..eb5469d 100644
--- a/qt6-qtcharts.spec
+++ b/qt6-qtcharts.spec
@@ -1,14 +1,29 @@
+# FIXME: qt6-qtdeclarative doesn't build on S390x
+# BUG: https://bugreports.qt.io/browse/QTBUG-93101
+ExcludeArch: s390x
+
%global qt_module qtcharts
+%global unstable 1
+%if 0%{unstable}
+%global prerelease beta4
+%endif
+
Summary: Qt6 - Charts component
Name: qt6-%{qt_module}
-Version: 6.1.2
+Version: 6.2.0%{?unstable:~%{prerelease}}
Release: 1%{?dist}
License: GPLv3
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
BuildRequires: cmake
BuildRequires: gcc-c++
@@ -38,7 +53,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
%prep
-%setup -q -n %{qt_module}-everywhere-src-%{version}
+%autosetup -n %{qt_module}-everywhere-src-%{qt_version}%{?unstable:-%{prerelease}} -p1
%build
@@ -53,23 +68,34 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
%files
%license LICENSE.GPL3
%{_qt6_libdir}/libQt6Charts.so.6*
+%{_qt6_libdir}/libQt6ChartsQml.so.6*
%{_qt6_qmldir}/QtCharts/
%files devel
%{_qt6_headerdir}/QtCharts/
+%{_qt6_headerdir}/QtChartsQml/
%{_qt6_libdir}/libQt6Charts.so
%{_qt6_libdir}/libQt6Charts.prl
+%{_qt6_libdir}/libQt6ChartsQml.so
+%{_qt6_libdir}/libQt6ChartsQml.prl
+%dir %{_qt6_libdir}/cmake/Qt6Charts/
%{_qt6_libdir}/cmake/Qt6Charts/
%{_qt6_libdir}/cmake/Qt6BuildInternals/StandaloneTests/QtChartsTestsConfig.cmake
%{_qt6_libdir}/cmake/Qt6Qml/QmlPlugins/Qt6qtchartsqml2*.cmake
+%dir %{_qt6_libdir}/cmake/Qt6ChartsQml/
+%{_qt6_libdir}/cmake/Qt6ChartsQml/
%{_qt6_datadir}/modules/*.json
%{_qt6_archdatadir}/mkspecs/modules/*
+%{_qt6_libdir}/metatypes/qt6*_metatypes.json
%files examples
%{_qt6_examplesdir}/
%changelog
+* Mon Sep 13 2021 Jan Grulich <jgrulich(a)redhat.com> - 6.2.0~beta4-1
+- 6.2.0 - beta4
+
* Thu Aug 12 2021 Jan Grulich <jgrulich(a)redhat.com> - 6.1.2-1
- 6.1.2
diff --git a/sources b/sources
index a664041..1a476d1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (qtcharts-everywhere-src-6.1.2.tar.xz) = 7aa327b9b0de80eb281ffa29ed0925314c4bc2ef0fc04b2ed4fc2fdaad7eee8f5bd2247b3f0afe25409ebecafe4ec5f79c7c6323797cc0a5c9e7a07857906669
+SHA512 (qtcharts-everywhere-src-6.2.0-beta4.tar.xz) = 74e235447d974d24db5a3fa9ff7f972939f92e54e20aba5b1081702509b4676df3636c6181e0b1891cdb4824d563d81d7987495b13ccc3fdb4a60f2387b49589
1 year, 8 months
Architecture specific change in rpms/qt6-qt5compat.git
by githook-noreply@fedoraproject.org
The package rpms/qt6-qt5compat.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-qt5compat.git/commit/?id=1aed....
Change:
+ExcludeArch: s390x
Thanks.
Full change:
============
commit 2471c96c0fff99c13372e0d82b5ce3f99068e489
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 d896b82..f2776c5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@
/qt5compat-everywhere-src-6.2.0-beta4.tar.xz
/qt5compat-everywhere-src-6.2.0-rc.tar.xz
/qt5compat-everywhere-src-6.2.0-rc2.tar.xz
+/qt5compat-everywhere-src-6.2.0.tar.xz
diff --git a/qt6-qt5compat.spec b/qt6-qt5compat.spec
index 42069cd..5f60682 100644
--- a/qt6-qt5compat.spec
+++ b/qt6-qt5compat.spec
@@ -4,8 +4,8 @@ ExcludeArch: s390x
%global qt_module qt5compat
-%global unstable 1
-%if 0%{unstable}
+#global unstable 1
+%if 0%{?unstable}
%global prerelease rc2
%endif
@@ -19,7 +19,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...
@@ -94,6 +94,9 @@ popd
%{_qt6_libdir}/metatypes/qt6*_metatypes.json
%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 cf00f73..acf99d3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (qt5compat-everywhere-src-6.2.0-rc2.tar.xz) = 86bccbf671ae394f2af0f5ca5541febf12ff763e6b39b6e56376891efe134eed514ab44a8b1b1a258185593b7004952a2c0b2813ff62458b205fb0ca5793d767
+SHA512 (qt5compat-everywhere-src-6.2.0.tar.xz) = 25bdaae61a5a5203c940a4fc7eb7c3aa61282f0cdcf716e2f20d264e6bb271117ef4a1724ca17c44dbabd6c62fcf78af4495b1c6f142151414d5d071f5378030
commit 61c8e11d27c85a62ec3dc64da0b1076d134a7b93
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 e241cad..d896b82 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
/qt5compat-everywhere-src-6.1.2.tar.xz
/qt5compat-everywhere-src-6.2.0-beta4.tar.xz
/qt5compat-everywhere-src-6.2.0-rc.tar.xz
+/qt5compat-everywhere-src-6.2.0-rc2.tar.xz
diff --git a/qt6-qt5compat.spec b/qt6-qt5compat.spec
index c7ab59b..42069cd 100644
--- a/qt6-qt5compat.spec
+++ b/qt6-qt5compat.spec
@@ -6,7 +6,7 @@ ExcludeArch: s390x
%global unstable 1
%if 0%{unstable}
-%global prerelease rc
+%global prerelease rc2
%endif
Summary: Qt6 - Qt 5 Compatibility Libraries
@@ -94,6 +94,9 @@ popd
%{_qt6_libdir}/metatypes/qt6*_metatypes.json
%changelog
+* Mon Sep 27 2021 Jan Grulich <jgrulich(a)redhat.com> - 6.2.0~rc2-1
+- 6.2.0 - rc2
+
* Sat Sep 18 2021 Jan Grulich <jgrulich(a)redhat.com> - 6.2.0~rc-1
- 6.2.0 - rc
diff --git a/sources b/sources
index 4fd9d62..cf00f73 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (qt5compat-everywhere-src-6.2.0-rc.tar.xz) = 7c007aaa5c6c32fa5fb954a3728311902ba83ce7171453f32fab25aa4b4e47879f9b8a7bdfdb17acc214ac92555206f0569e38069a2444f941268f2ae89179ea
+SHA512 (qt5compat-everywhere-src-6.2.0-rc2.tar.xz) = 86bccbf671ae394f2af0f5ca5541febf12ff763e6b39b6e56376891efe134eed514ab44a8b1b1a258185593b7004952a2c0b2813ff62458b205fb0ca5793d767
commit 18bd6fff84c663a212a46614743c681f575b84d3
Author: Jan Grulich <jgrulich(a)redhat.com>
Date: Sun Sep 19 13:26:52 2021 +0200
6.2.0 - rc
diff --git a/.gitignore b/.gitignore
index d7d02d0..e241cad 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
/qt5compat-everywhere-src-6.1.1.tar.xz
/qt5compat-everywhere-src-6.1.2.tar.xz
/qt5compat-everywhere-src-6.2.0-beta4.tar.xz
+/qt5compat-everywhere-src-6.2.0-rc.tar.xz
diff --git a/qt6-qt5compat.spec b/qt6-qt5compat.spec
index a99cc7b..c7ab59b 100644
--- a/qt6-qt5compat.spec
+++ b/qt6-qt5compat.spec
@@ -6,7 +6,7 @@ ExcludeArch: s390x
%global unstable 1
%if 0%{unstable}
-%global prerelease beta4
+%global prerelease rc
%endif
Summary: Qt6 - Qt 5 Compatibility Libraries
@@ -94,6 +94,9 @@ popd
%{_qt6_libdir}/metatypes/qt6*_metatypes.json
%changelog
+* Sat Sep 18 2021 Jan Grulich <jgrulich(a)redhat.com> - 6.2.0~rc-1
+- 6.2.0 - rc
+
* Mon Sep 13 2021 Jan Grulich <jgrulich(a)redhat.com> - 6.2.0~beta4-1
- 6.2.0 - beta4
diff --git a/sources b/sources
index 1048a3c..4fd9d62 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (qt5compat-everywhere-src-6.2.0-beta4.tar.xz) = c00a53a888fdf9803181c084beef2c1a8ff0bf9a4079b34e65e9d59f825124818ed439438091ca13a07468080e95e9a38964f579923f72232fecec81c6096d47
+SHA512 (qt5compat-everywhere-src-6.2.0-rc.tar.xz) = 7c007aaa5c6c32fa5fb954a3728311902ba83ce7171453f32fab25aa4b4e47879f9b8a7bdfdb17acc214ac92555206f0569e38069a2444f941268f2ae89179ea
commit 1aed5dd053796553e469f11a75e351642227d127
Author: Jan Grulich <jgrulich(a)redhat.com>
Date: Mon Sep 13 18:23:33 2021 +0200
6.2.0 - beta4
diff --git a/.gitignore b/.gitignore
index 430bd38..d7d02d0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
/qt5compat-everywhere-src-6.1.0.tar.xz
/qt5compat-everywhere-src-6.1.1.tar.xz
/qt5compat-everywhere-src-6.1.2.tar.xz
+/qt5compat-everywhere-src-6.2.0-beta4.tar.xz
diff --git a/qt6-qt5compat.spec b/qt6-qt5compat.spec
index bee7c1c..a99cc7b 100644
--- a/qt6-qt5compat.spec
+++ b/qt6-qt5compat.spec
@@ -1,14 +1,29 @@
+# FIXME: qt6-qtdeclarative doesn't build on S390x
+# BUG: https://bugreports.qt.io/browse/QTBUG-93101
+ExcludeArch: s390x
+
%global qt_module qt5compat
+%global unstable 1
+%if 0%{unstable}
+%global prerelease beta4
+%endif
+
Summary: Qt6 - Qt 5 Compatibility Libraries
Name: qt6-%{qt_module}
-Version: 6.1.2
+Version: 6.2.0%{?unstable:~%{prerelease}}
Release: 1%{?dist}
License: LGPLv3
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
# Upstream patches
@@ -34,7 +49,7 @@ Requires: qt6-qtbase-devel%{?_isa}
%prep
-%autosetup -n %{qt_module}-everywhere-src-%{version} -p1
+%autosetup -n %{qt_module}-everywhere-src-%{qt_version}%{?unstable:-%{prerelease}} -p1
%build
@@ -76,8 +91,12 @@ popd
%{_qt6_libdir}/cmake/Qt6Core5Compat/*.cmake
%{_qt6_archdatadir}/mkspecs/modules/*.pri
%{_qt6_datadir}/modules/*.json
+%{_qt6_libdir}/metatypes/qt6*_metatypes.json
%changelog
+* Mon Sep 13 2021 Jan Grulich <jgrulich(a)redhat.com> - 6.2.0~beta4-1
+- 6.2.0 - beta4
+
* Thu Aug 12 2021 Jan Grulich <jgrulich(a)redhat.com> - 6.1.2-1
- 6.1.2
diff --git a/sources b/sources
index 3d890d7..1048a3c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (qt5compat-everywhere-src-6.1.2.tar.xz) = 643c7ae1c9e9e60becfd083fb1d88a3dde58bdf2bd5706ff4832a76f416f0bfae197e7a22198a61df7a966f99a55a030dc30fa3abd6814fae1df2077f5329da9
+SHA512 (qt5compat-everywhere-src-6.2.0-beta4.tar.xz) = c00a53a888fdf9803181c084beef2c1a8ff0bf9a4079b34e65e9d59f825124818ed439438091ca13a07468080e95e9a38964f579923f72232fecec81c6096d47
1 year, 8 months
Architecture specific change in rpms/qt6-qt3d.git
by githook-noreply@fedoraproject.org
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=9fe8be7bf....
Change:
+ExcludeArch: s390x
Thanks.
Full change:
============
commit 7fba8fd5377d58f51393c93425c1cc7ef9fb8f6c
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 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/%{majmin}/%{qt_version}/su...
%else
Source0: https://download.qt.io/official_releases/qt/%{majmin}/%{version}/submodul...
@@ -202,6 +202,9 @@ popd
%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 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(a)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(a)redhat.com> - 6.2.0~rc2-1
+- 6.2.0 - rc2
+
* Sat Sep 18 2021 Jan Grulich <jgrulich(a)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(a)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(a)redhat.com> - 6.2.0~rc-1
+- 6.2.0 - rc
+
* Mon Sep 13 2021 Jan Grulich <jgrulich(a)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(a)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/%{qt_module...
+%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
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(a)redhat.com> - 6.2.0~beta4-1
+- 6.2.0 - beta4
+
* Thu Aug 12 2021 Jan Grulich <jgrulich(a)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
1 year, 8 months
Architecture specific change in rpms/qt6-qttools.git
by githook-noreply@fedoraproject.org
The package rpms/qt6-qttools.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-qttools.git/commit/?id=4b5ab6....
Change:
+ExcludeArch: s390x
Thanks.
Full change:
============
commit efeeb83772f14b41cd1d8dfccf9f6f62b03b00ab
Merge: 7debbe2 f57c90f
Author: Jan Grulich <jgrulich(a)redhat.com>
Date: Mon Oct 4 10:15:10 2021 +0200
Merge branch 'f35' into f34
commit f57c90f571780638b8523dc501b46d4dfda9dce9
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 ea91332..d0c3eeb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@
/qttools-everywhere-src-6.2.0-beta4.tar.xz
/qttools-everywhere-src-6.2.0-rc.tar.xz
/qttools-everywhere-src-6.2.0-rc2.tar.xz
+/qttools-everywhere-src-6.2.0.tar.xz
diff --git a/qt6-qttools.spec b/qt6-qttools.spec
index e055813..eabc87a 100644
--- a/qt6-qttools.spec
+++ b/qt6-qttools.spec
@@ -4,8 +4,8 @@ ExcludeArch: s390x
%global qt_module qttools
-%global unstable 1
-%if 0%{unstable}
+#global unstable 1
+%if 0%{?unstable}
%global prerelease rc2
%endif
@@ -19,7 +19,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...
@@ -373,6 +373,9 @@ popd
%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 606dc84..4d8d065 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (qttools-everywhere-src-6.2.0-rc2.tar.xz) = c788c8a8b0b8ccc9002baffad38320ded2aaec8591e9f914070dd9e7e103e3854efdb6e6866de4d2265e1f55ef7145c3c748be4dcd5901fb0105030929fff422
+SHA512 (qttools-everywhere-src-6.2.0.tar.xz) = 93998976db391ddd955ebd0fc368826b2419966c1369e466ec91aba27057063770e88e6fb6df22b8d4ca52b7789dea5e709e2c863411c177fbc044ae566b24c6
commit 232a3e26e89c4899a6f757117b1e47f967163fc7
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 556b4ce..ea91332 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
/qttools-everywhere-src-6.1.2.tar.xz
/qttools-everywhere-src-6.2.0-beta4.tar.xz
/qttools-everywhere-src-6.2.0-rc.tar.xz
+/qttools-everywhere-src-6.2.0-rc2.tar.xz
diff --git a/qt6-qttools.spec b/qt6-qttools.spec
index 2b84c18..e055813 100644
--- a/qt6-qttools.spec
+++ b/qt6-qttools.spec
@@ -6,7 +6,7 @@ ExcludeArch: s390x
%global unstable 1
%if 0%{unstable}
-%global prerelease rc
+%global prerelease rc2
%endif
Summary: Qt6 - QtTool components
@@ -373,6 +373,9 @@ popd
%changelog
+* Mon Sep 27 2021 Jan Grulich <jgrulich(a)redhat.com> - 6.2.0~rc2-1
+- 6.2.0 - rc2
+
* Sat Sep 18 2021 Jan Grulich <jgrulich(a)redhat.com> - 6.2.0~rc-1
- 6.2.0 - rc
diff --git a/sources b/sources
index 4d1bcb5..606dc84 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (qttools-everywhere-src-6.2.0-rc.tar.xz) = 925484909060dc3d25a91500ad34abecf6f587b4ba503c1378c26e56f3d75ec5d1513087c1e5696e27354914599b690664d927372e80db3618e4532bc8907bb6
+SHA512 (qttools-everywhere-src-6.2.0-rc2.tar.xz) = c788c8a8b0b8ccc9002baffad38320ded2aaec8591e9f914070dd9e7e103e3854efdb6e6866de4d2265e1f55ef7145c3c748be4dcd5901fb0105030929fff422
commit 5dfe4fcbefc39658d9f26c846c16b0fe5329e659
Author: Jan Grulich <jgrulich(a)redhat.com>
Date: Sun Sep 19 13:28:55 2021 +0200
6.2.0 - rc
diff --git a/.gitignore b/.gitignore
index b8596ec..556b4ce 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
/qttools-everywhere-src-6.1.1.tar.xz
/qttools-everywhere-src-6.1.2.tar.xz
/qttools-everywhere-src-6.2.0-beta4.tar.xz
+/qttools-everywhere-src-6.2.0-rc.tar.xz
diff --git a/qt6-qttools.spec b/qt6-qttools.spec
index 4873091..2b84c18 100644
--- a/qt6-qttools.spec
+++ b/qt6-qttools.spec
@@ -6,7 +6,7 @@ ExcludeArch: s390x
%global unstable 1
%if 0%{unstable}
-%global prerelease beta4
+%global prerelease rc
%endif
Summary: Qt6 - QtTool components
@@ -373,6 +373,9 @@ popd
%changelog
+* Sat Sep 18 2021 Jan Grulich <jgrulich(a)redhat.com> - 6.2.0~rc-1
+- 6.2.0 - rc
+
* Mon Sep 13 2021 Jan Grulich <jgrulich(a)redhat.com> - 6.2.0~beta4-1
- 6.2.0 - beta4
diff --git a/sources b/sources
index b862528..4d1bcb5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (qttools-everywhere-src-6.2.0-beta4.tar.xz) = 9f1b771a5907f9e9d84e749fe312262ee6e9fb91f9078a1634380bc01d0812cf0b795b46a4dbf9869ba5d3e391d29d9b98d73adea299c8d8604e0e160b509675
+SHA512 (qttools-everywhere-src-6.2.0-rc.tar.xz) = 925484909060dc3d25a91500ad34abecf6f587b4ba503c1378c26e56f3d75ec5d1513087c1e5696e27354914599b690664d927372e80db3618e4532bc8907bb6
commit 4b5ab668c11d3be6c22238f892175359c0b61a35
Author: Jan Grulich <jgrulich(a)redhat.com>
Date: Mon Sep 13 15:53:34 2021 +0200
6.2.0 - beta4
diff --git a/.gitignore b/.gitignore
index e06b0fc..b8596ec 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
/qttools-everywhere-src-6.1.0.tar.xz
/qttools-everywhere-src-6.1.1.tar.xz
/qttools-everywhere-src-6.1.2.tar.xz
+/qttools-everywhere-src-6.2.0-beta4.tar.xz
diff --git a/qt6-qttools.spec b/qt6-qttools.spec
index 3927b88..4873091 100644
--- a/qt6-qttools.spec
+++ b/qt6-qttools.spec
@@ -1,14 +1,29 @@
+# FIXME: qt6-qtdeclarative doesn't build on S390x
+# BUG: https://bugreports.qt.io/browse/QTBUG-93101
+ExcludeArch: s390x
+
%global qt_module qttools
+%global unstable 1
+%if 0%{unstable}
+%global prerelease beta4
+%endif
+
Summary: Qt6 - QtTool components
Name: qt6-qttools
-Version: 6.1.2
+Version: 6.2.0%{?unstable:~%{prerelease}}
Release: 1%{?dist}
License: LGPLv3 or LGPLv2
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
# help lrelease/lupdate use/prefer qmake-qt6
# https://bugzilla.redhat.com/show_bug.cgi?id=1009893
@@ -136,7 +151,7 @@ Requires: %{name}-common = %{version}-%{release}
%prep
-%setup -q -n %{qt_module}-everywhere-src-%{version}
+%setup -q -n %{qt_module}-everywhere-src-%{qt_version}%{?unstable:-%{prerelease}}
%patch1 -p1 -b .run-qttools-with-qt6-suffix
%ifarch %{mips32}
@@ -178,8 +193,7 @@ for i in * ; do
case "${i}" in
assistant|designer|lconvert|linguist|lrelease|lupdate|pixeltool| \
qcollectiongenerator|qdbus|qdbusviewer|qhelpconverter|qhelpgenerator| \
- qtplugininfo|qtattributionsscanner|qtpaths| \
- qdistancefieldgenerator|qdoc|qtdiag)
+ qtplugininfo|qdistancefieldgenerator|qdoc|qtdiag)
ln -v ${i} %{buildroot}%{_bindir}/${i}-qt6
ln -sv ${i} ${i}-qt6
;;
@@ -220,11 +234,8 @@ popd
%files
%{_bindir}/qdbus-qt6
-%{_bindir}/qtpaths-qt6
%{_qt6_bindir}/qdbus
%{_qt6_bindir}/qdbus-qt6
-%{_qt6_bindir}/qtpaths
-%{_qt6_bindir}/qtpaths-qt6
%{_qt6_libdir}/libQt6UiTools.so.6*
%files common
@@ -260,8 +271,7 @@ popd
%{_bindir}/qhelpgenerator*
%{_qt6_bindir}/qdistancefieldgenerator*
%{_qt6_bindir}/qhelpgenerator*
-%{_bindir}/qtattributionsscanner-qt6
-%{_qt6_bindir}/qtattributionsscanner*
+%{_qt6_libexecdir}/qtattributionsscanner*
%files -n qt6-designer
%{_bindir}/designer*
@@ -321,7 +331,7 @@ popd
%{_qt6_libdir}/cmake/Qt6/FindWrapLibClang.cmake
%{_qt6_libdir}/cmake/Qt6BuildInternals/StandaloneTests/QtToolsTestsConfig.cmake
%{_qt6_libdir}/cmake/Qt6Designer/*.cmake
-%{_qt6_libdir}/cmake/Qt6DesignerComponents/*.cmake
+%{_qt6_libdir}/cmake/Qt6DesignerComponentsPrivate/*.cmake
%dir %{_qt6_libdir}/cmake/Qt6Help/
%{_qt6_libdir}/cmake/Qt6Help/*.cmake
%dir %{_qt6_libdir}/cmake/Qt6Linguist
@@ -344,6 +354,7 @@ popd
%{_qt6_archdatadir}/mkspecs/modules/qt_lib_linguist_private.pri
%{_qt6_archdatadir}/mkspecs/modules/qt_lib_tools_private.pri
%{_qt6_archdatadir}/mkspecs/modules/qt_lib_uiplugin.pri
+%{_qt6_libdir}/metatypes/qt6*_metatypes.json
%files static
@@ -362,6 +373,9 @@ popd
%changelog
+* Mon Sep 13 2021 Jan Grulich <jgrulich(a)redhat.com> - 6.2.0~beta4-1
+- 6.2.0 - beta4
+
* Thu Aug 12 2021 Jan Grulich <jgrulich(a)redhat.com> - 6.1.2-1
- 6.1.2
diff --git a/sources b/sources
index 44f69af..b862528 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (qttools-everywhere-src-6.1.2.tar.xz) = 28476cab9da379fc3a01ec67a628f10d1af69f2161c9291cbef83e5376872bacb429d855b3217fa4a050f15b79bb8b12fce6944f8ab1dc2dbdf170815be51bc5
+SHA512 (qttools-everywhere-src-6.2.0-beta4.tar.xz) = 9f1b771a5907f9e9d84e749fe312262ee6e9fb91f9078a1634380bc01d0812cf0b795b46a4dbf9869ba5d3e391d29d9b98d73adea299c8d8604e0e160b509675
1 year, 8 months
Architecture specific change in rpms/qt6-qtdeclarative.git
by githook-noreply@fedoraproject.org
The package rpms/qt6-qtdeclarative.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-qtdeclarative.git/commit/?id=....
Change:
+ExcludeArch: s390x
Thanks.
Full change:
============
commit ff2c12257451831b9b435838b3812e6d783c68f9
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 168803d..e3f3bc7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@
/qtdeclarative-everywhere-src-6.2.0-beta4.tar.xz
/qtdeclarative-everywhere-src-6.2.0-rc.tar.xz
/qtdeclarative-everywhere-src-6.2.0-rc2.tar.xz
+/qtdeclarative-everywhere-src-6.2.0.tar.xz
diff --git a/qt6-qtdeclarative.spec b/qt6-qtdeclarative.spec
index 98b6ae3..9a24197 100644
--- a/qt6-qtdeclarative.spec
+++ b/qt6-qtdeclarative.spec
@@ -7,8 +7,8 @@ ExcludeArch: s390x
# definition borrowed from qtbase
%global multilib_archs x86_64 %{ix86} %{?mips} ppc64 ppc s390x s390 sparc64 sparcv9
-%global unstable 1
-%if 0%{unstable}
+#global unstable 1
+%if 0%{?unstable}
%global prerelease rc2
%endif
@@ -23,7 +23,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...
@@ -305,6 +305,9 @@ make check -k -C tests ||:
%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 b64e299..fb75e4f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (qtdeclarative-everywhere-src-6.2.0-rc2.tar.xz) = 1efa7a9c681dbbc3f6ad8dfed2db142eaa1994a6a8db12e338fb3a76818bb26a6edd18a94add1d68790cf66e3222e0b919d14e973e429880741996c50654a14b
+SHA512 (qtdeclarative-everywhere-src-6.2.0.tar.xz) = 5922d50258f5903561153037620aa96048cc7f93e948efe04aa7f25003d125010f64adffdd52df148558ab9275a5da8a43cf299072806fe54309735d0c5a7215
commit c0934ea8d29aafa1fc4399ce512079ca7da74f48
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 e8d141f..168803d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@
/qtdeclarative-everywhere-src-6.2.0-beta3.tar.xz
/qtdeclarative-everywhere-src-6.2.0-beta4.tar.xz
/qtdeclarative-everywhere-src-6.2.0-rc.tar.xz
+/qtdeclarative-everywhere-src-6.2.0-rc2.tar.xz
diff --git a/qt6-qtdeclarative.spec b/qt6-qtdeclarative.spec
index 6a9e2f7..98b6ae3 100644
--- a/qt6-qtdeclarative.spec
+++ b/qt6-qtdeclarative.spec
@@ -9,7 +9,7 @@ ExcludeArch: s390x
%global unstable 1
%if 0%{unstable}
-%global prerelease rc
+%global prerelease rc2
%endif
Summary: Qt6 - QtDeclarative component
@@ -305,6 +305,9 @@ make check -k -C tests ||:
%changelog
+* Mon Sep 27 2021 Jan Grulich <jgrulich(a)redhat.com> - 6.2.0~rc2-1
+- 6.2.0 - rc2
+
* Sat Sep 18 2021 Jan Grulich <jgrulich(a)redhat.com> - 6.2.0~rc-1
- 6.2.0 - rc
diff --git a/sources b/sources
index 31083af..b64e299 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-SHA512 (qtdeclarative-everywhere-src-6.2.0-beta4.tar.xz) = b06db94690b7259afd201c3419216636ed62ffb108283df80e9200989062846214c36495277c952f7971fcd06ea513113132d87dfc6b682908383365dc301d9e
-SHA512 (qtdeclarative-everywhere-src-6.2.0-rc.tar.xz) = 5d8ad3e94b8e1050c9b28f5bccdca9f1ab2326e2b6a7bac6cdf95469ca57c032e010b061321b9abdcf8b8967912422c6a6eb40870efbb58c1e2010e4c2f6783c
+SHA512 (qtdeclarative-everywhere-src-6.2.0-rc2.tar.xz) = 1efa7a9c681dbbc3f6ad8dfed2db142eaa1994a6a8db12e338fb3a76818bb26a6edd18a94add1d68790cf66e3222e0b919d14e973e429880741996c50654a14b
commit 24c16d2fc1d7933b1faf8b3a018b9f1c3830d33f
Author: Jan Grulich <jgrulich(a)redhat.com>
Date: Sun Sep 19 11:41:30 2021 +0200
6.2.0 - rc
diff --git a/.gitignore b/.gitignore
index 9f4cf4d..e8d141f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
/qtdeclarative-everywhere-src-6.1.2.tar.xz
/qtdeclarative-everywhere-src-6.2.0-beta3.tar.xz
/qtdeclarative-everywhere-src-6.2.0-beta4.tar.xz
+/qtdeclarative-everywhere-src-6.2.0-rc.tar.xz
diff --git a/qt6-qtdeclarative.spec b/qt6-qtdeclarative.spec
index 8fbc04b..6a9e2f7 100644
--- a/qt6-qtdeclarative.spec
+++ b/qt6-qtdeclarative.spec
@@ -9,13 +9,13 @@ ExcludeArch: s390x
%global unstable 1
%if 0%{unstable}
-%global prerelease beta4
+%global prerelease rc
%endif
Summary: Qt6 - QtDeclarative component
Name: qt6-%{qt_module}
Version: 6.2.0%{?unstable:~%{prerelease}}
-Release: 2%{?dist}
+Release: 1%{?dist}
# See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details
License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -305,6 +305,9 @@ make check -k -C tests ||:
%changelog
+* Sat Sep 18 2021 Jan Grulich <jgrulich(a)redhat.com> - 6.2.0~rc-1
+- 6.2.0 - rc
+
* Mon Sep 13 2021 Jan Grulich <jgrulich(a)redhat.com> - 6.2.0~beta4-1
- Obsoletes: qt6-qtquickcontrols2
diff --git a/sources b/sources
index b637fb1..31083af 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
SHA512 (qtdeclarative-everywhere-src-6.2.0-beta4.tar.xz) = b06db94690b7259afd201c3419216636ed62ffb108283df80e9200989062846214c36495277c952f7971fcd06ea513113132d87dfc6b682908383365dc301d9e
+SHA512 (qtdeclarative-everywhere-src-6.2.0-rc.tar.xz) = 5d8ad3e94b8e1050c9b28f5bccdca9f1ab2326e2b6a7bac6cdf95469ca57c032e010b061321b9abdcf8b8967912422c6a6eb40870efbb58c1e2010e4c2f6783c
commit 6a56dab1b29df4c52d8d156083b1d3abd52b66d0
Author: Jan Grulich <jgrulich(a)redhat.com>
Date: Mon Sep 13 14:10:21 2021 +0200
Obsoletes: qt6-qtquickcontrols2
diff --git a/qt6-qtdeclarative.spec b/qt6-qtdeclarative.spec
index 1b8ad61..8fbc04b 100644
--- a/qt6-qtdeclarative.spec
+++ b/qt6-qtdeclarative.spec
@@ -15,7 +15,7 @@ ExcludeArch: s390x
Summary: Qt6 - QtDeclarative component
Name: qt6-%{qt_module}
Version: 6.2.0%{?unstable:~%{prerelease}}
-Release: 1%{?dist}
+Release: 2%{?dist}
# See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details
License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -58,14 +58,19 @@ BuildRequires: time
BuildRequires: xorg-x11-server-Xvfb
%endif
+Obsoletes: qt6-qtquickcontrols2 < 6.2.0~beta3-1
+Provides: qt6-qtquickcontrols2 = %{version}-%{release}
+
%description
%{summary}.
%package devel
Summary: Development files for %{name}
Provides: %{name}-private-devel = %{version}-%{release}
-Requires: %{name}%{?_isa} = %{version}-%{release}
-Requires: qt6-qtbase-devel%{?_isa}
+Requires: %{name}%{?_isa} = %{version}-%{release}
+Requires: qt6-qtbase-devel%{?_isa}
+Obsoletes: qt6-qtquickcontrols2-devel < 6.2.0~beta3-1
+Provides: qt6-qtquickcontrols2-devel = %{version}-%{release}
%description devel
%{summary}.
@@ -77,7 +82,9 @@ Requires: %{name}-devel%{?_isa} = %{version}-%{release}
%package examples
Summary: Programming examples for %{name}
-Requires: %{name}%{?_isa} = %{version}-%{release}
+Requires: %{name}%{?_isa} = %{version}-%{release}
+Obsoletes: qt6-qtquickcontrols2-examples < 6.2.0~beta3-1
+Provides: qt6-qtquickcontrols2-examples = %{version}-%{release}
%description examples
%{summary}.
@@ -298,6 +305,9 @@ make check -k -C tests ||:
%changelog
+* Mon Sep 13 2021 Jan Grulich <jgrulich(a)redhat.com> - 6.2.0~beta4-1
+- Obsoletes: qt6-qtquickcontrols2
+
* Mon Sep 13 2021 Jan Grulich <jgrulich(a)redhat.com> - 6.2.0~beta4-1
- 6.2.0 - beta4
commit aa53cf0bcaf608b9d2c90d97db7896fe6ba63469
Author: Jan Grulich <jgrulich(a)redhat.com>
Date: Mon Sep 13 12:20:50 2021 +0200
Skip s390x because of QTBUG-93101
diff --git a/qt6-qtdeclarative.spec b/qt6-qtdeclarative.spec
index e37d270..1b8ad61 100644
--- a/qt6-qtdeclarative.spec
+++ b/qt6-qtdeclarative.spec
@@ -1,3 +1,7 @@
+# FIXME: qt6-qtdeclarative doesn't build on S390x
+# BUG: https://bugreports.qt.io/browse/QTBUG-93101
+ExcludeArch: s390x
+
%global qt_module qtdeclarative
# definition borrowed from qtbase
commit b32a61d66d38c9f11e8c5a2420500c17f5bbc3de
Author: Jan Grulich <jgrulich(a)redhat.com>
Date: Mon Sep 13 09:16:15 2021 +0200
6.2.0 - beta4
diff --git a/.gitignore b/.gitignore
index adfc083..9f4cf4d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
/qtdeclarative-everywhere-src-6.1.1.tar.xz
/qtdeclarative-everywhere-src-6.1.2.tar.xz
/qtdeclarative-everywhere-src-6.2.0-beta3.tar.xz
+/qtdeclarative-everywhere-src-6.2.0-beta4.tar.xz
diff --git a/qt6-qtdeclarative.spec b/qt6-qtdeclarative.spec
index 5edff11..e37d270 100644
--- a/qt6-qtdeclarative.spec
+++ b/qt6-qtdeclarative.spec
@@ -5,7 +5,7 @@
%global unstable 1
%if 0%{unstable}
-%global prerelease beta3
+%global prerelease beta4
%endif
Summary: Qt6 - QtDeclarative component
@@ -294,6 +294,9 @@ make check -k -C tests ||:
%changelog
+* Mon Sep 13 2021 Jan Grulich <jgrulich(a)redhat.com> - 6.2.0~beta4-1
+- 6.2.0 - beta4
+
* Mon Aug 30 2021 Jan Grulich <jgrulich(a)redhat.com> - 6.2.0~beta3-1
- 6.2.0 - beta3
diff --git a/sources b/sources
index 4c9b206..b637fb1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (qtdeclarative-everywhere-src-6.2.0-beta3.tar.xz) = e3afacac9d12441345265f6db5153fb812ec4590f659c8d96ca04a49f9744f8b7cdfe5fce44c48ecca39f3baf4fed27a016927947fc009192361f12af9079c5b
+SHA512 (qtdeclarative-everywhere-src-6.2.0-beta4.tar.xz) = b06db94690b7259afd201c3419216636ed62ffb108283df80e9200989062846214c36495277c952f7971fcd06ea513113132d87dfc6b682908383365dc301d9e
commit 205848601bd84e1f69e0403f5cccdd9addf1cc46
Author: Jan Grulich <jgrulich(a)redhat.com>
Date: Mon Aug 30 14:26:52 2021 +0200
6.2.0 - beta3
diff --git a/.gitignore b/.gitignore
index 8816d91..adfc083 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
/qtdeclarative-everywhere-src-6.1.0.tar.xz
/qtdeclarative-everywhere-src-6.1.1.tar.xz
/qtdeclarative-everywhere-src-6.1.2.tar.xz
+/qtdeclarative-everywhere-src-6.2.0-beta3.tar.xz
diff --git a/qt6-qtdeclarative.spec b/qt6-qtdeclarative.spec
index 0ce485e..5edff11 100644
--- a/qt6-qtdeclarative.spec
+++ b/qt6-qtdeclarative.spec
@@ -3,16 +3,27 @@
# definition borrowed from qtbase
%global multilib_archs x86_64 %{ix86} %{?mips} ppc64 ppc s390x s390 sparc64 sparcv9
+%global unstable 1
+%if 0%{unstable}
+%global prerelease beta3
+%endif
+
Summary: Qt6 - QtDeclarative component
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
License: LGPLv2 with exceptions or GPLv3 with exceptions
Url: http://www.qt.io
-%global majmin %(echo %{version} | cut -d. -f1-2)
+%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
# header file to workaround multilib issue
# https://bugzilla.redhat.com/show_bug.cgi?id=1441343
@@ -31,6 +42,7 @@ BuildRequires: ninja-build
BuildRequires: qt6-rpm-macros
BuildRequires: qt6-qtbase-devel >= %{version}
BuildRequires: qt6-qtbase-private-devel
+BuildRequires: qt6-qtshadertools-devel >= %{version}
%{?_qt6:Requires: %{_qt6}%{?_isa} = %{_qt6_version}}
BuildRequires: python%{python3_pkgversion}
BuildRequires: pkgconfig(xkbcommon) >= 0.4.1
@@ -67,7 +79,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
@@ -86,9 +98,9 @@ export PATH=`pwd`:$PATH
%ifarch %{multilib_archs}
# multilib: qv4global_p.h
- mv %{buildroot}%{_qt6_headerdir}/QtQml/%{version}/QtQml/private/qv4global_p.h \
- %{buildroot}%{_qt6_headerdir}/QtQml/%{version}/QtQml/private/qv4global_p-%{__isa_bits}.h
- install -p -m644 -D %{SOURCE5} %{buildroot}%{_qt6_headerdir}/QtQml/%{version}/QtQml/private/qv4global_p.h
+ mv %{buildroot}%{_qt6_headerdir}/QtQml/%{qt_version}/QtQml/private/qv4global_p.h \
+ %{buildroot}%{_qt6_headerdir}/QtQml/%{qt_version}/QtQml/private/qv4global_p-%{__isa_bits}.h
+ install -p -m644 -D %{SOURCE5} %{buildroot}%{_qt6_headerdir}/QtQml/%{qt_version}/QtQml/private/qv4global_p.h
%endif
# hardlink files to %{_bindir}, add -qt6 postfix to not conflict
@@ -144,23 +156,32 @@ make check -k -C tests ||:
%{_qt6_libdir}/libQt6LabsWavefrontMesh.so.6*
%{_qt6_libdir}/libQt6QmlLocalStorage.so.6*
%{_qt6_libdir}/libQt6Qml.so.6*
+%{_qt6_libdir}/libQt6QmlCore.so.6*
%{_qt6_libdir}/libQt6QmlModels.so.6*
%{_qt6_libdir}/libQt6QmlWorkerScript.so.6*
%{_qt6_libdir}/libQt6Quick.so.6*
+%{_qt6_libdir}/libQt6QuickControls2.so.6*
+%{_qt6_libdir}/libQt6QuickControls2Impl.so.6*
+%{_qt6_libdir}/libQt6QuickDialogs2.so.6*
+%{_qt6_libdir}/libQt6QuickDialogs2QuickImpl.so.6*
+%{_qt6_libdir}/libQt6QuickDialogs2Utils.so.6*
%{_qt6_libdir}/libQt6QuickLayouts.so.6*
%{_qt6_libdir}/libQt6QuickWidgets.so.6*
%{_qt6_libdir}/libQt6QuickParticles.so.6*
%{_qt6_libdir}/libQt6QuickShapes.so.6*
%{_qt6_libdir}/libQt6QuickTest.so.6*
+%{_qt6_libdir}/libQt6QuickTemplates2.so.6*
+%{_qt6_libdir}/libQt6QmlXmlListModel.so.6*
%{_qt6_plugindir}/qmltooling/
%{_qt6_archdatadir}/qml/
%files devel
-%dir %{_qt6_libdir}/cmake/Qt6PacketProtocol/
+%dir %{_qt6_libdir}/cmake/Qt6PacketProtocolPrivate/
%dir %{_qt6_libdir}/cmake/Qt6Qml/
-%dir %{_qt6_libdir}/cmake/Qt6QmlCompiler/
-%dir %{_qt6_libdir}/cmake/Qt6QmlDebug/
-%dir %{_qt6_libdir}/cmake/Qt6QmlDevTools/
+%dir %{_qt6_libdir}/cmake/Qt6QmlCompilerPrivate/
+%dir %{_qt6_libdir}/cmake/Qt6QmlCore
+%dir %{_qt6_libdir}/cmake/Qt6QmlDebugPrivate/
+%dir %{_qt6_libdir}/cmake/Qt6QmlDevToolsPrivate/
%dir %{_qt6_libdir}/cmake/Qt6QmlImportScanner/
%dir %{_qt6_libdir}/cmake/Qt6LabsAnimation
%dir %{_qt6_libdir}/cmake/Qt6LabsFolderListModel
@@ -168,18 +189,28 @@ make check -k -C tests ||:
%dir %{_qt6_libdir}/cmake/Qt6LabsSettings
%dir %{_qt6_libdir}/cmake/Qt6LabsSharedImage
%dir %{_qt6_libdir}/cmake/Qt6LabsWavefrontMesh
-%dir %{_qt6_libdir}/cmake/Qt6QmlDom
+%dir %{_qt6_libdir}/cmake/Qt6QmlDomPrivate
%dir %{_qt6_libdir}/cmake/Qt6QmlLocalStorage
%dir %{_qt6_libdir}/cmake/Qt6QmlModels/
%dir %{_qt6_libdir}/cmake/Qt6QmlTools/
%dir %{_qt6_libdir}/cmake/Qt6QmlWorkerScript/
%dir %{_qt6_libdir}/cmake/Qt6Quick/
+%dir %{_qt6_libdir}/cmake/Qt6QuickControls2
+%dir %{_qt6_libdir}/cmake/Qt6QuickControls2Impl
+%dir %{_qt6_libdir}/cmake/Qt6QuickDialogs2
+%dir %{_qt6_libdir}/cmake/Qt6QuickDialogs2QuickImpl
+%dir %{_qt6_libdir}/cmake/Qt6QuickDialogs2Utils
%dir %{_qt6_libdir}/cmake/Qt6QuickLayouts
-%dir %{_qt6_libdir}/cmake/Qt6QuickParticles/
-%dir %{_qt6_libdir}/cmake/Qt6QuickShapes/
+%dir %{_qt6_libdir}/cmake/Qt6QuickParticlesPrivate/
+%dir %{_qt6_libdir}/cmake/Qt6QuickShapesPrivate/
%dir %{_qt6_libdir}/cmake/Qt6QuickTest/
+%dir %{_qt6_libdir}/cmake/Qt6QuickTemplates2
+%dir %{_qt6_libdir}/cmake/Qt6QmlXmlListModel
%{_bindir}/qml*
%{_qt6_bindir}/qml*
+%{_qt6_libexecdir}/qmlcachegen
+%{_qt6_libexecdir}/qmlimportscanner
+%{_qt6_libexecdir}/qmltyperegistrar
%{_qt6_headerdir}/Qt*/
%{_qt6_libdir}/libQt6LabsAnimation.so
%{_qt6_libdir}/libQt6LabsFolderListModel.so
@@ -189,20 +220,23 @@ make check -k -C tests ||:
%{_qt6_libdir}/libQt6LabsWavefrontMesh.so
%{_qt6_libdir}/libQt6QmlLocalStorage.so
%{_qt6_libdir}/libQt6Qml.so
+%{_qt6_libdir}/libQt6QmlCore.so
%{_qt6_libdir}/libQt6QmlModels.so
%{_qt6_libdir}/libQt6QmlWorkerScript.so
%{_qt6_libdir}/libQt6Quick*.so
+%{_qt6_libdir}/libQt6QmlXmlListModel.so
%{_qt6_libdir}/metatypes/qt6*_metatypes.json
%{_qt6_archdatadir}/mkspecs/modules/*.pri
%{_qt6_archdatadir}/mkspecs/features/*.prf
%{_qt6_libdir}/cmake/Qt6BuildInternals/StandaloneTests/QtDeclarativeTestsConfig.cmake
-%{_qt6_libdir}/cmake/Qt6PacketProtocol/*.cmake
+%{_qt6_libdir}/cmake/Qt6PacketProtocolPrivate/*.cmake
%{_qt6_libdir}/cmake/Qt6Qml/*.cmake*
%{_qt6_libdir}/cmake/Qt6Qml/*.cpp.in
%{_qt6_libdir}/cmake/Qt6Qml/QmlPlugins/*.cmake
-%{_qt6_libdir}/cmake/Qt6QmlCompiler/*.cmake
-%{_qt6_libdir}/cmake/Qt6QmlDebug/*.cmake
-%{_qt6_libdir}/cmake/Qt6QmlDevTools/*.cmake
+%{_qt6_libdir}/cmake/Qt6QmlCompilerPrivate/*.cmake
+%{_qt6_libdir}/cmake/Qt6QmlCore/*.cmake
+%{_qt6_libdir}/cmake/Qt6QmlDebugPrivate/*.cmake
+%{_qt6_libdir}/cmake/Qt6QmlDevToolsPrivate/*.cmake
%{_qt6_libdir}/cmake/Qt6QmlImportScanner/*.cmake
%{_qt6_libdir}/cmake/Qt6LabsAnimation/*.cmake
%{_qt6_libdir}/cmake/Qt6LabsFolderListModel/*.cmake
@@ -210,16 +244,23 @@ make check -k -C tests ||:
%{_qt6_libdir}/cmake/Qt6LabsSettings/*.cmake
%{_qt6_libdir}/cmake/Qt6LabsSharedImage/*.cmake
%{_qt6_libdir}/cmake/Qt6LabsWavefrontMesh/*.cmake
-%{_qt6_libdir}/cmake/Qt6QmlDom/*.cmake
+%{_qt6_libdir}/cmake/Qt6QmlDomPrivate/*.cmake
%{_qt6_libdir}/cmake/Qt6QmlLocalStorage/*.cmake
%{_qt6_libdir}/cmake/Qt6QmlModels/*.cmake
%{_qt6_libdir}/cmake/Qt6QmlTools/*.cmake
%{_qt6_libdir}/cmake/Qt6QmlWorkerScript/*.cmake
%{_qt6_libdir}/cmake/Qt6Quick/*.cmake
+%{_qt6_libdir}/cmake/Qt6QuickControls2/*.cmake
+%{_qt6_libdir}/cmake/Qt6QuickControls2Impl/*.cmake
+%{_qt6_libdir}/cmake/Qt6QuickDialogs2/*.cmake
+%{_qt6_libdir}/cmake/Qt6QuickDialogs2QuickImpl/*.cmake
+%{_qt6_libdir}/cmake/Qt6QuickDialogs2Utils/*.cmake
%{_qt6_libdir}/cmake/Qt6QuickLayouts/*.cmake
-%{_qt6_libdir}/cmake/Qt6QuickParticles/*.cmake
-%{_qt6_libdir}/cmake/Qt6QuickShapes/*.cmake
+%{_qt6_libdir}/cmake/Qt6QuickParticlesPrivate/*.cmake
+%{_qt6_libdir}/cmake/Qt6QuickShapesPrivate/*.cmake
%{_qt6_libdir}/cmake/Qt6QuickTest/*.cmake
+%{_qt6_libdir}/cmake/Qt6QuickTemplates2/*.cmake
+%{_qt6_libdir}/cmake/Qt6QmlXmlListModel/*.cmake
%{_qt6_libdir}/cmake/Qt6QuickWidgets/*.cmake
%{_qt6_datadir}/modules/*.json
@@ -230,6 +271,7 @@ make check -k -C tests ||:
%{_qt6_libdir}/libQt6LabsSettings.prl
%{_qt6_libdir}/libQt6LabsSharedImage.prl
%{_qt6_libdir}/libQt6LabsWavefrontMesh.prl
+%{_qt6_libdir}/libQt6QmlCore.prl
%{_qt6_libdir}/libQt6QmlDom.a
%{_qt6_libdir}/libQt6QmlDom.prl
%{_qt6_libdir}/libQt6QmlLocalStorage.prl
@@ -245,12 +287,16 @@ make check -k -C tests ||:
%{_qt6_libdir}/libQt6PacketProtocol.prl
%{_qt6_libdir}/libQt6QmlDebug.a
%{_qt6_libdir}/libQt6QmlDebug.prl
+%{_qt6_libdir}/libQt6QmlXmlListModel.prl
%files examples
%{_qt6_examplesdir}/
%changelog
+* Mon Aug 30 2021 Jan Grulich <jgrulich(a)redhat.com> - 6.2.0~beta3-1
+- 6.2.0 - beta3
+
* Thu Aug 12 2021 Jan Grulich <jgrulich(a)redhat.com> - 6.1.2-1
- 6.1.2
diff --git a/sources b/sources
index d02cafc..4c9b206 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (qtdeclarative-everywhere-src-6.1.2.tar.xz) = 653f902762943643262d3575bb918bf04b4cab156b17f5e6d5fd0132fed059d578cbf60a0b7cc25051aad73c2cbbf17d33f709377d076fd402792b3e213f66e7
+SHA512 (qtdeclarative-everywhere-src-6.2.0-beta3.tar.xz) = e3afacac9d12441345265f6db5153fb812ec4590f659c8d96ca04a49f9744f8b7cdfe5fce44c48ecca39f3baf4fed27a016927947fc009192361f12af9079c5b
1 year, 8 months
Architecture specific change in rpms/qt6-qtshadertools.git
by githook-noreply@fedoraproject.org
The package rpms/qt6-qtshadertools.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-qtshadertools.git/commit/?id=....
Change:
+ExcludeArch: s390x
Thanks.
Full change:
============
commit ccbd6253e747d907bcc04aeacdf9163b5a311dbb
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 6337c87..1272344 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@
/qtshadertools-everywhere-src-6.2.0-beta4.tar.xz
/qtshadertools-everywhere-src-6.2.0-rc.tar.xz
/qtshadertools-everywhere-src-6.2.0-rc2.tar.xz
+/qtshadertools-everywhere-src-6.2.0.tar.xz
diff --git a/qt6-qtshadertools.spec b/qt6-qtshadertools.spec
index d4c8d7b..55c7b8c 100644
--- a/qt6-qtshadertools.spec
+++ b/qt6-qtshadertools.spec
@@ -4,8 +4,8 @@ ExcludeArch: s390x
%global qt_module qtshadertools
-%global unstable 1
-%if 0%{unstable}
+#global unstable 1
+%if 0%{?unstable}
%global prerelease rc2
%endif
@@ -19,7 +19,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...
@@ -112,6 +112,9 @@ popd
%{_qt6_libdir}/metatypes/qt6*_metatypes.json
%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 cff82f1..6bbceb3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (qtshadertools-everywhere-src-6.2.0-rc2.tar.xz) = ddf7ba18f50e2000ebee736d5d5d2f99964498a23c3e59b8dea1f44765440ab2041d7aa99f8fb02305f403e72fb641228dc11c4350662e7b751c11266db7ef00
+SHA512 (qtshadertools-everywhere-src-6.2.0.tar.xz) = cc83c6abbc3c7a78f61ab87b577042951f8b9f217675955b73cc357bf09d2f8f5850fa8d3cc93f0630d907c4ab056b5b8e266b6c7819253f632e4267b3e52706
commit 5baf5d4fe6962093f61bdb62152a9c008bf89df5
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 67607ab..6337c87 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@
/qtshadertools-everywhere-src-6.2.0-beta3.tar.xz
/qtshadertools-everywhere-src-6.2.0-beta4.tar.xz
/qtshadertools-everywhere-src-6.2.0-rc.tar.xz
+/qtshadertools-everywhere-src-6.2.0-rc2.tar.xz
diff --git a/qt6-qtshadertools.spec b/qt6-qtshadertools.spec
index 86486ca..d4c8d7b 100644
--- a/qt6-qtshadertools.spec
+++ b/qt6-qtshadertools.spec
@@ -6,7 +6,7 @@ ExcludeArch: s390x
%global unstable 1
%if 0%{unstable}
-%global prerelease rc
+%global prerelease rc2
%endif
Summary: Qt6 - Qt Shader Tools module builds on the SPIR-V Open Source Ecosystem
@@ -112,6 +112,9 @@ popd
%{_qt6_libdir}/metatypes/qt6*_metatypes.json
%changelog
+* Mon Sep 27 2021 Jan Grulich <jgrulich(a)redhat.com> - 6.2.0~rc2-1
+- 6.2.0 - rc2
+
* Sat Sep 18 2021 Jan Grulich <jgrulich(a)redhat.com> - 6.2.0~rc-1
- 6.2.0 - rc
diff --git a/sources b/sources
index 62fea5b..cff82f1 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-SHA512 (qtshadertools-everywhere-src-6.2.0-beta4.tar.xz) = 8f8cd1e1819c372c418e730cfdb3734c8ba457543da400cb39fa3cb3c31500a93bb759b9f2f5df9f3093c9b6acebf4fed5d1cf677be4dcd8863d8a22e48d3c1b
-SHA512 (qtshadertools-everywhere-src-6.2.0-rc.tar.xz) = 225c1dd9223e4dd33ec6f23304b90366bb34392bcf0987844d39e60d71cc7a4e4da225e9a74463a53aaf0c9e5ff2cb5907d03c6e812e8412471f3a74a175e8ca
+SHA512 (qtshadertools-everywhere-src-6.2.0-rc2.tar.xz) = ddf7ba18f50e2000ebee736d5d5d2f99964498a23c3e59b8dea1f44765440ab2041d7aa99f8fb02305f403e72fb641228dc11c4350662e7b751c11266db7ef00
commit 398a4865f7e9ed70c9beeb48a83b4cfa7a031191
Author: Jan Grulich <jgrulich(a)redhat.com>
Date: Sun Sep 19 10:37:40 2021 +0200
6.2.0 - rc
diff --git a/.gitignore b/.gitignore
index e6d6730..67607ab 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
/qtshadertools-everywhere-src-6.1.2.tar.xz
/qtshadertools-everywhere-src-6.2.0-beta3.tar.xz
/qtshadertools-everywhere-src-6.2.0-beta4.tar.xz
+/qtshadertools-everywhere-src-6.2.0-rc.tar.xz
diff --git a/qt6-qtshadertools.spec b/qt6-qtshadertools.spec
index 4341190..86486ca 100644
--- a/qt6-qtshadertools.spec
+++ b/qt6-qtshadertools.spec
@@ -6,13 +6,13 @@ ExcludeArch: s390x
%global unstable 1
%if 0%{unstable}
-%global prerelease beta4
+%global prerelease rc
%endif
Summary: Qt6 - Qt Shader Tools module builds on the SPIR-V Open Source Ecosystem
Name: qt6-%{qt_module}
Version: 6.2.0%{?unstable:~%{prerelease}}
-Release: 2%{?dist}
+Release: 1%{?dist}
License: LGPLv3
Url: http://www.qt.io
@@ -112,6 +112,9 @@ popd
%{_qt6_libdir}/metatypes/qt6*_metatypes.json
%changelog
+* Sat Sep 18 2021 Jan Grulich <jgrulich(a)redhat.com> - 6.2.0~rc-1
+- 6.2.0 - rc
+
* Mon Sep 13 2021 Jan Grulich <jgrulich(a)redhat.com> - 6.2.0~beta4-2
- Skip s390x because of QTBUG-93101
diff --git a/sources b/sources
index 56ab9be..62fea5b 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
SHA512 (qtshadertools-everywhere-src-6.2.0-beta4.tar.xz) = 8f8cd1e1819c372c418e730cfdb3734c8ba457543da400cb39fa3cb3c31500a93bb759b9f2f5df9f3093c9b6acebf4fed5d1cf677be4dcd8863d8a22e48d3c1b
+SHA512 (qtshadertools-everywhere-src-6.2.0-rc.tar.xz) = 225c1dd9223e4dd33ec6f23304b90366bb34392bcf0987844d39e60d71cc7a4e4da225e9a74463a53aaf0c9e5ff2cb5907d03c6e812e8412471f3a74a175e8ca
commit 33c6b5075125e2bd3bd8adc68a0f7ae06d2fbd20
Author: Jan Grulich <jgrulich(a)redhat.com>
Date: Mon Sep 13 12:55:48 2021 +0200
Bump build
diff --git a/qt6-qtshadertools.spec b/qt6-qtshadertools.spec
index b9694cf..4341190 100644
--- a/qt6-qtshadertools.spec
+++ b/qt6-qtshadertools.spec
@@ -12,7 +12,7 @@ ExcludeArch: s390x
Summary: Qt6 - Qt Shader Tools module builds on the SPIR-V Open Source Ecosystem
Name: qt6-%{qt_module}
Version: 6.2.0%{?unstable:~%{prerelease}}
-Release: 1%{?dist}
+Release: 2%{?dist}
License: LGPLv3
Url: http://www.qt.io
@@ -112,6 +112,9 @@ popd
%{_qt6_libdir}/metatypes/qt6*_metatypes.json
%changelog
+* Mon Sep 13 2021 Jan Grulich <jgrulich(a)redhat.com> - 6.2.0~beta4-2
+- Skip s390x because of QTBUG-93101
+
* Mon Sep 13 2021 Jan Grulich <jgrulich(a)redhat.com> - 6.2.0~beta4-1
- 6.2.0 - beta4
commit ee1a89c301c17ca94d0e041348a85c7eb70a8e2c
Author: Jan Grulich <jgrulich(a)redhat.com>
Date: Mon Sep 13 12:22:09 2021 +0200
Skip s390x because of QTBUG-93101
diff --git a/qt6-qtshadertools.spec b/qt6-qtshadertools.spec
index f0d8b2b..b9694cf 100644
--- a/qt6-qtshadertools.spec
+++ b/qt6-qtshadertools.spec
@@ -1,3 +1,7 @@
+# FIXME: qt6-qtdeclarative doesn't build on S390x
+# BUG: https://bugreports.qt.io/browse/QTBUG-93101
+ExcludeArch: s390x
+
%global qt_module qtshadertools
%global unstable 1
commit d0099a75a1514c93b1a6d3af70bcb879c1d22a5a
Author: Jan Grulich <jgrulich(a)redhat.com>
Date: Mon Sep 13 08:24:42 2021 +0200
6.2.0 - beta4
diff --git a/.gitignore b/.gitignore
index 697653b..e6d6730 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
/qtshadertools-everywhere-src-6.1.1.tar.xz
/qtshadertools-everywhere-src-6.1.2.tar.xz
/qtshadertools-everywhere-src-6.2.0-beta3.tar.xz
+/qtshadertools-everywhere-src-6.2.0-beta4.tar.xz
diff --git a/qt6-qtshadertools.spec b/qt6-qtshadertools.spec
index 19c0ce2..f0d8b2b 100644
--- a/qt6-qtshadertools.spec
+++ b/qt6-qtshadertools.spec
@@ -2,7 +2,7 @@
%global unstable 1
%if 0%{unstable}
-%global prerelease beta3
+%global prerelease beta4
%endif
Summary: Qt6 - Qt Shader Tools module builds on the SPIR-V Open Source Ecosystem
@@ -108,6 +108,9 @@ popd
%{_qt6_libdir}/metatypes/qt6*_metatypes.json
%changelog
+* Mon Sep 13 2021 Jan Grulich <jgrulich(a)redhat.com> - 6.2.0~beta4-1
+- 6.2.0 - beta4
+
* Mon Aug 30 2021 Jan Grulich <jgrulich(a)redhat.com> - 6.2.0~beta3-1
- 6.2.0 - beta3
diff --git a/sources b/sources
index 91722db..56ab9be 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (qtshadertools-everywhere-src-6.2.0-beta3.tar.xz) = b5bf46575362be20815f5a8c6cba6760c1511eb432ed3659cb87fbda03d1b7ada7cb289020471461480d6a2b1f3e92300869db92561e22fd9428a619428055fd
+SHA512 (qtshadertools-everywhere-src-6.2.0-beta4.tar.xz) = 8f8cd1e1819c372c418e730cfdb3734c8ba457543da400cb39fa3cb3c31500a93bb759b9f2f5df9f3093c9b6acebf4fed5d1cf677be4dcd8863d8a22e48d3c1b
commit a3af2334981033a5d73525e29c39a680f9241dc4
Author: Jan Grulich <jgrulich(a)redhat.com>
Date: Mon Aug 30 14:26:52 2021 +0200
6.2.0 - beta3
diff --git a/.gitignore b/.gitignore
index 20cd935..697653b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
/qtshadertools-everywhere-src-6.1.0.tar.xz
/qtshadertools-everywhere-src-6.1.1.tar.xz
/qtshadertools-everywhere-src-6.1.2.tar.xz
+/qtshadertools-everywhere-src-6.2.0-beta3.tar.xz
diff --git a/qt6-qtshadertools.spec b/qt6-qtshadertools.spec
index 46551ec..19c0ce2 100644
--- a/qt6-qtshadertools.spec
+++ b/qt6-qtshadertools.spec
@@ -1,14 +1,25 @@
%global qt_module qtshadertools
+%global unstable 1
+%if 0%{unstable}
+%global prerelease beta3
+%endif
+
Summary: Qt6 - Qt Shader Tools module builds on the SPIR-V Open Source Ecosystem
Name: qt6-%{qt_module}
-Version: 6.1.2
+Version: 6.2.0%{?unstable:~%{prerelease}}
Release: 1%{?dist}
License: LGPLv3
Url: http://www.qt.io
-%global majmin %(echo %{version} | cut -d. -f1-2)
+%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
# Upstream patches
@@ -34,7 +45,7 @@ Requires: qt6-qtbase-devel%{?_isa}
%prep
-%autosetup -n %{qt_module}-everywhere-src-%{version} -p1
+%autosetup -n %{qt_module}-everywhere-src-%{qt_version}%{?unstable:-%{prerelease}} -p1
%build
@@ -94,8 +105,12 @@ popd
%{_qt6_libdir}/cmake/Qt6ShaderTools/*.cmake
%dir %{_qt6_libdir}/cmake/Qt6ShaderToolsTools/
%{_qt6_libdir}/cmake/Qt6ShaderToolsTools/*.cmake
+%{_qt6_libdir}/metatypes/qt6*_metatypes.json
%changelog
+* Mon Aug 30 2021 Jan Grulich <jgrulich(a)redhat.com> - 6.2.0~beta3-1
+- 6.2.0 - beta3
+
* Thu Aug 12 2021 Jan Grulich <jgrulich(a)redhat.com> - 6.1.2-1
- 6.1.2
diff --git a/sources b/sources
index 37f8e41..91722db 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (qtshadertools-everywhere-src-6.1.2.tar.xz) = 365cf902978593f0179e383d0fe54c70a1433ea9b69b106ad2f0299c823d06a73db5c7af54f99631d2f1d959fd562cbef0bf355728d0af468f62af762e332e41
+SHA512 (qtshadertools-everywhere-src-6.2.0-beta3.tar.xz) = b5bf46575362be20815f5a8c6cba6760c1511eb432ed3659cb87fbda03d1b7ada7cb289020471461480d6a2b1f3e92300869db92561e22fd9428a619428055fd
1 year, 8 months
Architecture specific change in rpms/qt6-qtbase.git
by githook-noreply@fedoraproject.org
The package rpms/qt6-qtbase.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-qtbase.git/commit/?id=4d550dc....
Change:
+ExcludeArch: s390x
Thanks.
Full change:
============
commit 938b33188affa82a5f55e59700a4f8465ecda954
Merge: a5ce979 b69f5ea
Author: Jan Grulich <jgrulich(a)redhat.com>
Date: Mon Oct 4 10:14:44 2021 +0200
Merge branch 'f35' into f34
commit b69f5eadfe87c2ce989d56c63e269ded050f763b
Merge: b990a1d cd8c559
Author: Jan Grulich <jgrulich(a)redhat.com>
Date: Fri Oct 1 09:54:26 2021 +0200
Merge branch 'rawhide' into f35
commit cd8c559cea17dbd077e9baee1a8723c8c7d566eb
Author: Jan Grulich <jgrulich(a)redhat.com>
Date: Thu Sep 30 13:29:28 2021 +0200
Fix build
diff --git a/qt6-qtbase.spec b/qt6-qtbase.spec
index 587c74f..f6a57a2 100644
--- a/qt6-qtbase.spec
+++ b/qt6-qtbase.spec
@@ -36,12 +36,12 @@ BuildRequires: pkgconfig(libsystemd)
## skip for now, until we're better at it --rex
#global tests 1
-%global unstable 0
+#global unstable 0
%global prerelease rc2
Name: qt6-qtbase
Summary: Qt6 - QtBase components
-Version: 6.2.0
+Version: 6.2.0%{?unstable:~%{prerelease}}
Release: 1%{?dist}
# See LGPL_EXCEPTIONS.txt, for exception details
@@ -50,7 +50,7 @@ Url: http://qt-project.org/
%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...
commit be551b8abbb8542c98878e3ec3cb89b3b3b7b36a
Author: Jan Grulich <jgrulich(a)redhat.com>
Date: Thu Sep 30 13:13:13 2021 +0200
6.2.0
diff --git a/.gitignore b/.gitignore
index 2369ab2..858a6cb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@
/qtbase-everywhere-src-6.2.0-beta4.tar.xz
/qtbase-everywhere-src-6.2.0-rc.tar.xz
/qtbase-everywhere-src-6.2.0-rc2.tar.xz
+/qtbase-everywhere-src-6.2.0.tar.xz
diff --git a/qt6-qtbase.spec b/qt6-qtbase.spec
index 220b274..587c74f 100644
--- a/qt6-qtbase.spec
+++ b/qt6-qtbase.spec
@@ -36,14 +36,12 @@ BuildRequires: pkgconfig(libsystemd)
## skip for now, until we're better at it --rex
#global tests 1
-%global unstable 1
-%if 0%{unstable}
+%global unstable 0
%global prerelease rc2
-%endif
Name: qt6-qtbase
Summary: Qt6 - QtBase components
-Version: 6.2.0%{?unstable:~%{prerelease}}
+Version: 6.2.0
Release: 1%{?dist}
# See LGPL_EXCEPTIONS.txt, for exception details
@@ -836,6 +834,9 @@ make check -k ||:
%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 055fdcb..2c4ee68 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (qtbase-everywhere-src-6.2.0-rc2.tar.xz) = d5c5b759115d3caa41412e6d99a30036d89469e92db2495d9cf49f6cf70696881f54da6f8c577ff35a83db4e503def76510af5962d6ed2a4dbda0d06d365b9ca
+SHA512 (qtbase-everywhere-src-6.2.0.tar.xz) = 3ed301a531633e1e72da7833d1eea47edaf7e5474678a16ec29080e34de1d0def7000b68aa96fa18779880e3aa7b1a9b7c0cf699de2b4cba2c7de84442722fda
commit ae8453ab492e1c0a3c5c7bc87b44580a7dbd1e84
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 032d4c6..2369ab2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@
/qtbase-everywhere-src-6.2.0-beta3.tar.xz
/qtbase-everywhere-src-6.2.0-beta4.tar.xz
/qtbase-everywhere-src-6.2.0-rc.tar.xz
+/qtbase-everywhere-src-6.2.0-rc2.tar.xz
diff --git a/qt6-qtbase.spec b/qt6-qtbase.spec
index 6e72d0c..220b274 100644
--- a/qt6-qtbase.spec
+++ b/qt6-qtbase.spec
@@ -38,7 +38,7 @@ BuildRequires: pkgconfig(libsystemd)
%global unstable 1
%if 0%{unstable}
-%global prerelease rc
+%global prerelease rc2
%endif
Name: qt6-qtbase
@@ -836,6 +836,9 @@ make check -k ||:
%changelog
+* Mon Sep 27 2021 Jan Grulich <jgrulich(a)redhat.com> - 6.2.0~rc2-1
+- 6.2.0 - rc2
+
* Sat Sep 18 2021 Jan Grulich <jgrulich(a)redhat.com> - 6.2.0~rc-1
- 6.2.0 - rc
diff --git a/sources b/sources
index 63f79f6..055fdcb 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-SHA512 (qtbase-everywhere-src-6.2.0-beta4.tar.xz) = 505bc408682a6004fdc63705d431018c44f4e696f9f7a58a182d6151de29deefbb18e8e8f18973eccc1d863321a2819dc18a9080051216bbe812acb910e43462
-SHA512 (qtbase-everywhere-src-6.2.0-rc.tar.xz) = ff2a14c026db6ca34c09a0e3b29c13796ccf412bece4a81401bb2948bd60369613c2758632065f13cf95f535bc39bf1dbefd912700b3f49b24b5dbcb02f3252d
+SHA512 (qtbase-everywhere-src-6.2.0-rc2.tar.xz) = d5c5b759115d3caa41412e6d99a30036d89469e92db2495d9cf49f6cf70696881f54da6f8c577ff35a83db4e503def76510af5962d6ed2a4dbda0d06d365b9ca
commit 42df854915d6b7a5c6ffa0aecd07d8aa01930d20
Author: Jan Grulich <jgrulich(a)redhat.com>
Date: Sat Sep 18 21:46:39 2021 +0200
6.2.0 - rc
diff --git a/.gitignore b/.gitignore
index 9feda82..032d4c6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
/qtbase-everywhere-src-6.1.2.tar.xz
/qtbase-everywhere-src-6.2.0-beta3.tar.xz
/qtbase-everywhere-src-6.2.0-beta4.tar.xz
+/qtbase-everywhere-src-6.2.0-rc.tar.xz
diff --git a/qt6-qtbase.spec b/qt6-qtbase.spec
index eee2a68..6e72d0c 100644
--- a/qt6-qtbase.spec
+++ b/qt6-qtbase.spec
@@ -38,13 +38,13 @@ BuildRequires: pkgconfig(libsystemd)
%global unstable 1
%if 0%{unstable}
-%global prerelease beta4
+%global prerelease rc
%endif
Name: qt6-qtbase
Summary: Qt6 - QtBase components
Version: 6.2.0%{?unstable:~%{prerelease}}
-Release: 3%{?dist}
+Release: 1%{?dist}
# See LGPL_EXCEPTIONS.txt, for exception details
License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -836,6 +836,9 @@ make check -k ||:
%changelog
+* Sat Sep 18 2021 Jan Grulich <jgrulich(a)redhat.com> - 6.2.0~rc-1
+- 6.2.0 - rc
+
* Tue Sep 14 2021 Sahana Prasad <sahana(a)redhat.com> - 6.2.0~beta4-3
- Rebuilt with OpenSSL 3.0.0
diff --git a/sources b/sources
index 53ccfa3..63f79f6 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
SHA512 (qtbase-everywhere-src-6.2.0-beta4.tar.xz) = 505bc408682a6004fdc63705d431018c44f4e696f9f7a58a182d6151de29deefbb18e8e8f18973eccc1d863321a2819dc18a9080051216bbe812acb910e43462
+SHA512 (qtbase-everywhere-src-6.2.0-rc.tar.xz) = ff2a14c026db6ca34c09a0e3b29c13796ccf412bece4a81401bb2948bd60369613c2758632065f13cf95f535bc39bf1dbefd912700b3f49b24b5dbcb02f3252d
commit 558c4aaf9a7d1f6c6a5df49a6a6deae7ffda751c
Author: Sahana Prasad <sahana(a)redhat.com>
Date: Tue Sep 14 19:13:11 2021 +0200
Rebuilt with OpenSSL 3.0.0
diff --git a/qt6-qtbase.spec b/qt6-qtbase.spec
index 0c87d7a..eee2a68 100644
--- a/qt6-qtbase.spec
+++ b/qt6-qtbase.spec
@@ -44,7 +44,7 @@ BuildRequires: pkgconfig(libsystemd)
Name: qt6-qtbase
Summary: Qt6 - QtBase components
Version: 6.2.0%{?unstable:~%{prerelease}}
-Release: 2%{?dist}
+Release: 3%{?dist}
# See LGPL_EXCEPTIONS.txt, for exception details
License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -836,6 +836,9 @@ make check -k ||:
%changelog
+* Tue Sep 14 2021 Sahana Prasad <sahana(a)redhat.com> - 6.2.0~beta4-3
+- Rebuilt with OpenSSL 3.0.0
+
* Mon Sep 13 2021 Jan Grulich <jgrulich(a)redhat.com> - 6.2.0~beta4-2
- Skip s390x for qtdeclarative issue
commit 4d550dc675b1b517f785328705d26ddc15b47f03
Author: Jan Grulich <jgrulich(a)redhat.com>
Date: Mon Sep 13 12:20:05 2021 +0200
Skip s390x for qtdeclarative issue
diff --git a/qt6-qtbase.spec b/qt6-qtbase.spec
index 0500149..0c87d7a 100644
--- a/qt6-qtbase.spec
+++ b/qt6-qtbase.spec
@@ -1,3 +1,6 @@
+# FIXME: qt6-qtdeclarative doesn't build on S390x
+# BUG: https://bugreports.qt.io/browse/QTBUG-93101
+ExcludeArch: s390x
# See http://bugzilla.redhat.com/223663
%global multilib_archs x86_64 %{ix86} %{?mips} ppc64 ppc s390x s390 sparc64 sparcv9
@@ -41,7 +44,7 @@ BuildRequires: pkgconfig(libsystemd)
Name: qt6-qtbase
Summary: Qt6 - QtBase components
Version: 6.2.0%{?unstable:~%{prerelease}}
-Release: 1%{?dist}
+Release: 2%{?dist}
# See LGPL_EXCEPTIONS.txt, for exception details
License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -833,6 +836,9 @@ make check -k ||:
%changelog
+* Mon Sep 13 2021 Jan Grulich <jgrulich(a)redhat.com> - 6.2.0~beta4-2
+- Skip s390x for qtdeclarative issue
+
* Fri Sep 10 2021 Jan Grulich <jgrulich(a)redhat.com> - 6.2.0~beta4-1
- 6.2.0 - beta4
commit ffea66615eea10cdb66e638d284c2f4723e99918
Author: Jan Grulich <jgrulich(a)redhat.com>
Date: Fri Sep 10 12:01:55 2021 +0200
6.2.0 - beta4
diff --git a/.gitignore b/.gitignore
index 0a0fe6e..9feda82 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
/qtbase-everywhere-src-6.1.1.tar.xz
/qtbase-everywhere-src-6.1.2.tar.xz
/qtbase-everywhere-src-6.2.0-beta3.tar.xz
+/qtbase-everywhere-src-6.2.0-beta4.tar.xz
diff --git a/qt6-qtbase.spec b/qt6-qtbase.spec
index 56154b8..0500149 100644
--- a/qt6-qtbase.spec
+++ b/qt6-qtbase.spec
@@ -35,13 +35,13 @@ BuildRequires: pkgconfig(libsystemd)
%global unstable 1
%if 0%{unstable}
-%global prerelease beta3
+%global prerelease beta4
%endif
Name: qt6-qtbase
Summary: Qt6 - QtBase components
Version: 6.2.0%{?unstable:~%{prerelease}}
-Release: 4%{?dist}
+Release: 1%{?dist}
# See LGPL_EXCEPTIONS.txt, for exception details
License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -429,7 +429,7 @@ translationdir=%{_qt6_translationdir}
Name: Qt6
Description: Qt6 Configuration
-Version: 6.2.0~beta3
+Version: 6.2.0
EOF
# rpm macros
@@ -495,7 +495,7 @@ mv %{buildroot}/%{_qt6_libexecdir}/ensure_pro_file.cmake %{buildroot}/%{_qt6_lib
%check
# verify Qt6.pc
export PKG_CONFIG_PATH=%{buildroot}%{_libdir}/pkgconfig
-test "$(pkg-config --modversion Qt6)" = "%{version}"
+test "$(pkg-config --modversion Qt6)" = "%{qt_version}"
%if 0%{?tests}
## see tests/README for expected environment (running a plasma session essentially)
## we are not quite there yet
@@ -549,10 +549,10 @@ make check -k ||:
%dir %{_qt6_plugindir}/script/
%dir %{_qt6_plugindir}/sqldrivers/
%dir %{_qt6_plugindir}/styles/
-%{_qt6_plugindir}/networkinformation/libnetworkmanager.so
+%{_qt6_plugindir}/networkinformation/libqnetworkmanager.so
%{_qt6_plugindir}/sqldrivers/libqsqlite.so
-%{_qt6_plugindir}/tls/libcertonlybackend.so
-%{_qt6_plugindir}/tls/libopensslbackend.so
+%{_qt6_plugindir}/tls/libqcertonlybackend.so
+%{_qt6_plugindir}/tls/libqopensslbackend.so
%files common
# mostly empty for now, consider: filesystem/dir ownership, licenses
@@ -833,6 +833,9 @@ make check -k ||:
%changelog
+* Fri Sep 10 2021 Jan Grulich <jgrulich(a)redhat.com> - 6.2.0~beta4-1
+- 6.2.0 - beta4
+
* Wed Sep 08 2021 Rex Dieter <rdieter(a)fedoraproject.org> - 6.2.0~beta3-4
- rebuild
diff --git a/sources b/sources
index f1dd538..53ccfa3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (qtbase-everywhere-src-6.2.0-beta3.tar.xz) = b1b671763a626c6c12894576c82cf2a6846cee9a68b78d465b757fcc4dc6ff33d57496e1ab0db548514381d5b328e2a60fd6d424cbcb5f8b42964cf9084fe29d
+SHA512 (qtbase-everywhere-src-6.2.0-beta4.tar.xz) = 505bc408682a6004fdc63705d431018c44f4e696f9f7a58a182d6151de29deefbb18e8e8f18973eccc1d863321a2819dc18a9080051216bbe812acb910e43462
commit 37cc28ec23b430b60f2aa4b231051549dfb83e7e
Author: Rex Dieter <rdieter(a)gmail.com>
Date: Wed Sep 8 13:30:41 2021 -0500
rebuild
diff --git a/qt6-qtbase.spec b/qt6-qtbase.spec
index 75aa640..56154b8 100644
--- a/qt6-qtbase.spec
+++ b/qt6-qtbase.spec
@@ -41,7 +41,7 @@ BuildRequires: pkgconfig(libsystemd)
Name: qt6-qtbase
Summary: Qt6 - QtBase components
Version: 6.2.0%{?unstable:~%{prerelease}}
-Release: 3%{?dist}
+Release: 4%{?dist}
# See LGPL_EXCEPTIONS.txt, for exception details
License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -833,6 +833,9 @@ make check -k ||:
%changelog
+* Wed Sep 08 2021 Rex Dieter <rdieter(a)fedoraproject.org> - 6.2.0~beta3-4
+- rebuild
+
* Tue Sep 07 2021 Jan Grulich <jgrulich(a)redhat.com> - 6.2.0~beta3-3
- Disable rpath
Resolves: bz#1982699
commit 0317c6fabc11b3053ea3d20e47fc59772dff16c5
Author: Jan Grulich <jgrulich(a)redhat.com>
Date: Tue Sep 7 16:58:28 2021 +0200
Add new files
diff --git a/qt6-qtbase.spec b/qt6-qtbase.spec
index f954859..75aa640 100644
--- a/qt6-qtbase.spec
+++ b/qt6-qtbase.spec
@@ -562,6 +562,7 @@ make check -k ||:
%dir %{_qt6_datadir}/modules
%dir %{_qt6_libdir}/metatypes
%dir %{_qt6_libdir}/cmake/Qt6
+%dir %{_qt6_libdir}/cmake/Qt6/config.tests/
%dir %{_qt6_libdir}/cmake/Qt6/3rdparty/extra-cmake-modules
%dir %{_qt6_libdir}/cmake/Qt6/3rdparty/kwin
%dir %{_qt6_libdir}/cmake/Qt6BuildInternals
@@ -680,6 +681,7 @@ make check -k ||:
%{_qt6_libdir}/libQt6EglFsKmsGbmSupport.so
%{_qt6_libdir}/cmake/Qt6/*.cmake
%{_qt6_libdir}/cmake/Qt6/*.cmake.in
+%{_qt6_libdir}/cmake/Qt6/config.tests/*
%{_qt6_libdir}/cmake/Qt6/ModuleDescription.json.in
%{_qt6_libdir}/cmake/Qt6/QtFileConfigure.txt.in
%{_qt6_libdir}/cmake/Qt6/QtSeparateDebugInfo.Info.plist.in
commit 883f4b7410c4416a24b47039523daa6398e33776
Author: Jan Grulich <jgrulich(a)redhat.com>
Date: Tue Sep 7 15:12:00 2021 +0200
Disable rpath
Resolves: bz#1982699
diff --git a/qt6-qtbase.spec b/qt6-qtbase.spec
index 1908558..f954859 100644
--- a/qt6-qtbase.spec
+++ b/qt6-qtbase.spec
@@ -41,7 +41,7 @@ BuildRequires: pkgconfig(libsystemd)
Name: qt6-qtbase
Summary: Qt6 - QtBase components
Version: 6.2.0%{?unstable:~%{prerelease}}
-Release: 2%{?dist}
+Release: 3%{?dist}
# See LGPL_EXCEPTIONS.txt, for exception details
License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -383,6 +383,7 @@ export MAKEFLAGS="%{?_smp_mflags}"
-DQT_FEATURE_sql_mysql=ON \
-DQT_FEATURE_sql_psql=ON \
-DQT_FEATURE_sql_sqlite=ON \
+ -DQT_FEATURE_rpath=OFF \
%{?dbus_linked:-DQT_FEATURE_dbus_linked=ON} \
%{?pcre:-DQT_FEATURE_system_pcre2=ON} \
%{?sqlite:-DQT_FEATURE_system_sqlite=ON} \
@@ -491,9 +492,6 @@ rm %{buildroot}/%{_bindir}/qt-cmake-private-install.cmake
# Use better location for some new scripts in qtbase-6.0.1
mv %{buildroot}/%{_qt6_libexecdir}/ensure_pro_file.cmake %{buildroot}/%{_qt6_libdir}/cmake/Qt6/ensure_pro_file.cmake
-# Remove useless files
-rm -rf %{buildroot}/%{_qt6_libdir}/cmake/Qt6/config.tests/static_link_order
-
%check
# verify Qt6.pc
export PKG_CONFIG_PATH=%{buildroot}%{_libdir}/pkgconfig
@@ -833,6 +831,10 @@ make check -k ||:
%changelog
+* Tue Sep 07 2021 Jan Grulich <jgrulich(a)redhat.com> - 6.2.0~beta3-3
+- Disable rpath
+ Resolves: bz#1982699
+
* Tue Aug 31 2021 Jan Grulich <jgrulich(a)redhat.com> - 6.2.0~beta3-2
- Fix file conflict with qt5-qttools
- Rebuild against older libglvnd
commit f4d634ab1867a9d1e1502efffc97d35b2e8193a0
Author: Jan Grulich <jgrulich(a)redhat.com>
Date: Tue Aug 31 19:18:26 2021 +0200
Fix file conflict with qt5-qttools and rebuild against older libglvnd
diff --git a/qt6-qtbase.spec b/qt6-qtbase.spec
index 828ce82..1908558 100644
--- a/qt6-qtbase.spec
+++ b/qt6-qtbase.spec
@@ -41,7 +41,7 @@ BuildRequires: pkgconfig(libsystemd)
Name: qt6-qtbase
Summary: Qt6 - QtBase components
Version: 6.2.0%{?unstable:~%{prerelease}}
-Release: 1%{?dist}
+Release: 2%{?dist}
# See LGPL_EXCEPTIONS.txt, for exception details
License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -450,7 +450,7 @@ mkdir %{buildroot}%{_bindir}
pushd %{buildroot}%{_qt6_bindir}
for i in * ; do
case "${i}" in
- qdbuscpp2xml|qdbusxml2cpp)
+ qdbuscpp2xml|qdbusxml2cpp|qtpaths)
ln -v ${i} %{buildroot}%{_bindir}/${i}-qt6
;;
*)
@@ -813,10 +813,10 @@ make check -k ||:
%{_qt6_plugindir}/platforms/libqminimalegl.so
%dir %{_qt6_plugindir}/egldeviceintegrations/
%{_qt6_plugindir}/egldeviceintegrations/libqeglfs-kms-integration.so
-# {_qt6_plugindir}/egldeviceintegrations/libqeglfs-x11-integration.so
+%{_qt6_plugindir}/egldeviceintegrations/libqeglfs-x11-integration.so
%{_qt6_plugindir}/egldeviceintegrations/libqeglfs-kms-egldevice-integration.so
%{_qt6_plugindir}/egldeviceintegrations/libqeglfs-emu-integration.so
-# {_qt6_plugindir}/xcbglintegrations/libqxcb-egl-integration.so
+%{_qt6_plugindir}/xcbglintegrations/libqxcb-egl-integration.so
%endif
# Platforms
%{_qt6_plugindir}/platforms/libqlinuxfb.so
@@ -833,6 +833,10 @@ make check -k ||:
%changelog
+* Tue Aug 31 2021 Jan Grulich <jgrulich(a)redhat.com> - 6.2.0~beta3-2
+- Fix file conflict with qt5-qttools
+- Rebuild against older libglvnd
+
* Mon Aug 30 2021 Jan Grulich <jgrulich(a)redhat.com> - 6.2.0~beta3-1
- 6.2.0 - beta3
commit ccaa9197e5f1fff342b98a9123dcf1cfe323152b
Author: Jan Grulich <jgrulich(a)redhat.com>
Date: Mon Aug 30 14:26:52 2021 +0200
6.2.0 - beta3
diff --git a/.gitignore b/.gitignore
index 86dd337..0a0fe6e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
/qtbase-everywhere-src-6.1.0.tar.xz
/qtbase-everywhere-src-6.1.1.tar.xz
/qtbase-everywhere-src-6.1.2.tar.xz
+/qtbase-everywhere-src-6.2.0-beta3.tar.xz
diff --git a/qt6-qtbase.spec b/qt6-qtbase.spec
index daaaf26..828ce82 100644
--- a/qt6-qtbase.spec
+++ b/qt6-qtbase.spec
@@ -33,16 +33,27 @@ BuildRequires: pkgconfig(libsystemd)
## skip for now, until we're better at it --rex
#global tests 1
+%global unstable 1
+%if 0%{unstable}
+%global prerelease beta3
+%endif
+
Name: qt6-qtbase
Summary: Qt6 - QtBase components
-Version: 6.1.2
+Version: 6.2.0%{?unstable:~%{prerelease}}
Release: 1%{?dist}
# See LGPL_EXCEPTIONS.txt, for exception details
License: LGPLv2 with exceptions or GPLv3 with exceptions
Url: http://qt-project.org/
%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
# https://bugzilla.redhat.com/show_bug.cgi?id=1227295
Source1: qtlogging.ini
@@ -74,9 +85,6 @@ Patch50: qtbase-version-check.patch
# 2. Workaround sysmacros.h (pre)defining major/minor a breaking stuff
Patch51: qtbase-moc-macros.patch
-# don't use relocatable heuristics to guess prefix when using -no-feature-relocatable
-Patch53: qtbase-no-relocatable.patch
-
# drop -O3 and make -O2 by default
Patch54: qtbase-cxxflag.patch
@@ -151,8 +159,12 @@ BuildRequires: pkgconfig(xkeyboard-config)
%global vulkan 1
BuildRequires: pkgconfig(vulkan)
%global egl 1
-BuildRequires: libEGL-devel
+BuildRequires: mesa-libEGL-devel
+BuildRequires: pkgconfig(egl)
BuildRequires: pkgconfig(gbm)
+BuildRequires: pkgconfig(libglvnd)
+BuildRequires: pkgconfig(x11)
+
%global sqlite 1
BuildRequires: pkgconfig(sqlite3) >= 3.7
BuildRequires: pkgconfig(harfbuzz) >= 0.9.42
@@ -308,7 +320,7 @@ Qt6 libraries used for drawing widgets and OpenGL items.
%prep
-%autosetup -n %{qt_module}-everywhere-src-%{version} -p1
+%autosetup -n %{qt_module}-everywhere-src-%{qt_version}%{?unstable:-%{prerelease}} -p1
# move some bundled libs to ensure they're not accidentally used
pushd src/3rdparty
@@ -393,10 +405,6 @@ export MAKEFLAGS="%{?_smp_mflags}"
install -m644 -p -D %{SOURCE1} %{buildroot}%{_qt6_datadir}/qtlogging.ini
-# Thanks OpenSuse
-# Static library created by an example
-rm %{buildroot}%{_prefix}/lib/libpnp_basictools.a
-
# Qt6.pc
mkdir -p %{buildroot}%{_libdir}/pkgconfig
cat << EOF > %{buildroot}%{_libdir}/pkgconfig/Qt6.pc
@@ -420,7 +428,7 @@ translationdir=%{_qt6_translationdir}
Name: Qt6
Description: Qt6 Configuration
-Version: 6.1.2
+Version: 6.2.0~beta3
EOF
# rpm macros
@@ -483,6 +491,9 @@ rm %{buildroot}/%{_bindir}/qt-cmake-private-install.cmake
# Use better location for some new scripts in qtbase-6.0.1
mv %{buildroot}/%{_qt6_libexecdir}/ensure_pro_file.cmake %{buildroot}/%{_qt6_libdir}/cmake/Qt6/ensure_pro_file.cmake
+# Remove useless files
+rm -rf %{buildroot}/%{_qt6_libdir}/cmake/Qt6/config.tests/static_link_order
+
%check
# verify Qt6.pc
export PKG_CONFIG_PATH=%{buildroot}%{_libdir}/pkgconfig
@@ -540,8 +551,10 @@ make check -k ||:
%dir %{_qt6_plugindir}/script/
%dir %{_qt6_plugindir}/sqldrivers/
%dir %{_qt6_plugindir}/styles/
+%{_qt6_plugindir}/networkinformation/libnetworkmanager.so
%{_qt6_plugindir}/sqldrivers/libqsqlite.so
-%{_qt6_libdir}/cmake/Qt6Sql/Qt6QSQLiteDriverPlugin*.cmake
+%{_qt6_plugindir}/tls/libcertonlybackend.so
+%{_qt6_plugindir}/tls/libopensslbackend.so
%files common
# mostly empty for now, consider: filesystem/dir ownership, licenses
@@ -560,25 +573,25 @@ make check -k ||:
%dir %{_qt6_libdir}/cmake/Qt6CoreTools
%dir %{_qt6_libdir}/cmake/Qt6DBus
%dir %{_qt6_libdir}/cmake/Qt6DBusTools
-%dir %{_qt6_libdir}/cmake/Qt6DeviceDiscoverySupport
-%dir %{_qt6_libdir}/cmake/Qt6EglFSDeviceIntegration
-%dir %{_qt6_libdir}/cmake/Qt6EglFsKmsGbmSupport
-%dir %{_qt6_libdir}/cmake/Qt6EglFsKmsSupport
-%dir %{_qt6_libdir}/cmake/Qt6FbSupport
+%dir %{_qt6_libdir}/cmake/Qt6DeviceDiscoverySupportPrivate
+%dir %{_qt6_libdir}/cmake/Qt6EglFSDeviceIntegrationPrivate
+%dir %{_qt6_libdir}/cmake/Qt6EglFsKmsGbmSupportPrivate
+%dir %{_qt6_libdir}/cmake/Qt6EglFsKmsSupportPrivate
+%dir %{_qt6_libdir}/cmake/Qt6FbSupportPrivate
%dir %{_qt6_libdir}/cmake/Qt6Gui
%dir %{_qt6_libdir}/cmake/Qt6GuiTools
%dir %{_qt6_libdir}/cmake/Qt6HostInfo
-%dir %{_qt6_libdir}/cmake/Qt6InputSupport
-%dir %{_qt6_libdir}/cmake/Qt6KmsSupport
+%dir %{_qt6_libdir}/cmake/Qt6FbSupportPrivate
+%dir %{_qt6_libdir}/cmake/Qt6KmsSupportPrivate
%dir %{_qt6_libdir}/cmake/Qt6Network
%dir %{_qt6_libdir}/cmake/Qt6OpenGL
%dir %{_qt6_libdir}/cmake/Qt6OpenGLWidgets
%dir %{_qt6_libdir}/cmake/Qt6PrintSupport
%dir %{_qt6_libdir}/cmake/Qt6Sql
+%dir %{_qt6_libdir}/cmake/Qt6XcbQpaPrivate
%dir %{_qt6_libdir}/cmake/Qt6Test
%dir %{_qt6_libdir}/cmake/Qt6Widgets
%dir %{_qt6_libdir}/cmake/Qt6WidgetsTools
-%dir %{_qt6_libdir}/cmake/Qt6XcbQpa
%dir %{_qt6_libdir}/cmake/Qt6Xml
%if "%{_qt6_bindir}" != "%{_bindir}"
%dir %{_qt6_bindir}
@@ -588,6 +601,7 @@ make check -k ||:
%{_bindir}/qdbuscpp2xml*
%{_bindir}/qdbusxml2cpp*
%{_bindir}/qmake*
+%{_bindir}/qtpaths*
%{_bindir}/qt-cmake
%{_bindir}/qt-cmake-private
%{_bindir}/qt-cmake-standalone-test
@@ -598,6 +612,7 @@ make check -k ||:
%{_qt6_bindir}/qdbuscpp2xml
%{_qt6_bindir}/qdbusxml2cpp
%{_qt6_bindir}/qmake
+%{_qt6_bindir}/qtpaths*
%{_qt6_bindir}/qt-cmake
%{_qt6_bindir}/qt-cmake-private
%{_qt6_bindir}/qt-cmake-private-install.cmake
@@ -687,25 +702,26 @@ make check -k ||:
%{_qt6_libdir}/cmake/Qt6CoreTools/*.cmake
%{_qt6_libdir}/cmake/Qt6DBus/*.cmake
%{_qt6_libdir}/cmake/Qt6DBusTools/*.cmake
-%{_qt6_libdir}/cmake/Qt6DeviceDiscoverySupport/*.cmake
-%{_qt6_libdir}/cmake/Qt6EglFSDeviceIntegration/*.cmake
-%{_qt6_libdir}/cmake/Qt6EglFsKmsGbmSupport/*.cmake
-%{_qt6_libdir}/cmake/Qt6EglFsKmsSupport/*.cmake
-%{_qt6_libdir}/cmake/Qt6FbSupport/*.cmake
+%{_qt6_libdir}/cmake/Qt6DeviceDiscoverySupportPrivate/*.cmake
+%{_qt6_libdir}/cmake/Qt6EglFSDeviceIntegrationPrivate/*.cmake
+%{_qt6_libdir}/cmake/Qt6EglFsKmsGbmSupportPrivate/*.cmake
+%{_qt6_libdir}/cmake/Qt6EglFsKmsSupportPrivate/*.cmake
+%{_qt6_libdir}/cmake/Qt6FbSupportPrivate/*.cmake
%{_qt6_libdir}/cmake/Qt6Gui/*.cmake
%{_qt6_libdir}/cmake/Qt6GuiTools/*.cmake
%{_qt6_libdir}/cmake/Qt6HostInfo/*.cmake
-%{_qt6_libdir}/cmake/Qt6InputSupport/*.cmake
-%{_qt6_libdir}/cmake/Qt6KmsSupport/*.cmake
+%{_qt6_libdir}/cmake/Qt6InputSupportPrivate/*.cmake
+%{_qt6_libdir}/cmake/Qt6KmsSupportPrivate/*.cmake
%{_qt6_libdir}/cmake/Qt6Network/*.cmake
%{_qt6_libdir}/cmake/Qt6OpenGL/*.cmake
%{_qt6_libdir}/cmake/Qt6OpenGLWidgets/*.cmake
%{_qt6_libdir}/cmake/Qt6PrintSupport/*.cmake
%{_qt6_libdir}/cmake/Qt6Sql/*.cmake
+%{_qt6_libdir}/cmake/Qt6Sql/Qt6QSQLiteDriverPlugin*.cmake
%{_qt6_libdir}/cmake/Qt6Test/*.cmake
%{_qt6_libdir}/cmake/Qt6Widgets/*.cmake
%{_qt6_libdir}/cmake/Qt6WidgetsTools/*.cmake
-%{_qt6_libdir}/cmake/Qt6XcbQpa/*.cmake
+%{_qt6_libdir}/cmake/Qt6XcbQpaPrivate/*.cmake
%{_qt6_libdir}/cmake/Qt6Xml/*.cmake
%{_qt6_libdir}/metatypes/*.json
%{_qt6_libdir}/pkgconfig/Qt6.pc
@@ -716,10 +732,10 @@ make check -k ||:
%endif
%{_qt6_libexecdir}/tracegen
## private-devel globs
-%exclude %{_qt6_headerdir}/*/%{version}/
+%exclude %{_qt6_headerdir}/*/%{qt_version}/
%files private-devel
-%{_qt6_headerdir}/*/%{version}/
+%{_qt6_headerdir}/*/%{qt_version}/
%files static
%{_qt6_headerdir}/QtDeviceDiscoverySupport
@@ -797,10 +813,10 @@ make check -k ||:
%{_qt6_plugindir}/platforms/libqminimalegl.so
%dir %{_qt6_plugindir}/egldeviceintegrations/
%{_qt6_plugindir}/egldeviceintegrations/libqeglfs-kms-integration.so
-%{_qt6_plugindir}/egldeviceintegrations/libqeglfs-x11-integration.so
-%{_qt6_plugindir}/xcbglintegrations/libqxcb-egl-integration.so
+# {_qt6_plugindir}/egldeviceintegrations/libqeglfs-x11-integration.so
%{_qt6_plugindir}/egldeviceintegrations/libqeglfs-kms-egldevice-integration.so
%{_qt6_plugindir}/egldeviceintegrations/libqeglfs-emu-integration.so
+# {_qt6_plugindir}/xcbglintegrations/libqxcb-egl-integration.so
%endif
# Platforms
%{_qt6_plugindir}/platforms/libqlinuxfb.so
@@ -808,15 +824,18 @@ make check -k ||:
%{_qt6_plugindir}/platforms/libqoffscreen.so
%{_qt6_plugindir}/platforms/libqxcb.so
%{_qt6_plugindir}/platforms/libqvnc.so
+%{_qt6_plugindir}/platforms/libqvkkhrdisplay.so
%{_qt6_plugindir}/xcbglintegrations/libqxcb-glx-integration.so
# Platformthemes
%{_qt6_plugindir}/platformthemes/libqxdgdesktopportal.so
%{_qt6_plugindir}/platformthemes/libqgtk3.so
%{_qt6_plugindir}/printsupport/libcupsprintersupport.so
-%{_qt6_plugindir}/networkinformationbackends/libnetworkmanagernetworkinformationbackend.so
%changelog
+* Mon Aug 30 2021 Jan Grulich <jgrulich(a)redhat.com> - 6.2.0~beta3-1
+- 6.2.0 - beta3
+
* Thu Aug 12 2021 Jan Grulich <jgrulich(a)redhat.com> - 6.1.2-1
- 6.1.2
diff --git a/qtbase-firebird.patch b/qtbase-firebird.patch
index 9f5c7d6..c794304 100644
--- a/qtbase-firebird.patch
+++ b/qtbase-firebird.patch
@@ -1,21 +1,22 @@
-diff --git a/src/plugins/sqldrivers/configure.json b/src/plugins/sqldrivers/configure.json
-index f738e58a..2cd61e9f 100644
---- a/src/plugins/sqldrivers/configure.json
-+++ b/src/plugins/sqldrivers/configure.json
-@@ -43,10 +43,11 @@
- "ibase": {
- "label": "InterBase",
- "test": {},
-- "headers": "ibase.h",
-+ "headers": "firebird/ibase.h",
- "sources": [
- { "libs": "-lgds32_ms", "condition": "config.win32" },
-- { "libs": "-lgds", "condition": "!config.win32" }
-+ { "libs": "-lgds", "condition": "!config.win32" },
-+ { "libs": "-lfbclient", "condition": "!config.win32" }
- ]
- },
- "mysql": {
+diff --git a/cmake/FindInterbase.cmake b/cmake/FindInterbase.cmake
+index 22f866d8..4ef16e75 100644
+--- a/cmake/FindInterbase.cmake
++++ b/cmake/FindInterbase.cmake
+@@ -19,12 +19,12 @@
+ # The Interbase client library
+
+ find_path(Interbase_INCLUDE_DIR
+- NAMES ibase.h
++ NAMES firebird/ibase.h
+ HINTS ${Interbase_INCLUDEDIR}
+ )
+
+ find_library(Interbase_LIBRARY
+- NAMES firebase_ms fbclient gds
++ NAMES firebase_ms fbclient gds fbclient
+ HINTS ${Interbase_LIBDIR}
+ )
+
diff --git a/src/plugins/sqldrivers/ibase/qsql_ibase_p.h b/src/plugins/sqldrivers/ibase/qsql_ibase_p.h
index 9109c2b4..7477d5ee 100644
--- a/src/plugins/sqldrivers/ibase/qsql_ibase_p.h
diff --git a/qtbase-no-relocatable.patch b/qtbase-no-relocatable.patch
deleted file mode 100644
index c3d555d..0000000
--- a/qtbase-no-relocatable.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp
-index 301c3ab8..bfb28380 100644
---- a/src/corelib/global/qlibraryinfo.cpp
-+++ b/src/corelib/global/qlibraryinfo.cpp
-@@ -624,10 +624,11 @@ static QString getPrefix(
- # if QT_CONFIGURE_CROSSBUILD
- if (group == QLibraryInfo::DevicePaths)
- return QString::fromLocal8Bit(QT_CONFIGURE_PREFIX_PATH);
-+# elif 0 //QT_CONFIG(relocatable)
-+ return getExtPrefixFromHostBinDir();
- # else
-- Q_UNUSED(group);
-+ return QString::fromLocal8Bit(QT_CONFIGURE_PREFIX_PATH);
- # endif
-- return getExtPrefixFromHostBinDir();
- #elif QT_CONFIG(relocatable)
- return getRelocatablePrefix();
- #else
diff --git a/sources b/sources
index f55dd1a..f1dd538 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (qtbase-everywhere-src-6.1.2.tar.xz) = 0f9bf5680268c6dc95c10c28297908c9113a7e3e498ba80ed3ba73cc98b809b38fa610ee3b15f367b6ace2f593842db8d27dc7ec2142737574cfa32cdf57ea91
+SHA512 (qtbase-everywhere-src-6.2.0-beta3.tar.xz) = b1b671763a626c6c12894576c82cf2a6846cee9a68b78d465b757fcc4dc6ff33d57496e1ab0db548514381d5b328e2a60fd6d424cbcb5f8b42964cf9084fe29d
1 year, 8 months
Architecture specific change in rpms/qt6-qtwebsockets.git
by githook-noreply@fedoraproject.org
The package rpms/qt6-qtwebsockets.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-qtwebsockets.git/commit/?id=6....
Change:
+ExcludeArch: s390x
Thanks.
Full change:
============
commit 302094d0521620fa2135ddbe216916b9ab26a813
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 4b2987d..42fb7dc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/qtwebsockets-everywhere-src-6.2.0-rc.tar.xz
/qtwebsockets-everywhere-src-6.2.0-rc2.tar.xz
+/qtwebsockets-everywhere-src-6.2.0.tar.xz
diff --git a/qt6-qtwebsockets.spec b/qt6-qtwebsockets.spec
index c935072..d070f27 100644
--- a/qt6-qtwebsockets.spec
+++ b/qt6-qtwebsockets.spec
@@ -4,8 +4,8 @@ ExcludeArch: s390x
%global qt_module qtwebsockets
-%global unstable 1
-%if 0%{unstable}
+#global unstable 1
+%if 0%{?unstable}
%global prerelease rc2
%endif
@@ -20,7 +20,7 @@ Url: http://qt-project.org/
%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...
@@ -111,6 +111,9 @@ popd
%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 6e03a3c..64531f8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (qtwebsockets-everywhere-src-6.2.0-rc2.tar.xz) = cef1435671045ab2ed3e1377efee6452659e7f93fa418cc9afae1d19425f0d9845d30bccbd7a629f0f628d60ac2ed2f836ec0dedcfd38db6a9b2a9bf55fde3c5
+SHA512 (qtwebsockets-everywhere-src-6.2.0.tar.xz) = 2703aa02065a24c0a14a01974ec687326720bd01f4e23951bf374b305ae62bdb5d6907c132d06b102a367dcf1b666c10327ae9ba8a0f232900b6e28aac6e8ee9
commit 347409afdbb6b48d51a6e4aa70f7a527a22b9b48
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 47afee8..4b2987d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/qtwebsockets-everywhere-src-6.2.0-rc.tar.xz
+/qtwebsockets-everywhere-src-6.2.0-rc2.tar.xz
diff --git a/qt6-qtwebsockets.spec b/qt6-qtwebsockets.spec
index 22c3135..c935072 100644
--- a/qt6-qtwebsockets.spec
+++ b/qt6-qtwebsockets.spec
@@ -6,7 +6,7 @@ ExcludeArch: s390x
%global unstable 1
%if 0%{unstable}
-%global prerelease rc
+%global prerelease rc2
%endif
Summary: Qt6 - WebSockets component
@@ -111,5 +111,8 @@ popd
%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 3041df2..6e03a3c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (qtwebsockets-everywhere-src-6.2.0-rc.tar.xz) = 425a46a7bcf2089965ab3484bdef1903c0bb7c785919f164fdd42961081cc4ca4cd95974a81f1173323067b457a4b95bae608ea1626b37666123b3c18f7e7911
+SHA512 (qtwebsockets-everywhere-src-6.2.0-rc2.tar.xz) = cef1435671045ab2ed3e1377efee6452659e7f93fa418cc9afae1d19425f0d9845d30bccbd7a629f0f628d60ac2ed2f836ec0dedcfd38db6a9b2a9bf55fde3c5
commit 67e70a8e0f7975999e7287f7bbbdc5e30726830a
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..47afee8
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/qtwebsockets-everywhere-src-6.2.0-rc.tar.xz
diff --git a/README.md b/README.md
deleted file mode 100644
index 6f0ca87..0000000
--- a/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# qt6-qtwebsockets
-
-The qt6-qtwebsockets package
diff --git a/qt6-qtwebsockets.spec b/qt6-qtwebsockets.spec
new file mode 100644
index 0000000..22c3135
--- /dev/null
+++ b/qt6-qtwebsockets.spec
@@ -0,0 +1,115 @@
+# FIXME: qt6-qtdeclarative doesn't build on S390x
+# BUG: https://bugreports.qt.io/browse/QTBUG-93101
+ExcludeArch: s390x
+
+%global qt_module qtwebsockets
+
+%global unstable 1
+%if 0%{unstable}
+%global prerelease rc
+%endif
+
+Summary: Qt6 - WebSockets component
+Name: qt6-%{qt_module}
+Version: 6.2.0%{?unstable:~%{prerelease}}
+Release: 1%{?dist}
+
+# See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details
+License: LGPLv2 with exceptions or GPLv3 with exceptions
+Url: http://qt-project.org/
+%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
+
+# filter qml provides
+%global __provides_exclude_from ^%{_qt6_archdatadir}/qml/.*\\.so$
+
+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-qtdeclarative-devel
+
+BuildRequires: pkgconfig(xkbcommon) >= 0.5.0
+BuildRequires: openssl-devel
+
+%description
+The QtWebSockets module implements the WebSocket protocol as specified in RFC
+6455. It solely depends on Qt (no external dependencies).
+
+%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
+
+## .prl/.la file love
+# nuke .prl reference(s) to %%buildroot, excessive (.la-like) libs
+pushd %{buildroot}%{_qt6_libdir}
+for prl_file in libQt6*.prl ; do
+ sed -i -e "/^QMAKE_PRL_BUILD_DIR/d" ${prl_file}
+ if [ -f "$(basename ${prl_file} .prl).so" ]; then
+ rm -fv "$(basename ${prl_file} .prl).la"
+ sed -i -e "/^QMAKE_PRL_LIBS/d" ${prl_file}
+ fi
+done
+popd
+
+
+%ldconfig_scriptlets
+
+%files
+%license LICENSE.*
+%{_qt6_libdir}/libQt6WebSockets.so.6*
+
+%files devel
+%{_qt6_headerdir}/QtWebSockets/
+%{_qt6_libdir}/libQt6WebSockets.so
+%{_qt6_libdir}/libQt6WebSockets.prl
+%{_qt6_libdir}/cmake/Qt6BuildInternals/StandaloneTests/QtWebSocketsTestsConfig.cmake
+%{_qt6_libdir}/cmake/Qt6Qml/QmlPlugins/*.cmake
+%dir %{_qt6_libdir}/cmake/Qt6WebSockets/
+%{_qt6_libdir}/cmake/Qt6WebSockets/*.cmake
+%{_qt6_libdir}/qt6/qml/QtWebSockets/
+%{_qt6_archdatadir}/mkspecs/modules/qt_lib_websockets*.pri
+%{_qt6_libdir}/metatypes/qt6*_metatypes.json
+%{_qt6_datadir}/modules/*.json
+
+%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..3041df2
--- /dev/null
+++ b/sources
@@ -0,0 +1 @@
+SHA512 (qtwebsockets-everywhere-src-6.2.0-rc.tar.xz) = 425a46a7bcf2089965ab3484bdef1903c0bb7c785919f164fdd42961081cc4ca4cd95974a81f1173323067b457a4b95bae608ea1626b37666123b3c18f7e7911
1 year, 8 months
Architecture specific change in rpms/qt6-qtwebchannel.git
by githook-noreply@fedoraproject.org
The package rpms/qt6-qtwebchannel.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-qtwebchannel.git/commit/?id=c....
Change:
+ExcludeArch: s390x
Thanks.
Full change:
============
commit f07c965c6e222e1e5cc035c929932352c77324da
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 e32c9c4..02d55fd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/qtwebchannel-everywhere-src-6.2.0-rc.tar.xz
/qtwebchannel-everywhere-src-6.2.0-rc2.tar.xz
+/qtwebchannel-everywhere-src-6.2.0.tar.xz
diff --git a/qt6-qtwebchannel.spec b/qt6-qtwebchannel.spec
index a432476..0f8823c 100644
--- a/qt6-qtwebchannel.spec
+++ b/qt6-qtwebchannel.spec
@@ -4,8 +4,8 @@ ExcludeArch: s390x
%global qt_module qtwebchannel
-%global unstable 1
-%if 0%{unstable}
+#global unstable 1
+%if 0%{?unstable}
%global prerelease rc2
%endif
@@ -20,7 +20,7 @@ Url: http://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...
@@ -111,6 +111,9 @@ popd
%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 01e6ce5..96c9287 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (qtwebchannel-everywhere-src-6.2.0-rc2.tar.xz) = cc9d7c9c7ca6f9cfa8d0f08b2f5e63aeea03190607f6a3d8bc3de9f50f0142b01d1961412e93cf361756336b1fe81d41359a5435e2e67b1715a05afef1591142
+SHA512 (qtwebchannel-everywhere-src-6.2.0.tar.xz) = 90d602ca9a66f578808eaf6eaed5a3001d852f90edfd8c400bbc246527ca3431e276e04960bb3fffe2deca70263594a24fad6f108378f54e550c9cbdaf83e563
commit 3f2ada449a4d72b3f9af19bcbd5c8f6c7ce63201
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 be65a36..e32c9c4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/qtwebchannel-everywhere-src-6.2.0-rc.tar.xz
+/qtwebchannel-everywhere-src-6.2.0-rc2.tar.xz
diff --git a/qt6-qtwebchannel.spec b/qt6-qtwebchannel.spec
index 931466d..a432476 100644
--- a/qt6-qtwebchannel.spec
+++ b/qt6-qtwebchannel.spec
@@ -6,7 +6,7 @@ ExcludeArch: s390x
%global unstable 1
%if 0%{unstable}
-%global prerelease rc
+%global prerelease rc2
%endif
Summary: Qt6 - WebChannel component
@@ -111,5 +111,8 @@ popd
%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 3abb103..01e6ce5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (qtwebchannel-everywhere-src-6.2.0-rc.tar.xz) = 254b2210415d60b32a57f343418925e61c25a9248a34116eb83da649616ad1e18d2619048b02245bcfb7bdcf740564f4356a1009954fc8a6137be8b1fa511ae3
+SHA512 (qtwebchannel-everywhere-src-6.2.0-rc2.tar.xz) = cc9d7c9c7ca6f9cfa8d0f08b2f5e63aeea03190607f6a3d8bc3de9f50f0142b01d1961412e93cf361756336b1fe81d41359a5435e2e67b1715a05afef1591142
commit ca065617bb57ff24b449dfc0031174c7e24bcfd5
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..be65a36
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/qtwebchannel-everywhere-src-6.2.0-rc.tar.xz
diff --git a/README.md b/README.md
deleted file mode 100644
index 91f2d85..0000000
--- a/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# qt6-qtwebchannel
-
-The qt6-qtwebchannel package
diff --git a/qt6-qtwebchannel.spec b/qt6-qtwebchannel.spec
new file mode 100644
index 0000000..931466d
--- /dev/null
+++ b/qt6-qtwebchannel.spec
@@ -0,0 +1,115 @@
+# FIXME: qt6-qtdeclarative doesn't build on S390x
+# BUG: https://bugreports.qt.io/browse/QTBUG-93101
+ExcludeArch: s390x
+
+%global qt_module qtwebchannel
+
+%global unstable 1
+%if 0%{unstable}
+%global prerelease rc
+%endif
+
+Summary: Qt6 - WebChannel component
+Name: qt6-%{qt_module}
+Version: 6.2.0%{?unstable:~%{prerelease}}
+Release: 1%{?dist}
+
+# See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details
+License: LGPLv2 with exceptions or GPLv3 with exceptions
+Url: http://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
+
+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-qtdeclarative-devel
+BuildRequires: qt6-qtwebsockets-devel
+
+BuildRequires: pkgconfig(xkbcommon) >= 0.5.0
+BuildRequires: openssl-devel
+
+%description
+The Qt WebChannel module provides a library for seamless integration of C++
+and QML applications with HTML/JavaScript clients. Any QObject can be
+published to remote clients, where its public API becomes available.
+
+%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
+
+
+## .prl/.la file love
+# nuke .prl reference(s) to %%buildroot, excessive (.la-like) libs
+pushd %{buildroot}%{_qt6_libdir}
+for prl_file in libQt6*.prl ; do
+ sed -i -e "/^QMAKE_PRL_BUILD_DIR/d" ${prl_file}
+ if [ -f "$(basename ${prl_file} .prl).so" ]; then
+ rm -fv "$(basename ${prl_file} .prl).la"
+ sed -i -e "/^QMAKE_PRL_LIBS/d" ${prl_file}
+ fi
+done
+popd
+
+
+%ldconfig_scriptlets
+
+%files
+%license LICENSE.*
+%{_qt6_libdir}/libQt6WebChannel.so.6*
+%{_qt6_archdatadir}/qml/QtWebChannel/
+
+%files devel
+%{_qt6_headerdir}/QtWebChannel/
+%{_qt6_libdir}/libQt6WebChannel.so
+%{_qt6_libdir}/libQt6WebChannel.prl
+%{_qt6_libdir}/cmake/Qt6BuildInternals/StandaloneTests/QtWebChannelTestsConfig.cmake
+%{_qt6_libdir}/cmake/Qt6Qml/QmlPlugins/*.cmake
+%dir %{_qt6_libdir}/cmake/Qt6WebChannel/
+%{_qt6_libdir}/cmake/Qt6WebChannel/*.cmake
+%{_qt6_archdatadir}/mkspecs/modules/qt_lib_webchannel*.pri
+%{_qt6_libdir}/metatypes/qt6*_metatypes.json
+%{_qt6_datadir}/modules/*.json
+
+%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..3abb103
--- /dev/null
+++ b/sources
@@ -0,0 +1 @@
+SHA512 (qtwebchannel-everywhere-src-6.2.0-rc.tar.xz) = 254b2210415d60b32a57f343418925e61c25a9248a34116eb83da649616ad1e18d2619048b02245bcfb7bdcf740564f4356a1009954fc8a6137be8b1fa511ae3
1 year, 8 months