diff --git a/.gitignore b/.gitignore index 41a8a9f..b2fb11b 100644 --- a/.gitignore +++ b/.gitignore @@ -36,6 +36,7 @@ /qtbase-everywhere-src-6.9.0.tar.xz /qtbase-everywhere-src-6.9.1.tar.xz /qtbase-everywhere-src-6.9.2.tar.xz +/qtbase-everywhere-src-6.9.3.tar.xz /qtbase-everywhere-src-6.10.0-rc.tar.xz /qtbase-everywhere-src-6.10.0.tar.xz /qtbase-everywhere-src-6.10.1.tar.xz diff --git a/qt6-qtbase.spec b/qt6-qtbase.spec index 382a945..08926b4 100644 --- a/qt6-qtbase.spec +++ b/qt6-qtbase.spec @@ -440,7 +440,11 @@ translationdir=%{_qt6_translationdir} Name: Qt6 Description: Qt6 Configuration +<<<<<<< HEAD +Version: 6.9.3 +======= Version: 6.10.1 +>>>>>>> f43 EOF # rpm macros @@ -982,14 +986,8 @@ make check -k ||: * Wed Oct 29 2025 Jan Grulich - 6.10.0-2 - Backport: Wayland - convey preference for server side decorations -* Tue Oct 07 2025 Jan Grulich - 6.10.0-1 -- 6.10.0 - -* Tue Sep 30 2025 Gwyn Ciesla - 6.10.0~rc-2 -- Firebird 5 rebuild - -* Thu Sep 25 2025 Jan Grulich - 6.10.0~rc-1 -- 6.10.0 RC +* Mon Oct 20 2025 Jan Grulich - 6.9.3-1 +- 6.9.3 * Thu Aug 28 2025 Jan Grulich - 6.9.2-1 - 6.9.2