diff --git a/qt5-qtdeclarative.spec b/qt5-qtdeclarative.spec index a19d9cb699bde8ad4f34aca733bc311134e7164f..9c9d7c445884c90dad01bdc3cea20051044d28f0 100644 --- a/qt5-qtdeclarative.spec +++ b/qt5-qtdeclarative.spec @@ -1,23 +1,18 @@ -%define anolis_release 2 +%define anolis_release 3 %define _lto_cflags %{nil} +%global majmin %(echo %{version} | cut -d. -f1-2) %global qt_module qtdeclarative +%global __provides_exclude_from ^%{_qt5_archdatadir}/qml/.*\\.so$ -Summary: Qt5 - QtDeclarative component Name: qt5-%{qt_module} Version: 5.15.8 Release: %{anolis_release}%{?dist} - -# See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details +Summary: Qt5 - QtDeclarative component License: LGPLv2 with exceptions or GPLv3 with exceptions Url: http://www.qt.io -%global majmin %(echo %{version} | cut -d. -f1-2) Source0: https://download.qt.io/official_releases/qt/%{majmin}/%{version}/submodules/%{qt_module}-everywhere-opensource-src-%{version}.tar.xz -## upstream patches -## repo: https://invent.kde.org/qt/qt/qtdeclarative -## branch: kde/5.15 -## git format-patch v5.15.8-lts-lgpl Patch1: 0001-Document-that-StyledText-also-supports-nbsp-and-quot.patch Patch2: 0002-Support-apos-in-styled-text.patch Patch3: 0003-Remove-unused-QPointer-QQuickPointerMask.patch @@ -40,91 +35,69 @@ Patch19: 0019-QQuickItem-avoid-emitting-signals-during-destruction.patch Patch20: 0020-a11y-track-item-enabled-state.patch Patch21: 0021-Make-QaccessibleQuickWidget-private-API.patch -## upstreamable patches Patch100: %{name}-gcc11.patch -Patch101: qtdeclarative-5.15.0-FixMaxXMaxYExtent.patch +Patch101: %{qt_module}-5.15.0-FixMaxXMaxYExtent.patch -# filter qml provides -%global __provides_exclude_from ^%{_qt5_archdatadir}/qml/.*\\.so$ - -Obsoletes: qt5-qtjsbackend < 5.2.0 -Obsoletes: qt5-qtdeclarative-render2d < 5.7.1-10 - -BuildRequires: make -BuildRequires: gcc-c++ -BuildRequires: qt5-rpm-macros -BuildRequires: qt5-qtbase-devel >= %{version} -BuildRequires: qt5-qtbase-private-devel +BuildRequires: make gcc-c++ qt5-rpm-macros qt5-qtbase-devel >= %{version} +BuildRequires: qt5-qtbase-private-devel python%{python3_pkgversion} %{?_qt5:Requires: %{_qt5} = %{_qt5_version}} -BuildRequires: python%{python3_pkgversion} +%if 0%{?tests} +BuildRequires: dbus-x11 mesa-dri-drivers time xorg-x11-server-Xvfb +%endif + +Obsoletes: qt5-qtjsbackend < 5.2.0 %{name}-render2d < 5.7.1-10 %if 0%{?bootstrap} Obsoletes: %{name}-examples < %{version}-%{release} %global no_examples CONFIG-=compile_examples %endif -%if 0%{?tests} -BuildRequires: dbus-x11 -BuildRequires: mesa-dri-drivers -BuildRequires: time -BuildRequires: xorg-x11-server-Xvfb -%endif - %description -%{summary}. +This package contains base tools, like string, xml, and network handling. %package devel Summary: Development files for %{name} -Obsoletes: qt5-qtjsbackend-devel < 5.2.0 -Obsoletes: qt5-qtdeclarative-render2d-devel < 5.7.1-10 +Obsoletes: qt5-qtjsbackend-devel < 5.2.0 %{name}-render2d-devel < 5.7.1-10 Provides: %{name}-private-devel = %{version}-%{release} -Requires: %{name} = %{version}-%{release} -Requires: qt5-qtbase-devel +Requires: %{name} = %{version}-%{release} qt5-qtbase-devel + %description devel -%{summary}. +The %{name}-devel provides libraries and header files for %{name}. %package static Summary: Static library files for %{name} Requires: %{name}-devel = %{version}-%{release} + %description static -%{summary}. +The %{name}-static provides Static library files for %{name}. %package examples Summary: Programming examples for %{name} Requires: %{name} = %{version}-%{release} -%description examples -%{summary}. +%description examples +The %{name}-examples provides Programming examples for %{name}. %prep %autosetup -n %{qt_module}-everywhere-src-%{version} -p1 - %build - -# HACK so calls to "python" get what we want ln -s %{__python3} python export PATH=`pwd`:$PATH - %qmake_qt5 - %make_build - %install %make_install INSTALL_ROOT=%{buildroot} -# hardlink files to %{_bindir}, add -qt5 postfix to not conflict mkdir %{buildroot}%{_bindir} pushd %{buildroot}%{_qt5_bindir} for i in * ; do case "${i}" in - # qt4 conflicts qmlplugindump|qmlprofiler) ln -v ${i} %{buildroot}%{_bindir}/${i}-qt5 ln -sv ${i} ${i}-qt5 ;; - # qtchooser stuff qml|qmlbundle|qmlmin|qmlscene) ln -v ${i} %{buildroot}%{_bindir}/${i} ln -v ${i} %{buildroot}%{_bindir}/${i}-qt5 @@ -137,8 +110,6 @@ for i in * ; do done popd -## .prl/.la file love -# nuke .prl reference(s) to %%buildroot, excessive (.la-like) libs pushd %{buildroot}%{_qt5_libdir} for prl_file in libQt5*.prl ; do sed -i -e "/^QMAKE_PRL_BUILD_DIR/d" ${prl_file} @@ -147,7 +118,6 @@ for prl_file in libQt5*.prl ; do done popd - %check %if 0%{?tests} export CTEST_OUTPUT_ON_FAILURE=1 @@ -160,22 +130,23 @@ time \ make check -k -C tests ||: %endif - %files %license LICENSE.LGPL* +%{_qt5_archdatadir}/qml/ +%{_qt5_plugindir}/qmltooling/ %{_qt5_libdir}/libQt5Qml.so.5* %{_qt5_libdir}/libQt5QmlModels.so.5* %{_qt5_libdir}/libQt5QmlWorkerScript.so.5* %{_qt5_libdir}/libQt5Quick.so.5* -%{_qt5_libdir}/libQt5QuickWidgets.so.5* %{_qt5_libdir}/libQt5QuickParticles.so.5* %{_qt5_libdir}/libQt5QuickShapes.so.5* %{_qt5_libdir}/libQt5QuickTest.so.5* -%{_qt5_plugindir}/qmltooling/ -%{_qt5_archdatadir}/qml/ +%{_qt5_libdir}/libQt5QuickWidgets.so.5* %files devel %{_bindir}/qml* +%{_qt5_archdatadir}/mkspecs/modules/*.pri +%{_qt5_archdatadir}/mkspecs/features/*.prf %{_qt5_bindir}/qml* %{_qt5_headerdir}/Qt*/ %{_qt5_libdir}/libQt5Qml.so @@ -189,24 +160,24 @@ make check -k -C tests ||: %{_qt5_libdir}/cmake/* %{_qt5_libdir}/metatypes/qt5*_metatypes.json %{_qt5_libdir}/pkgconfig/Qt5*.pc -%{_qt5_archdatadir}/mkspecs/modules/*.pri -%{_qt5_archdatadir}/mkspecs/features/*.prf %files static -%{_qt5_libdir}/libQt5QmlDevTools.a -%{_qt5_libdir}/libQt5QmlDevTools.prl %{_qt5_libdir}/libQt5PacketProtocol.a %{_qt5_libdir}/libQt5PacketProtocol.prl %{_qt5_libdir}/libQt5QmlDebug.a %{_qt5_libdir}/libQt5QmlDebug.prl +%{_qt5_libdir}/libQt5QmlDevTools.a +%{_qt5_libdir}/libQt5QmlDevTools.prl %if ! 0%{?no_examples:1} %files examples %{_qt5_examplesdir}/ %endif - %changelog +* Fri Apr 14 2023 Jing Zhang - 5.15.8-3 +- Refact spec + * Thu Mar 30 2023 mgb01105731 - 5.15.8-2 - Del Specific Fields