Skip to content

Commit

Permalink
tools: Drop long-obsolete package replacements
Browse files Browse the repository at this point in the history
All of these happened more than four years ago, and are irrelevant for
all our supported OSes and their supported upgrade paths.

This reverts commit 23fadbd, plus a few
more cleanups.
  • Loading branch information
martinpitt committed Dec 5, 2024
1 parent da61756 commit b7bb31f
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 18 deletions.
10 changes: 0 additions & 10 deletions tools/cockpit.spec
Original file line number Diff line number Diff line change
Expand Up @@ -260,14 +260,6 @@ troubleshooting, interactive command-line sessions, and more.
%package bridge
Summary: Cockpit bridge server-side component
Requires: glib-networking
# 233 dropped jquery.js, pages started to bundle it (commit 049e8b8dce)
Conflicts: cockpit-dashboard < 233
Conflicts: cockpit-networkmanager < 233
Conflicts: cockpit-storaged < 233
Conflicts: cockpit-system < 233
Conflicts: cockpit-tests < 233
Conflicts: cockpit-docker < 233
Obsoletes: cockpit-pcp < 326

%description bridge
The Cockpit bridge component installed server side and runs commands on the
Expand Down Expand Up @@ -308,7 +300,6 @@ Provides: cockpit-shell = %{version}-%{release}
Provides: cockpit-systemd = %{version}-%{release}
Provides: cockpit-tuned = %{version}-%{release}
Provides: cockpit-users = %{version}-%{release}
Obsoletes: cockpit-dashboard < %{version}-%{release}
%if 0%{?rhel}
Requires: NetworkManager >= 1.6
Requires: sos
Expand Down Expand Up @@ -342,7 +333,6 @@ Requires: openssl
Requires: glib2 >= 2.50.0
Requires: (selinux-policy >= %{_selinux_policy_version} if selinux-policy-%{selinuxtype})
Requires(post): (policycoreutils if selinux-policy-%{selinuxtype})
Conflicts: firewalld < 0.6.0-1
Recommends: sscg >= 2.3
Recommends: system-logos
Suggests: sssd-dbus >= 2.6.2
Expand Down
9 changes: 1 addition & 8 deletions tools/debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,7 @@ Depends: ${misc:Depends},
${python3:Depends},
glib-networking
Recommends: openssh-client
Breaks: cockpit-ws (<< 181.x),
Replaces: cockpit-dashboard (<< 170.x), cockpit-ws (<< 181.x), cockpit-pcp (<< 236)
Replaces: cockpit-pcp (<< 236)
Provides: cockpit-pcp
Conflicts: cockpit-pcp
Suggests: python3-pcp
Expand Down Expand Up @@ -131,9 +130,6 @@ Provides: cockpit-shell,
cockpit-systemd,
cockpit-tuned,
cockpit-users
Conflicts: cockpit-shell
Breaks: cockpit-dashboard
Replaces: cockpit-shell, cockpit-dashboard
Suggests: lastlog2
Description: Cockpit admin interface for a system
Cockpit admin interface package for configuring and
Expand All @@ -146,9 +142,6 @@ Depends: ${misc:Depends},
${shlibs:Depends},
cockpit-system (>= ${source:Version}),
openssh-client
Conflicts: cockpit-test-assets
Replaces: cockpit-test-assets
Provides: cockpit-test-assets
Description: Tests for Cockpit
This package contains tests and files used while testing Cockpit.
These files are not required for running Cockpit.
Expand Down

0 comments on commit b7bb31f

Please sign in to comment.