From 3496ed634cf452da38cc2796c6710e1de6cbc23a Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Wed, 23 Jun 2021 11:38:07 +0200 Subject: [PATCH] [F33, F34, F35] - use 'default-editor' in comps Use 'default-editor' package instead of nano+nano-default-editor in comps. Fixes upgrade issue[1] when a different default editor is used. [1] https://bugzilla.redhat.com/show_bug.cgi?id=1955884 --- comps-f33.xml.in | 12 ++++-------- comps-f34.xml.in | 15 +++++---------- comps-f35.xml.in | 15 +++++---------- 3 files changed, 14 insertions(+), 28 deletions(-) diff --git a/comps-f33.xml.in b/comps-f33.xml.in index fda98721..de21291f 100644 --- a/comps-f33.xml.in +++ b/comps-f33.xml.in @@ -4356,9 +4356,8 @@ tar unzip valgrind + default-editor emacs - nano - nano-default-editor openssh-clients vim-enhanced wget @@ -4546,6 +4545,7 @@ dc3dd dcfldd ddrescue + default-editor dhcping dislocker dnsenum @@ -4596,8 +4596,6 @@ medusa mtr mutt - nano - nano-default-editor nbtscan ncrack nebula @@ -4903,6 +4901,7 @@ cryptsetup cyrus-sasl-plain dbus + default-editor deltarpm dos2unix dosfstools @@ -4925,8 +4924,6 @@ microcode_ctl mlocate mtr - nano - nano-default-editor net-tools nfs-utils nmap-ncat @@ -5445,6 +5442,7 @@ crontabs cryptsetup cyrus-sasl-plain + default-editor deltarpm desktop-backgrounds-gnome dnf-plugins-core @@ -5483,8 +5481,6 @@ mdadm mlocate mtr - nano - nano-default-editor net-tools NetworkManager-config-connectivity-fedora nfs-utils diff --git a/comps-f34.xml.in b/comps-f34.xml.in index ac0af85e..cf220729 100644 --- a/comps-f34.xml.in +++ b/comps-f34.xml.in @@ -4301,6 +4301,7 @@ calls cryptsetup + default-editor dnf feedbackd gnome-calculator @@ -4317,8 +4318,6 @@ gstreamer1-plugins-ugly-free linux-firmware mesa-dri-drivers - nano - nano-default-editor NetworkManager NetworkManager-bluetooth NetworkManager-config-connectivity-fedora @@ -4449,9 +4448,8 @@ tar unzip valgrind + default-editor emacs - nano - nano-default-editor openssh-clients vim-enhanced wget @@ -4639,6 +4637,7 @@ dc3dd dcfldd ddrescue + default-editor dhcping dislocker dnsenum @@ -4689,8 +4688,6 @@ medusa mtr mutt - nano - nano-default-editor nbtscan ncrack nebula @@ -4996,6 +4993,7 @@ cryptsetup cyrus-sasl-plain dbus + default-editor deltarpm dos2unix dosfstools @@ -5019,8 +5017,6 @@ microcode_ctl mlocate mtr - nano - nano-default-editor net-tools nfs-utils nmap-ncat @@ -5534,6 +5530,7 @@ cpio cryptsetup cyrus-sasl-plain + default-editor deltarpm desktop-backgrounds-gnome dnf-plugins-core @@ -5571,8 +5568,6 @@ mdadm mlocate mtr - nano - nano-default-editor net-tools NetworkManager-config-connectivity-fedora nfs-utils diff --git a/comps-f35.xml.in b/comps-f35.xml.in index a9aebf56..24a7a1fb 100644 --- a/comps-f35.xml.in +++ b/comps-f35.xml.in @@ -4299,6 +4299,7 @@ calls chatty cryptsetup + default-editor dnf feedbackd gnome-calculator @@ -4315,8 +4316,6 @@ gstreamer1-plugins-ugly-free linux-firmware mesa-dri-drivers - nano - nano-default-editor NetworkManager NetworkManager-bluetooth NetworkManager-config-connectivity-fedora @@ -4447,9 +4446,8 @@ tar unzip valgrind + default-editor emacs - nano - nano-default-editor openssh-clients vim-enhanced wget @@ -4637,6 +4635,7 @@ dc3dd dcfldd ddrescue + default-editor dhcping dislocker dnsenum @@ -4687,8 +4686,6 @@ medusa mtr mutt - nano - nano-default-editor nbtscan ncrack nebula @@ -4994,6 +4991,7 @@ cryptsetup cyrus-sasl-plain dbus + default-editor deltarpm dos2unix dosfstools @@ -5017,8 +5015,6 @@ microcode_ctl mlocate mtr - nano - nano-default-editor net-tools nfs-utils nmap-ncat @@ -5533,6 +5529,7 @@ cpio cryptsetup cyrus-sasl-plain + default-editor deltarpm desktop-backgrounds-gnome dnf-plugins-core @@ -5571,8 +5568,6 @@ mediawriter mlocate mtr - nano - nano-default-editor net-tools NetworkManager-config-connectivity-fedora nfs-utils