fix dependency hell
This commit is contained in:
parent
8ea4b127d7
commit
6acb7ea10f
3 changed files with 9 additions and 5 deletions
|
|
@ -4,7 +4,7 @@
|
||||||
|
|
||||||
Name: sonic-win
|
Name: sonic-win
|
||||||
Version: 6.6.4
|
Version: 6.6.4
|
||||||
Release: 10%{?dist}
|
Release: 11%{?dist}
|
||||||
Summary: KDE Window manager
|
Summary: KDE Window manager
|
||||||
|
|
||||||
License: BSD-2-Clause AND BSD-3-Clause AND CC0-1.0 AND GPL-2.0-only AND GPL-2.0-or-later AND GPL-3.0-only AND GPL-3.0-or-later AND LGPL-2.0-only AND LGPL-2.0-or-later AND LGPL-2.1-only AND LGPL-2.1-or-later AND LGPL-3.0-only AND (GPL-2.0-only OR GPL-3.0-only) AND (LGPL-2.1-only OR LGPL-3.0-only) AND MIT
|
License: BSD-2-Clause AND BSD-3-Clause AND CC0-1.0 AND GPL-2.0-only AND GPL-2.0-or-later AND GPL-3.0-only AND GPL-3.0-or-later AND LGPL-2.0-only AND LGPL-2.0-or-later AND LGPL-2.1-only AND LGPL-2.1-or-later AND LGPL-3.0-only AND (GPL-2.0-only OR GPL-3.0-only) AND (LGPL-2.1-only OR LGPL-3.0-only) AND MIT
|
||||||
|
|
@ -134,7 +134,7 @@ Obsoletes: kwin-gles < 5
|
||||||
Obsoletes: kwin-gles-libs < 5
|
Obsoletes: kwin-gles-libs < 5
|
||||||
|
|
||||||
# Split of X11 variant into subpackage
|
# Split of X11 variant into subpackage
|
||||||
Obsoletes: kwin < 5.19.5-3
|
Obsoletes: kwin < %{version}-%{release}
|
||||||
|
|
||||||
#Requires: kwin-wayland = %{version}-%{release}
|
#Requires: kwin-wayland = %{version}-%{release}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,7 @@
|
||||||
Name: sonic-desktop-interface
|
Name: sonic-desktop-interface
|
||||||
Summary: Plasma Desktop shell
|
Summary: Plasma Desktop shell
|
||||||
Version: 6.6.4
|
Version: 6.6.4
|
||||||
Release: 10%{?dist}
|
Release: 11%{?dist}
|
||||||
|
|
||||||
License: BSD-2-Clause AND BSD-3-Clause AND CC0-1.0 AND GPL-2.0-only AND GPL-2.0-or-later AND GPL-3.0-only AND LGPL-2.0-only AND LGPL-2.0-or-later AND LGPL-2.1-only AND LGPL-2.1-or-later AND LGPL-3.0-only AND (GPL-2.0-only OR GPL-3.0-only) AND (LGPL-2.1-only OR LGPL-3.0-only)
|
License: BSD-2-Clause AND BSD-3-Clause AND CC0-1.0 AND GPL-2.0-only AND GPL-2.0-or-later AND GPL-3.0-only AND LGPL-2.0-only AND LGPL-2.0-or-later AND LGPL-2.1-only AND LGPL-2.1-or-later AND LGPL-3.0-only AND (GPL-2.0-only OR GPL-3.0-only) AND (LGPL-2.1-only OR LGPL-3.0-only)
|
||||||
#URL: https://invent.kde.org/plasma/%{name}
|
#URL: https://invent.kde.org/plasma/%{name}
|
||||||
|
|
@ -212,6 +212,7 @@ Conflicts: kde-l10n < 15.12.3-4
|
||||||
Conflicts: kde-settings < 39.1-7
|
Conflicts: kde-settings < 39.1-7
|
||||||
|
|
||||||
Conflicts: plasma-desktop
|
Conflicts: plasma-desktop
|
||||||
|
Obsoletes: plasma-desktop < %{version}-%{release}
|
||||||
|
|
||||||
%description
|
%description
|
||||||
%{summary}.
|
%{summary}.
|
||||||
|
|
|
||||||
|
|
@ -7,7 +7,7 @@
|
||||||
Name: sonic-workspace
|
Name: sonic-workspace
|
||||||
Summary: Plasma workspace, applications and applets
|
Summary: Plasma workspace, applications and applets
|
||||||
Version: 6.6.4
|
Version: 6.6.4
|
||||||
Release: 10%{?dist}
|
Release: 11%{?dist}
|
||||||
|
|
||||||
# Automatically converted from old format: BSD-2-Clause AND BSD-3-Clause AND CC0-1.0 AND GPL-2.0-only AND GPL-2.0-or-later AND GPL-3.0-only AND LGPL-2.0-only AND LGPL-2.0-or-later AND LGPL-2.1-only AND LGPL-2.1-or-later AND LGPL-3.0-only AND LGPL-3.0-or-later AND (GPL-2.0-only OR GPL-3.0-only) AND (LGPL-2.1-only OR LGPL-3.0-only) AND MIT - review is highly recommended.
|
# Automatically converted from old format: BSD-2-Clause AND BSD-3-Clause AND CC0-1.0 AND GPL-2.0-only AND GPL-2.0-or-later AND GPL-3.0-only AND LGPL-2.0-only AND LGPL-2.0-or-later AND LGPL-2.1-only AND LGPL-2.1-or-later AND LGPL-3.0-only AND LGPL-3.0-or-later AND (GPL-2.0-only OR GPL-3.0-only) AND (LGPL-2.1-only OR LGPL-3.0-only) AND MIT - review is highly recommended.
|
||||||
License: BSD-2-Clause AND BSD-3-Clause AND CC0-1.0 AND GPL-2.0-only AND GPL-2.0-or-later AND GPL-3.0-only AND LGPL-2.0-only AND LGPL-2.0-or-later AND LGPL-2.1-only AND LGPL-2.1-or-later AND LGPL-3.0-only AND LGPL-3.0-or-later AND (GPL-2.0-only OR GPL-3.0-only) AND (LGPL-2.1-only OR LGPL-3.0-only) AND MIT
|
License: BSD-2-Clause AND BSD-3-Clause AND CC0-1.0 AND GPL-2.0-only AND GPL-2.0-or-later AND GPL-3.0-only AND LGPL-2.0-only AND LGPL-2.0-or-later AND LGPL-2.1-only AND LGPL-2.1-or-later AND LGPL-3.0-only AND LGPL-3.0-or-later AND (GPL-2.0-only OR GPL-3.0-only) AND (LGPL-2.1-only OR LGPL-3.0-only) AND MIT
|
||||||
|
|
@ -285,7 +285,7 @@ BuildRequires: pkgconfig(iso-codes)
|
||||||
Requires: iso-codes
|
Requires: iso-codes
|
||||||
|
|
||||||
# Split of Xorg session into subpackage
|
# Split of Xorg session into subpackage
|
||||||
Obsoletes: plasma-workspace < 5.19.5-2
|
Obsoletes: plasma-workspace <= %{plasma_version}
|
||||||
|
|
||||||
# khotkeys was dropped
|
# khotkeys was dropped
|
||||||
Obsoletes: khotkeys < 6
|
Obsoletes: khotkeys < 6
|
||||||
|
|
@ -303,6 +303,7 @@ Recommends: xwaylandvideobridge
|
||||||
Obsoletes: %{oldname}-wayland < 6.4.1-2
|
Obsoletes: %{oldname}-wayland < 6.4.1-2
|
||||||
Conflicts: %{oldname}-wayland < 6.4.1-2
|
Conflicts: %{oldname}-wayland < 6.4.1-2
|
||||||
Conflicts: plasma-workspace-x11
|
Conflicts: plasma-workspace-x11
|
||||||
|
Conflicts: plasma-workspace
|
||||||
Provides: sonic-workspace = %{version}-%{release}
|
Provides: sonic-workspace = %{version}-%{release}
|
||||||
Provides: sonic-workspace%{?_isa} = %{version}-%{release}
|
Provides: sonic-workspace%{?_isa} = %{version}-%{release}
|
||||||
|
|
||||||
|
|
@ -335,6 +336,8 @@ Requires: %{name}-common = %{version}-%{release}
|
||||||
# consider splitting out plasma_packagestructure content later
|
# consider splitting out plasma_packagestructure content later
|
||||||
Provides: plasma-packagestructure = %{version}-%{release}
|
Provides: plasma-packagestructure = %{version}-%{release}
|
||||||
Conflicts: plasma-workspace-x11-libs
|
Conflicts: plasma-workspace-x11-libs
|
||||||
|
Conflicts: plasma-workspace-libs
|
||||||
|
Obsoletes: plasma-workspace-libs < %{version}-%{release}
|
||||||
%description libs
|
%description libs
|
||||||
%{summary}.
|
%{summary}.
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue