From 84eecc6d39f0aea3c6c931166d0c83de4dfc29f6 Mon Sep 17 00:00:00 2001 From: krop <> Date: Jun 04 2025 19:02:15 +0000 Subject: Update AppStream to version 1.0.5 / rev 52 via SR 1281899 https://build.opensuse.org/request/show/1281899 by user krop + dimstar_suse --- diff --git a/.files b/.files index a8a79e5..6695293 100644 Binary files a/.files and b/.files differ diff --git a/.rev b/.rev index 3dcb080..ff92637 100644 --- a/.rev +++ b/.rev @@ -569,4 +569,12 @@ Features: <comment>Update to 1.0.5</comment> <requestid>1273709</requestid> </revision> + <revision rev="52" vrev="2"> + <srcmd5>b17a3caae81c3300072cfd2c2818f3d4</srcmd5> + <version>1.0.5</version> + <time>1749061653</time> + <user>dimstar_suse</user> + <comment></comment> + <requestid>1281899</requestid> + </revision> </revisionlist> diff --git a/AppStream.changes b/AppStream.changes index 4622296..726401c 100644 --- a/AppStream.changes +++ b/AppStream.changes @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri May 30 08:17:19 UTC 2025 - Antonio Larrosa <alarrosa@suse.com> + +- Make qt6 the default qt flavor and qt5 the flavor built + separately and disable the qt5 flavor in SLE16 where we don't + want to have Qt5 libraries. + +------------------------------------------------------------------- Wed Apr 30 15:23:00 UTC 2025 - Christophe Marin <christophe@krop.fr> - Update to 1.0.5 diff --git a/AppStream.spec b/AppStream.spec index d0f8ee7..7dd6fa4 100644 --- a/AppStream.spec +++ b/AppStream.spec @@ -17,12 +17,16 @@ %global flavor @BUILD_FLAVOR@%{nil} -%if "%flavor" == "qt6" -%define pkg_suffix -qt6 -%define qt6 1 -%define min_qt_version 6.2.4 -%else +%if "%flavor" == "qt5" %define min_qt_version 5.15 +%define qt5 1 +%define pkg_suffix -qt5 + +%if 0%{?suse_version} == 1600 && ! 0%{?is_opensuse} +ExclusiveArch: donotbuild +%endif +%else +%define min_qt_version 6.2.4 %if 0%{?sle_version} >= 150400 && 0%{?is_opensuse} || 0%{?sle_version} >= 150600 || 0%{?suse_version} > 1500 %bcond_without vala %endif @@ -60,12 +64,12 @@ BuildRequires: itstool BuildRequires: meson >= 0.59 BuildRequires: pkgconfig BuildRequires: xsltproc -%if 0%{?qt6} -BuildRequires: pkgconfig(Qt6Core) >= %{min_qt_version} -BuildRequires: pkgconfig(Qt6Test) >= %{min_qt_version} -%else +%if 0%{?qt5} BuildRequires: pkgconfig(Qt5Core) >= %{min_qt_version} BuildRequires: pkgconfig(Qt5Test) >= %{min_qt_version} +%else +BuildRequires: pkgconfig(Qt6Core) >= %{min_qt_version} +BuildRequires: pkgconfig(Qt6Test) >= %{min_qt_version} %endif BuildRequires: pkgconfig(gdk-pixbuf-2.0) BuildRequires: pkgconfig(gio-2.0) @@ -87,7 +91,30 @@ BuildRequires: vala AppStream-Core makes it easy to access application information from the AppStream database over a nice GObject-based interface. -%if 0%{?qt6} +%if 0%{?qt5} +%package -n libAppStreamQt5-%{libAppStreamQt_sover} +Summary: Qt 5 bindings for AppStream +License: GPL-2.0-or-later AND LGPL-2.1-or-later + +%description -n libAppStreamQt5-%{libAppStreamQt_sover} +The Qt 5 bindings for AppStream. + +%package -n appstream-qt5-devel +Summary: Header files for AppStream's Qt 5 bindings +License: GPL-2.0-or-later AND LGPL-2.1-or-later +Requires: libAppStreamQt5-%{libAppStreamQt_sover} = %{version} +Requires: libappstream%{libappstream_sover} = %{version} +# Renamed after the 1.0.0 release +Provides: libAppStreamQt-devel = %{version} +Obsoletes: libAppStreamQt-devel < %{version} + +%description -n appstream-qt5-devel +This package contains all necessary include files, libraries, +configuration files and development tools (with manual pages) needed to +compile and link applications using the Qt bindings for AppStream. + +%else + %package -n libAppStreamQt%{libAppStreamQt_sover} Summary: Qt 6 bindings for AppStream License: GPL-2.0-or-later AND LGPL-2.1-or-later @@ -106,7 +133,6 @@ Conflicts: libAppStreamQt-devel < 1.0 This package contains all necessary include files, libraries, configuration files and development tools (with manual pages) needed to compile and link applications using the Qt bindings for AppStream. -%else %package -n libappstream%{libappstream_sover} Summary: The main library for AppStream @@ -115,27 +141,6 @@ License: GPL-2.0-or-later AND LGPL-2.1-or-later %description -n libappstream%{libappstream_sover} The main library for AppStream. -%package -n libAppStreamQt5-%{libAppStreamQt_sover} -Summary: Qt 5 bindings for AppStream -License: GPL-2.0-or-later AND LGPL-2.1-or-later - -%description -n libAppStreamQt5-%{libAppStreamQt_sover} -The Qt 5 bindings for AppStream. - -%package -n appstream-qt5-devel -Summary: Header files for AppStream's Qt 5 bindings -License: GPL-2.0-or-later AND LGPL-2.1-or-later -Requires: libAppStreamQt5-%{libAppStreamQt_sover} = %{version} -Requires: libappstream%{libappstream_sover} = %{version} -# Renamed after the 1.0.0 release -Provides: libAppStreamQt-devel = %{version} -Obsoletes: libAppStreamQt-devel < %{version} - -%description -n appstream-qt5-devel -This package contains all necessary include files, libraries, -configuration files and development tools (with manual pages) needed to -compile and link applications using the Qt bindings for AppStream. - %package compose Summary: Support for appstreamcli compose License: GPL-2.0-or-later AND LGPL-2.1-or-later @@ -218,10 +223,10 @@ GObject introspection bindings for interfaces provided by AppStream. %define build_vapi false %endif -%if 0%{?qt6} -%define options -Dqt=true -Dqt-versions=6 -Dvapi=false -Dcompose=false -Dgir=false +%if 0%{?qt5} +%define options -Dqt=true -Dqt-versions=5 -Dvapi=false -Dcompose=false -Dgir=false %else -%define options -Dqt=true -Dqt-versions=5 -Dcompose=true -Dvapi=%{build_vapi} +%define options -Dqt=true -Dqt-versions=6 -Dcompose=true -Dvapi=%{build_vapi} %endif %if %{with gcc13} @@ -238,8 +243,8 @@ export CC=gcc-13 CXX=g++-13 # Unneeded test file rm -r %{buildroot}%{_datadir}/installed-tests -# Only keep the Qt6 library when using the qt6 flavor -%if 0%{?qt6} +# Only keep the Qt5 library when using the qt5 flavor +%if 0%{?qt5} rm %{buildroot}%{_bindir}/appstreamcli rm %{buildroot}%{_libdir}/libappstream.so* rm -r %{buildroot}%{_datadir}/{appstream,doc,gettext,locale,man,metainfo} @@ -252,24 +257,23 @@ rm -r %{buildroot}%{_libdir}/pkgconfig %check %meson_test -%if 0%{?qt6} -%ldconfig_scriptlets -n libAppStreamQt%{libAppStreamQt_sover} +%if 0%{?qt5} +%ldconfig_scriptlets -n libAppStreamQt5-%{libAppStreamQt_sover} %else %ldconfig_scriptlets -n libappstream%{libappstream_sover} -%ldconfig_scriptlets -n libAppStreamQt5-%{libAppStreamQt_sover} +%ldconfig_scriptlets -n libAppStreamQt%{libAppStreamQt_sover} %ldconfig_scriptlets -n libappstream-compose%{libappstream_compose_sover} %endif -%if 0%{?qt6} -%files -n libAppStreamQt%{libAppStreamQt_sover} -%{_libdir}/libAppStreamQt.so.%{libAppStreamQt_sover} -%{_libdir}/libAppStreamQt.so.%{version} - -%files -n appstream-qt6-devel -%{_includedir}/AppStreamQt/ -%{_libdir}/cmake/AppStreamQt/ -%{_libdir}/libAppStreamQt.so +%if 0%{?qt5} +%files -n libAppStreamQt5-%{libAppStreamQt_sover} +%{_libdir}/libAppStreamQt5.so.%{libAppStreamQt_sover} +%{_libdir}/libAppStreamQt5.so.%{version} +%files -n appstream-qt5-devel +%{_includedir}/AppStreamQt5/ +%{_libdir}/cmake/AppStreamQt5/ +%{_libdir}/libAppStreamQt5.so %else %files lang -f %{name}.lang @@ -288,14 +292,14 @@ rm -r %{buildroot}%{_libdir}/pkgconfig %{_libdir}/libappstream.so.%{libappstream_sover} %{_libdir}/libappstream.so.%{version} -%files -n libAppStreamQt5-%{libAppStreamQt_sover} -%{_libdir}/libAppStreamQt5.so.%{libAppStreamQt_sover} -%{_libdir}/libAppStreamQt5.so.%{version} +%files -n libAppStreamQt%{libAppStreamQt_sover} +%{_libdir}/libAppStreamQt.so.%{libAppStreamQt_sover} +%{_libdir}/libAppStreamQt.so.%{version} -%files -n appstream-qt5-devel -%{_includedir}/AppStreamQt5/ -%{_libdir}/cmake/AppStreamQt5/ -%{_libdir}/libAppStreamQt5.so +%files -n appstream-qt6-devel +%{_includedir}/AppStreamQt/ +%{_libdir}/cmake/AppStreamQt/ +%{_libdir}/libAppStreamQt.so %files compose %{_datadir}/metainfo/org.freedesktop.appstream.compose.metainfo.xml diff --git a/_multibuild b/_multibuild index 5b385f1..7a1e5d5 100644 --- a/_multibuild +++ b/_multibuild @@ -1,3 +1,3 @@ <multibuild> - <flavor>qt6</flavor> + <flavor>qt5</flavor> </multibuild>