rpms
/
qt5-qtbase
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'f37' into f36

This commit is contained in:
Jan Grulich 2022-08-25 08:42:27 +02:00
parent 702f992cc1 71355ca33b
commit c61c9f6216
3 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -9,3 +9,4 @@
/kde-5.15-rollup-20220516.patch.gz
/qtbase-everywhere-opensource-src-5.15.5.tar.xz
/kde-5.15-rollup-20220713.patch.gz
/kde-5.15-rollup-20220824.patch.gz

16
qt5-qtbase.spec
View File

@ -61,7 +61,7 @@ BuildRequires: pkgconfig(libsystemd)
Name: qt5-qtbase
Summary: Qt5 - QtBase components
Version: 5.15.5
Release: 2%{?dist}
Release: 4%{?dist}
# See LGPL_EXCEPTIONS.txt, for exception details
License: LGPLv2 with exceptions or GPLv3 with exceptions
@ -140,9 +140,9 @@ Patch90: %{name}-gcc11.patch
# https://invent.kde.org/qt/qt/qtbase, kde/5.15 branch
# git diff v5.15.5-lts-lgpl..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-20220713.patch.gz
Patch100: kde-5.15-rollup-20220824.patch.gz
# HACK to make 'fedpkg sources' consider it 'used"
Source100: kde-5.15-rollup-20220713.patch.gz
Source100: kde-5.15-rollup-20220824.patch.gz
# CVS-2021-38593
Patch101: qtbase-everywhere-src-5.15.4-cve-2021-38593.patch
@ -1097,6 +1097,15 @@ fi
%changelog
* Wed Aug 24 2022 Jan Grulich <jgrulich@redhat.com> - 5.15.5-4
- Update to latest changes from Qt patch collection
* Mon Aug 01 2022 Frantisek Zatloukal <fzatlouk@redhat.com> - 5.15.5-3
- Rebuilt for ICU 71.1
* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 5.15.5-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Wed Jul 13 2022 Jan Grulich <jgrulich@redhat.com> - 5.15.5-1
- 5.15.5
@ -1120,7 +1129,6 @@ fi
* Fri Apr 01 2022 Than Ngo <than@redhat.com> - 5.15.3-2
- bz#2070958, enable zstd
>>>>>>> rawhide
* Fri Mar 04 2022 Jan Grulich <jgrulich@redhat.com> - 5.15.3-1
- 5.15.3 + kde-5.15 fixes

2
sources
View File

@ -1,2 +1,2 @@
SHA512 (qtbase-everywhere-opensource-src-5.15.5.tar.xz) = ce80eedc88abbd5a200bacc10a8e94adc1ef2122ac220715ba084adf1e32d67f2dc66168503de5fb5b5a6ab15f7a75ca23dc9956aed12ead994a8ffa6291ef87
SHA512 (kde-5.15-rollup-20220713.patch.gz) = ad352cf917e77c6ff77ed981e96ad423c2fed6b61d03d36231b0d5d1609fb1d09bc1eaeced19f0b3d3aee317135f345ce1f7b1886ae6a63d16043c4c1b879649
SHA512 (kde-5.15-rollup-20220824.patch.gz) = 8ba47cb33eb8c03a05756c822013a94e99d5c7b66dbf1f30672b89c296479c8c2e3e0bd33e67f01473d1e44439ca57c11a9dc05d28ff671b56f471ffb675a0f9