diff --git a/.gitignore b/.gitignore index b8645ed..64a28f3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -SOURCES/kde-5.15-rollup-20211206.patch.gz +SOURCES/kde-5.15-rollup-20220131.patch.gz SOURCES/qtbase-everywhere-src-5.15.2.tar.xz diff --git a/.qt5-qtbase.metadata b/.qt5-qtbase.metadata index eca8585..cbea672 100644 --- a/.qt5-qtbase.metadata +++ b/.qt5-qtbase.metadata @@ -1,2 +1,2 @@ -3c0fc9122c7ddebc77de7aef627d866d6519c1eb SOURCES/kde-5.15-rollup-20211206.patch.gz +a732b8be038bfff5e60c34ea85e9bfa85db393e1 SOURCES/kde-5.15-rollup-20220131.patch.gz b5ad67fc6381ad7fae0296944734198488d096a3 SOURCES/qtbase-everywhere-src-5.15.2.tar.xz diff --git a/SPECS/qt5-qtbase.spec b/SPECS/qt5-qtbase.spec index 0e57c91..f2758f5 100644 --- a/SPECS/qt5-qtbase.spec +++ b/SPECS/qt5-qtbase.spec @@ -57,7 +57,7 @@ BuildRequires: pkgconfig(libsystemd) Name: qt5-qtbase Summary: Qt5 - QtBase components Version: 5.15.2 -Release: 28%{?dist} +Release: 29%{?dist} # See LGPL_EXCEPTIONS.txt, for exception details @@ -143,9 +143,9 @@ Patch90: %{name}-gcc11.patch # https://invent.kde.org/qt/qt/qtbase, kde/5.15 branch # git diff v5.15.2..HEAD | gzip > kde-5.15-rollup-$(date +%Y%m%d).patch.gz # patch100 in lookaside cache due to large'ish size -- rdieter -Patch100: kde-5.15-rollup-20211206.patch.gz +Patch100: kde-5.15-rollup-20220131.patch.gz # HACK to make 'fedpkg sources' consider it 'used" -Source100: kde-5.15-rollup-20211206.patch.gz +Source100: kde-5.15-rollup-20220131.patch.gz Patch101: 0068-Bump-version.patch Patch102: qtbase-CVE-2021-38593.patch @@ -1119,6 +1119,12 @@ fi %changelog +* Mon Jan 31 2022 Jan Grulich - 5.15.2-29 +- Sync with Fedora: + - sync kde/5.15 branch patches + + Resolves: bz#2018876 + * Tue Dec 07 2021 Jan Grulich - 5.15.2-28 - Sync with Fedora: - sync kde/5.15 branch patches