pool/AppStream
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 1157299 from home:alarrosa:branches:KDE:Frameworks5

Browse Source 
- 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.


This fixes the following file conflict:

found conflict of appstream-qt6-devel-1.0.2-150600.1.1.x86_64 with libAppStreamQt-devel-0.15.6-150500.1.1.x86_64
  /usr/lib64/libAppStreamQt.so
  /usr/include/AppStreamQt/appstreamqt_export.h
  /usr/include/AppStreamQt/bundle.h
  /usr/include/AppStreamQt/category.h
  /usr/include/AppStreamQt/component.h
  /usr/include/AppStreamQt/contentrating.h
  /usr/include/AppStreamQt/icon.h
  /usr/include/AppStreamQt/image.h
  /usr/include/AppStreamQt/launchable.h
  /usr/include/AppStreamQt/metadata.h
  /usr/include/AppStreamQt/pool.h
  /usr/include/AppStreamQt/provided.h
  /usr/include/AppStreamQt/relation.h
  /usr/include/AppStreamQt/release.h
  /usr/include/AppStreamQt/screenshot.h
  /usr/include/AppStreamQt/spdx.h
  /usr/include/AppStreamQt/suggested.h
  /usr/include/AppStreamQt/translation.h
  /usr/include/AppStreamQt/utils.h
  /usr/include/AppStreamQt/version.h
  /usr/include/AppStreamQt/video.h
  /usr/lib64/cmake/AppStreamQt/AppStreamQtConfig.cmake
  /usr/lib64/cmake/AppStreamQt/AppStreamQtConfigVersion.cmake

OBS-URL: https://build.opensuse.org/request/show/1157299
OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/AppStream?expand=0&rev=118
This commit is contained in:
Christophe Marin 2024-03-12 22:10:41 +00:00 committed by Git OBS Bridge
parent c7a34c051d
commit f336f0534e
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
AppStream.changes
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> Fri Mar 1 09:46:46 UTC 2024 - Christophe Marin <christophe@krop.fr>

6
AppStream.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package AppStream # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -15,6 +15,7 @@
# Please submit bugfixes or comments via https://bugs.opensuse.org/ # Please submit bugfixes or comments via https://bugs.opensuse.org/
# #
%global flavor @BUILD_FLAVOR@%{nil} %global flavor @BUILD_FLAVOR@%{nil}
%if "%flavor" == "qt6" %if "%flavor" == "qt6"
%define pkg_suffix -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 License: GPL-2.0-or-later AND LGPL-2.1-or-later
Requires: libAppStreamQt%{libAppStreamQt_sover} = %{version} Requires: libAppStreamQt%{libAppStreamQt_sover} = %{version}
Requires: libappstream%{libappstream_sover} = %{version} Requires: libappstream%{libappstream_sover} = %{version}
Conflicts: libAppStreamQt-devel < 1.0
%description -n appstream-qt6-devel %description -n appstream-qt6-devel
This package contains all necessary include files, libraries, This package contains all necessary include files, libraries,
configuration files and development tools (with manual pages) needed to configuration files and development tools (with manual pages) needed to
compile and link applications using the Qt bindings for AppStream. compile and link applications using the Qt bindings for AppStream.
%else %else
%package -n libappstream%{libappstream_sover} %package -n libappstream%{libappstream_sover}
Summary: The main library for AppStream Summary: The main library for AppStream
License: GPL-2.0-or-later AND LGPL-2.1-or-later License: GPL-2.0-or-later AND LGPL-2.1-or-later
@ -267,6 +270,7 @@ rm -r %{buildroot}%{_libdir}/pkgconfig
%{_libdir}/libAppStreamQt.so %{_libdir}/libAppStreamQt.so
%else %else
%files lang -f %{name}.lang %files lang -f %{name}.lang
%files %files