rebase to latest upstream version
- remove `nano-default-editor` from the specfile Resolves: RHEL-35944 Resolves: RHEL-30790
This commit is contained in:
Lukáš Zaoral
parent
68b3e9b496
commit
239adf6ec9
4
.gitignore
vendored
4
.gitignore
vendored
@ -1,2 +1,2 @@
|
||||
/nano-[3-7].*.tar.xz
|
||||
/nano-[3-7].*.tar.xz.asc
|
||||
/nano-[3-8].*.tar.xz
|
||||
/nano-[3-8].*.tar.xz.asc
|
||||
|
||||
@ -1,5 +0,0 @@
|
||||
# Ensure GNU nano is set as EDITOR if it isn't already set
|
||||
|
||||
if ( ! ($?EDITOR) ) then
|
||||
setenv EDITOR "/usr/bin/nano"
|
||||
endif
|
||||
@ -1,8 +0,0 @@
|
||||
# Ensure GNU nano is set as EDITOR if it isn't already set
|
||||
# This is set as a universal variable so that any other definition
|
||||
# by the user would win
|
||||
# Cf. https://fishshell.com/docs/current/index.html#variables-scope
|
||||
|
||||
if ! set -q EDITOR;
|
||||
set -x EDITOR /usr/bin/nano
|
||||
end
|
||||
@ -1,5 +0,0 @@
|
||||
# Ensure GNU nano is set as EDITOR if it isn't already set
|
||||
|
||||
if [ -z "$EDITOR" ]; then
|
||||
export EDITOR="/usr/bin/nano"
|
||||
fi
|
||||
63
nano.spec
63
nano.spec
@ -1,14 +1,7 @@
|
||||
# build nano-default-editor by default only on fedora
|
||||
%if 0%{?fedora}
|
||||
%bcond_without default_editor
|
||||
%else
|
||||
%bcond_with default_editor
|
||||
%endif
|
||||
|
||||
Summary: A small text editor
|
||||
Name: nano
|
||||
Version: 7.2
|
||||
Release: 7%{?dist}
|
||||
Version: 8.0
|
||||
Release: 1%{?dist}
|
||||
License: GPL-3.0-or-later
|
||||
URL: https://www.nano-editor.org
|
||||
|
||||
@ -21,11 +14,6 @@ Source2: bensberg.pgp
|
||||
# Additional sources
|
||||
Source3: nanorc
|
||||
|
||||
# Shell snippets for default-editor setup
|
||||
Source11: nano-default-editor.sh
|
||||
Source12: nano-default-editor.csh
|
||||
Source13: nano-default-editor.fish
|
||||
|
||||
BuildRequires: file-devel
|
||||
BuildRequires: gettext-devel
|
||||
BuildRequires: gcc
|
||||
@ -41,31 +29,6 @@ Conflicts: filesystem < 3
|
||||
%description
|
||||
GNU nano is a small and friendly text editor.
|
||||
|
||||
%if %{with default_editor}
|
||||
%package default-editor
|
||||
Summary: Sets GNU nano as the default editor
|
||||
Requires: nano = %{version}-%{release}
|
||||
# Ensure that only one package with this capability is installed
|
||||
Provides: system-default-editor
|
||||
Conflicts: system-default-editor
|
||||
BuildArch: noarch
|
||||
|
||||
%description default-editor
|
||||
This package ensures the EDITOR shell variable
|
||||
is set in common shells to GNU nano.
|
||||
|
||||
%package -n default-editor
|
||||
Summary: Metapackage for DNF group
|
||||
Recommends: nano-default-editor
|
||||
Requires: system-default-editor
|
||||
BuildArch: noarch
|
||||
|
||||
%description -n default-editor
|
||||
The package acts as a placeholder in DNF group 'Standard', which will
|
||||
install nano-default-editor on fresh installs and it will not block users
|
||||
who don't have nano as a default editor during upgrade.
|
||||
%endif
|
||||
|
||||
%prep
|
||||
%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}'
|
||||
%autosetup -S git
|
||||
@ -102,13 +65,6 @@ rm -rf %{buildroot}%{_datadir}/nano/extra
|
||||
|
||||
%find_lang %{name}
|
||||
|
||||
%if %{with default_editor}
|
||||
# install nano-default-editor snippets
|
||||
install -Dpm 0644 %{SOURCE11} %{buildroot}%{_sysconfdir}/profile.d/%{basename:%{S:11}}
|
||||
install -Dpm 0644 %{SOURCE12} %{buildroot}%{_sysconfdir}/profile.d/%{basename:%{S:12}}
|
||||
install -Dpm 0644 %{SOURCE13} %{buildroot}%{_datadir}/fish/vendor_conf.d/%{basename:%{S:13}}
|
||||
%endif
|
||||
|
||||
%files -f build/%{name}.lang
|
||||
%license COPYING
|
||||
%doc AUTHORS ChangeLog NEWS README THANKS TODO
|
||||
@ -121,18 +77,11 @@ install -Dpm 0644 %{SOURCE13} %{buildroot}%{_datadir}/fish/vendor_conf.d/%{basen
|
||||
%{_infodir}/nano.info*
|
||||
%{_datadir}/nano
|
||||
|
||||
%if %{with default_editor}
|
||||
%files default-editor
|
||||
%dir %{_sysconfdir}/profile.d
|
||||
%config(noreplace) %{_sysconfdir}/profile.d/nano-default-editor.*
|
||||
%dir %{_datadir}/fish/vendor_conf.d
|
||||
%{_datadir}/fish/vendor_conf.d/nano-default-editor.fish
|
||||
|
||||
%files -n default-editor
|
||||
%endif
|
||||
|
||||
|
||||
%changelog
|
||||
* Mon Jul 01 2024 Lukáš Zaoral <lzaoral@redhat.com> - 8.0-1
|
||||
- rebase to latest upstream version (RHEL-35944)
|
||||
- remove `nano-default-editor` from the specfile (RHEL-30790)
|
||||
|
||||
* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 7.2-7
|
||||
- Bump release for June 2024 mass rebuild
|
||||
|
||||
|
||||
4
sources
4
sources
@ -1,2 +1,2 @@
|
||||
SHA512 (nano-7.2.tar.xz.asc) = 3ba3921c892ab3121cfe86ff37ab709c592d49524624c132fa32e22129b988ce5c6cac28f6b2fa7f1967ab3799dbc1652695c92ea91c576c378c2a2302b0f7b8
|
||||
SHA512 (nano-7.2.tar.xz) = a6dfa70edab62e439a9a998ca214f2415d57dbdc01766ad2e4b14048836557a32755f8b09de13c6a89023f215b61d2854017b389eae8d097ca6f3ba73ce2f583
|
||||
SHA512 (nano-8.0.tar.xz.asc) = a9208b0e4e5a54c9f13e7dd2ba4cad4b4542aff25230825faafe1e5149c1da7be3e615ab85ab5090ee7d97076e36963c2792ee06a8f10f7f4df46f7e8d2101e5
|
||||
SHA512 (nano-8.0.tar.xz) = 86c484428b8805768fd580d0f62aa32ce8f588f4beedcdd35a4014506b562928c7a2fa6487aa0d853b4c9c1639a4d186f46b4e96721568ff81191d5098403ca8
|
||||
|
||||
Loading…
Reference in New Issue
Block a user