diff --git a/qt5-qtbase.spec b/qt5-qtbase.spec index bccb411..404daac 100644 --- a/qt5-qtbase.spec +++ b/qt5-qtbase.spec @@ -20,7 +20,7 @@ %endif Name: qt5-qtbase -Version: 5.15.7.20221110git.51258629 +Version: 5.15.7.20221224git.e2c2a352 Release: 1mamba Summary: A multiplatform, C++ GUI application development framework Group: System/Libraries @@ -55,6 +55,7 @@ BuildRequires: libat-spi2-core-devel BuildRequires: libcairo-devel BuildRequires: libcups-devel BuildRequires: libdbus-devel +BuildRequires: libdouble-conversion-devel BuildRequires: libdrm-devel BuildRequires: libfontconfig-devel BuildRequires: libfreetds-devel @@ -65,6 +66,7 @@ BuildRequires: libglib-devel BuildRequires: libglvnd-devel BuildRequires: libgtk3-devel BuildRequires: libharfbuzz-devel +BuildRequires: libicu-devel BuildRequires: libinput-devel BuildRequires: libjpeg-devel BuildRequires: libkrb5-devel @@ -74,11 +76,13 @@ BuildRequires: libmtdev-devel BuildRequires: libodbc-devel BuildRequires: libopenssl-devel BuildRequires: libpango-devel +BuildRequires: libpcre2-devel BuildRequires: libperl BuildRequires: libpng-devel BuildRequires: libpostgresql-devel BuildRequires: libsqlite-devel BuildRequires: libstdc++6-devel +BuildRequires: libsystemd-devel BuildRequires: libts-devel BuildRequires: libudev-devel BuildRequires: libxcb-devel @@ -128,16 +132,6 @@ This package contains all plugins that don't have their own package yet. %package -n libQt5Core Group: System/Libraries Summary: Qt5 core library -%if "%{_qt5_libdir}" != "%{_libdir}" -Prereq: /etc/ld.so.conf.d -%endif -#Provides: libqt = %{version} -#Provides: libqt5 = %{version} -#Provides: qt = %{version} -#Provides: qt5 = %{version} -#Provides: qt5-x11 = %{version} -#Provides: libqt5 -#Requires: libicu Requires: %{name}-common = %{?epoch:%epoch:}%{version}-%{release} %description -n libQt5Core @@ -411,6 +405,9 @@ This package contains the Sybase and Microsoft SQL plugin. # Don't clean build at the end %global __spec_rmbuild_cmd /bin/true +# FIXME: workaround for requirements not extracted by rpmdeps from libQt5Core.so.5.15.7 +%global __brp_elfperms /bin/true + %debug_package %prep @@ -545,7 +542,7 @@ popd %endif # install file with rpm macros -install -d %{buildroot}%{_sysconfdir}/rpm +install -d %{buildroot}%{_rpmmacrodir} echo "\ %%_qt5_version %{version} %%_qt5_prefix %%{_libdir}/qt5 @@ -560,14 +557,14 @@ echo "\ %%_qt5_sysconfdir %%{_sysconfdir}/xdg %%_qt5_translationdir %%{_qt5_datadir}/translations %%_qt5_qmake %%{_qt5_bindir}/qmake" \ - > %{buildroot}%{_sysconfdir}/rpm/macros.qt5 + > %{buildroot}%{_rpmmacrodir}/macros.qt5 %if "%{build_qtwebengine}" != "1" rm -f %{buildroot}%{_qt5_translationdir}/qtwebengine_*.qm %endif -# Workaround for qmake creating wrong .la files (since 5.13.0) -rm -f %{buildroot}%{_libdir}/*.la +## Workaround for qmake creating wrong .la files (since 5.13.0) +#rm -f %{buildroot}%{_libdir}/*.la %clean [ "%{buildroot}" != / ] && rm -rf %{buildroot} @@ -714,9 +711,9 @@ rm -f %{buildroot}%{_libdir}/*.la %files devel %defattr(-,root,root) -%{_sysconfdir}/rpm/macros.qt5 %{_sysconfdir}/profile.d/%{name}.csh %{_sysconfdir}/profile.d/%{name}.sh +%{_rpmmacrodir}/macros.qt5 %{_bindir}/fixqt4headers.pl* %{_bindir}/syncqt.pl* %{_bindir}/moc* @@ -787,6 +784,10 @@ rm -f %{buildroot}%{_libdir}/*.la %endif %changelog +* Mon Jan 02 2023 Silvan Calarco 5.15.7.20221224git.e2c2a352-1mamba +- update to 5.15.7.20221224git.e2c2a352 +- libQt5Core: fix for missing requirements + * Fri Nov 11 2022 Silvan Calarco 5.15.7.20221110git.51258629-1mamba - update to 5.15.7.20221110git.51258629 - qt5-qtbase-plugins: require qt5-qtimageformats