From c5ef6ba0a76900b8dcbead8e084d9a59f120e084 Mon Sep 17 00:00:00 2001 From: madonuko Date: Fri, 16 Aug 2024 17:08:31 +0800 Subject: [PATCH] feat: obsoletes dnf5-default-package-manager --- .../dnf5-default-package-manager/anda.hcl | 6 --- .../dnf5-default-package-manager.spec | 43 ------------------- ultramarine/release/ultramarine-release.spec | 5 ++- 3 files changed, 3 insertions(+), 51 deletions(-) delete mode 100644 ultramarine/dnf5-default-package-manager/anda.hcl delete mode 100644 ultramarine/dnf5-default-package-manager/dnf5-default-package-manager.spec diff --git a/ultramarine/dnf5-default-package-manager/anda.hcl b/ultramarine/dnf5-default-package-manager/anda.hcl deleted file mode 100644 index f45db3b..0000000 --- a/ultramarine/dnf5-default-package-manager/anda.hcl +++ /dev/null @@ -1,6 +0,0 @@ -project pkg { - arches = ["x86_64"] - rpm { - spec = "dnf5-default-package-manager.spec" - } -} diff --git a/ultramarine/dnf5-default-package-manager/dnf5-default-package-manager.spec b/ultramarine/dnf5-default-package-manager/dnf5-default-package-manager.spec deleted file mode 100644 index 637b054..0000000 --- a/ultramarine/dnf5-default-package-manager/dnf5-default-package-manager.spec +++ /dev/null @@ -1,43 +0,0 @@ -%define debug_package %nil - -Name: dnf5-default-package-manager -Version: 0 -Release: 2%?dist -Summary: Package that sets dnf5 as the default package manager -License: MIT -URL: https://wiki.ultramarine-linux.org/en/usage/um40-dnf5/ -Requires: dnf5 -Recommends: dnf5-plugins -BuildArch: noarch - -%description -This package contains post-install hooks that symlinks %_bindir/dnf -to the new dnf5 binary. - -%prep - -%build - -%install - -%posttrans -if [ $1 -gt 1 ]; then - rm %_bindir/{dnf,yum} - ln -s %_bindir/dnf5 /usr/bin/dnf - ln -s %_bindir/dnf5 /usr/bin/yum -fi - -%preun -rm %_bindir/{dnf,yum} -ln -s /usr/bin/dnf-3 /usr/bin/dnf -ln -s %_bindir/dnf-3 /usr/bin/yum - -%triggerin -- dnf -rm %_bindir/{dnf,yum} -ln -s %_bindir/dnf5 /usr/bin/dnf -ln -s %_bindir/dnf5 /usr/bin/yum - -%triggerin -- yum -rm %_bindir/{dnf,yum} -ln -s %_bindir/dnf5 /usr/bin/dnf -ln -s %_bindir/dnf5 /usr/bin/yum diff --git a/ultramarine/release/ultramarine-release.spec b/ultramarine/release/ultramarine-release.spec index 7457fa5..50c13fb 100644 --- a/ultramarine/release/ultramarine-release.spec +++ b/ultramarine/release/ultramarine-release.spec @@ -3,7 +3,7 @@ %global release_name Lost Umbrella %global fedora_codename Forty %global codename lostumbrella -%define dist_version 40 +%define dist_version 41 %define _alt_name fedora-release %define xfce_conf_commit 24fae98d5cf148b5017d6273e442d9b46bf41e91 @@ -45,12 +45,13 @@ Summary: Ultramarine Linux release files Name: ultramarine-release Version: %{dist_version} -Release: 11%{?dist} +Release: 1%{?dist} License: MIT Source0: LICENSE URL: https://ultramarine-linux.org Recommends: ultramarine-release-identity-basic BuildArch: noarch +Obsoletes: dnf5-default-package-manager Provides: ultramarine-release = %{version}-%{release} Provides: ultramarine-release-variant = %{version}-%{release}