diff --git a/qt6-qtsvg.spec b/qt6-qtsvg.spec index 5881f5e08bf4989a1e93fbacce7f442b3ada2b1b..b0fff86d91ede5f850219e1de0e4dc32297c4d8e 100644 --- a/qt6-qtsvg.spec +++ b/qt6-qtsvg.spec @@ -1,17 +1,17 @@ - %global qt_module qtsvg %global examples 1 -%define short_version 6.5 +%bcond_with doc Summary: Qt6 - Support for rendering and displaying SVG Name: qt6-%{qt_module} -Version: 6.5.2 -Release: 2 -License: LGPLv3 or GPLv2+ -Url: http://www.qt.io -Source0: https://download.qt.io/official_releases/qt/%{short_version}/%{version}/submodules/%{qt_module}-everywhere-src-%{version}.tar.xz +Version: 6.8.2 +Release: 1 +License: LGPL-3.0-only OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +Url: https://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-src-%{version}.tar.xz # filter plugin provides %global __provides_exclude_from ^%{_qt6_plugindir}/.*\\.so$ @@ -25,6 +25,10 @@ BuildRequires: pkgconfig(xkbcommon) >= 0.4.1 BuildRequires: qt6-qtbase-private-devel %{?_qt6:Requires: %{_qt6}%{?_isa} = %{_qt6_version}} +Obsoletes: qt6-qtsvg-examples < %{version} +%if %{with doc} +BuildRequires: /usr/bin/qdoc-qt6 +%endif %description Scalable Vector Graphics (SVG) is an XML-based language for describing @@ -34,28 +38,33 @@ displaying SVG drawings in widgets and on other paint devices. %package devel Summary: Development files for %{name} Requires: %{name}%{?_isa} = %{version}-%{release} -Requires: qt6-qtbase-devel%{?_isa} +Requires: qt6-qtbase-devel%{?_isa} >= %{version} %description devel %{summary}. -%if 0%{?examples} -%package examples -Summary: Programming examples for %{name} -Requires: %{name}%{?_isa} = %{version}-%{release} -%description examples -%{summary}. -%endif +%package doc +Summary: Documentation for %{qt_module} +Buildarch: noarch + +%description doc +Documentation for %{qt_module}. %prep %autosetup -n %{qt_module}-everywhere-src-%{version} -p1 - %build -%cmake_qt6 -DQT_BUILD_EXAMPLES:BOOL=%{?examples:ON}%{!?examples:OFF} +%cmake_qt6 %cmake_build +%if %{with doc} +%cmake_build --target docs +%endif + %install %cmake_install +%if %{with doc} +DESTDIR="%{buildroot}" %{__cmake} --build %{__cmake_builddir} --target install_docs +%endif ## .prl/.la file love # nuke .prl reference(s) to %%buildroot, excessive (.la-like) libs @@ -69,9 +78,9 @@ for prl_file in libQt6*.prl ; do done popd - %files %license LICENSES/GPL* LICENSES/LGPL* +%{_qt6_archdatadir}/sbom/%{qt_module}-%{version}.spdx %{_qt6_libdir}/libQt6Svg.so.6* %{_qt6_libdir}/libQt6SvgWidgets.so.6* %{_qt6_plugindir}/iconengines/libqsvgicon.so @@ -91,16 +100,20 @@ popd %{_qt6_libdir}/cmake/Qt6Svg/*.cmake %dir %{_qt6_libdir}/cmake/Qt6SvgWidgets/ %{_qt6_libdir}/cmake/Qt6SvgWidgets/*.cmake -%{_qt6_archdatadir}/metatypes/qt6*_metatypes.json -%{_qt6_archdatadir}/modules/*.json +%{_qt6_metatypesdir}/qt6*_metatypes.json +%{_qt6_descriptionsdir}/*.json %{_qt6_libdir}/pkgconfig/*.pc -%if 0%{?examples} -%files examples -%{_qt6_examplesdir}/ +%if %{with doc} +%files doc +%{_docdir}/qt6/* %endif %changelog +* Sat Feb 01 2025 Funda Wang - 6.8.2-1 +- update to 6.8.2 +- conditioned documentation build + * Wed Nov 20 2024 Funda Wang - 6.5.2-2 - adopt to new cmake macro diff --git a/qtsvg-everywhere-src-6.5.2.tar.xz b/qtsvg-everywhere-src-6.5.2.tar.xz deleted file mode 100644 index 3061e0b5285e056dffa4ad190b9600c25596447e..0000000000000000000000000000000000000000 Binary files a/qtsvg-everywhere-src-6.5.2.tar.xz and /dev/null differ diff --git a/qtsvg-everywhere-src-6.8.2.tar.xz b/qtsvg-everywhere-src-6.8.2.tar.xz new file mode 100644 index 0000000000000000000000000000000000000000..3388a25a853d2e9653de883b0765311a3ad6b29b Binary files /dev/null and b/qtsvg-everywhere-src-6.8.2.tar.xz differ