Sync with Fedora:
- sync kde/5.15 branch patches Resolves: bz#2018876
This commit is contained in:
parent
e8dbfe2c07
commit
a0e3a8eed1
|
@ -8,3 +8,4 @@
|
|||
/qtbase-everywhere-src-5.15.2.tar.xz
|
||||
/kde-5.15-rollup-20210907.patch.gz
|
||||
/kde-5.15-rollup-20211012.patch.gz
|
||||
/kde-5.15-rollup-20211206.patch.gz
|
||||
|
|
|
@ -57,7 +57,7 @@ BuildRequires: pkgconfig(libsystemd)
|
|||
Name: qt5-qtbase
|
||||
Summary: Qt5 - QtBase components
|
||||
Version: 5.15.2
|
||||
Release: 27%{?dist}
|
||||
Release: 28%{?dist}
|
||||
|
||||
|
||||
# See LGPL_EXCEPTIONS.txt, for exception details
|
||||
|
@ -143,7 +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-20211012.patch.gz
|
||||
Patch100: kde-5.15-rollup-20211206.patch.gz
|
||||
# HACK to make 'fedpkg sources' consider it 'used"
|
||||
Source100: kde-5.15-rollup-20211206.patch.gz
|
||||
Patch101: 0068-Bump-version.patch
|
||||
|
||||
Patch102: qtbase-CVE-2021-38593.patch
|
||||
|
@ -681,6 +683,9 @@ EOF
|
|||
mkdir -p %{buildroot}%{_qt5_headerdir}/QtXcb
|
||||
install -m 644 src/plugins/platforms/xcb/*.h %{buildroot}%{_qt5_headerdir}/QtXcb/
|
||||
|
||||
# drop Qt5Bootstrap from -static (#2017661)
|
||||
rm -f %{buildroot}%{_qt5_libdir}/libQt5Bootstrap.*a
|
||||
rm -f %{buildroot}%{_qt5_libdir}/libQt5Bootstrap.prl
|
||||
|
||||
%check
|
||||
# verify Qt5.pc
|
||||
|
@ -953,8 +958,6 @@ fi
|
|||
#{_qt5_archdatadir}/mkspecs/modules/qt_lib_*_private.pri
|
||||
|
||||
%files static
|
||||
%{_qt5_libdir}/libQt5Bootstrap.*a
|
||||
%{_qt5_libdir}/libQt5Bootstrap.prl
|
||||
%{_qt5_headerdir}/QtOpenGLExtensions/
|
||||
%{_qt5_libdir}/libQt5OpenGLExtensions.*a
|
||||
%{_qt5_libdir}/libQt5OpenGLExtensions.prl
|
||||
|
@ -1116,6 +1119,12 @@ fi
|
|||
|
||||
|
||||
%changelog
|
||||
* Tue Dec 07 2021 Jan Grulich <jgrulich@redhat.com> - 5.15.2-28
|
||||
- Sync with Fedora:
|
||||
- sync kde/5.15 branch patches
|
||||
|
||||
Resolves: bz#2018876
|
||||
|
||||
* Mon Oct 18 2021 Jan Grulich <jgrulich@redhat.com> - 5.15.2-27
|
||||
- Sync with Fedora:
|
||||
- sync kde/5.15 branch patches
|
||||
|
|
2
sources
2
sources
|
@ -1,2 +1,2 @@
|
|||
SHA512 (qtbase-everywhere-src-5.15.2.tar.xz) = a549bfaf867d746ff744ab224eb65ac1bdcdac7e8457dfa379941b2b225a90442fcfc1e1175b9afb1f169468f8130b7ab917c67be67156520a4bfb5c92d304f9
|
||||
SHA512 (kde-5.15-rollup-20211012.patch.gz) = e265b53b179c68f6ada3f05126b067003f4c6a7e0d7262dac6e6a2c4fcbae9f554b3d69c987c7173c45cbbcc79810c169ae038906418a8b6ad0009a69660e0f9
|
||||
SHA512 (kde-5.15-rollup-20211206.patch.gz) = fd5a79e8d6cfbd9c1e559ce85f74ae461d054116a40d174a781095a2cc0571dffa32f7e26931652ac734d8064d00792650dbb8e1b1d1286db3c0072c943b2a47
|
||||
|
|
Loading…
Reference in New Issue