SHA256
1
0
forked from pool/AppStream

Accepting request 1157387 from KDE:Frameworks5

- Add conflict in appstream-qt6-devel with
  libAppStreamQt-devel < 1.0. This is required to fix a file
  conflict in SLE with the old libAppStreamQt-devel package.

OBS-URL: https://build.opensuse.org/request/show/1157387
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/AppStream?expand=0&rev=46
This commit is contained in:
Ana Guerrero 2024-03-15 19:28:53 +00:00 committed by Git OBS Bridge
commit 170184bb8e
2 changed files with 12 additions and 1 deletions

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Tue Mar 12 16:47:37 UTC 2024 - Antonio Larrosa <alarrosa@suse.com>
- Add conflict in appstream-qt6-devel with
libAppStreamQt-devel < 1.0. This is required to fix a file
conflict in SLE with the old libAppStreamQt-devel package.
-------------------------------------------------------------------
Fri Mar 1 09:46:46 UTC 2024 - Christophe Marin <christophe@krop.fr>

View File

@ -1,7 +1,7 @@
#
# spec file for package AppStream
#
# Copyright (c) 2023 SUSE LLC
# Copyright (c) 2024 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -15,6 +15,7 @@
# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
%global flavor @BUILD_FLAVOR@%{nil}
%if "%flavor" == "qt6"
%define pkg_suffix -qt6
@ -98,12 +99,14 @@ Summary: Header files for AppStream's Qt 6 bindings
License: GPL-2.0-or-later AND LGPL-2.1-or-later
Requires: libAppStreamQt%{libAppStreamQt_sover} = %{version}
Requires: libappstream%{libappstream_sover} = %{version}
Conflicts: libAppStreamQt-devel < 1.0
%description -n appstream-qt6-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 libappstream%{libappstream_sover}
Summary: The main library for AppStream
License: GPL-2.0-or-later AND LGPL-2.1-or-later
@ -267,6 +270,7 @@ rm -r %{buildroot}%{_libdir}/pkgconfig
%{_libdir}/libAppStreamQt.so
%else
%files lang -f %{name}.lang
%files