diff --git a/nano-8.0.tar.xz b/nano-8.0.tar.xz deleted file mode 100644 index 797c119a98df61f061158e7d83f8f209cb144ff0..0000000000000000000000000000000000000000 Binary files a/nano-8.0.tar.xz and /dev/null differ diff --git a/nano-8.1.tar.xz b/nano-8.1.tar.xz new file mode 100644 index 0000000000000000000000000000000000000000..825d0be67aac9a05ff051343bde70d0b0b92c1db Binary files /dev/null and b/nano-8.1.tar.xz differ diff --git a/nano-spec.nanorc.patch b/nano-spec.nanorc.patch new file mode 100644 index 0000000000000000000000000000000000000000..9980aad98713d7dc64335254f2858c26046afd0c --- /dev/null +++ b/nano-spec.nanorc.patch @@ -0,0 +1,20 @@ +--- nano-8.1/syntax/extra/spec.nanorc.orig 2024-07-25 19:05:29.349704000 +0800 ++++ nano-8.1/syntax/extra/spec.nanorc 2024-07-25 19:08:52.805957300 +0800 +@@ -14,7 +14,7 @@ + color brightblue "\<(License|Copyright|Distribution|Vendor|Packager)[[:space:]]*:" + color brightblue "\<((Source|Patch)[0-9]*|Nosource|Nopatch)[[:space:]]*:" + # Architectures. +-color brightred "\<(i386|i486|i586|i686|athlon|ia64|alpha|alphaev5|alphaev56|alphapca56|alphaev6|alphaev67|sparc|sparcv9|sparc64armv3l|armv4b|armv4lm|ips|mipsel|ppc|ppciseries|ppcpseries|ppc64|m68k|m68kmint|Sgi|rs6000|i370|s390x?|noarch)\>" ++color brightred "\<(i386|i486|i586|i686|athlon|ia64|alpha|alphaev5|alphaev56|alphapca56|alphaev6|alphaev67|sparc|sparcv9|sparc64armv3l|armv4b|armv4lm|aarch64|ips|mipsel|ppc|ppciseries|ppcpseries|ppc64|m68k|m68kmint|Sgi|rs6000|i370|s390x?|loongarch64|riscv64|sw64|noarch)\>" + # Architecture and OS conditionals. + color brightred "%(ifarch|elifarch|ifnarch|ifos|elifos|ifnos)\>" + # %* strings. +@@ -24,7 +24,7 @@ + color magenta start="%\{" end="\}" + color yellow start="%\{__" end="\}" + # Sections. +-color red "^%((prep|build|install|check|clean)$|(description|files|package|changelog)\>)" ++color red "^%((prep|generate_buildrequires|conf|build|install|check|clean)$|(description|files|package|changelog)\>)" + color red "^%((pre|post)(trans|un)?|trigger(prein|in|un|postun)?)\>" + color red "^%(trans)?filetrigger(in|un|postun)\>" + color red "^%(sourcelist|patchlist|generate_buildrequires|verifyscript)\>" diff --git a/nano.spec b/nano.spec index b5f4039ca4e49fb71fd47f1f092d3c1c081b1303..35a766d0c4db5623abe0ada9b4dcd92bc39a3ebe 100644 --- a/nano.spec +++ b/nano.spec @@ -1,13 +1,15 @@ Name: nano -Version: 8.0 +Version: 8.1 Release: 1 Summary: Nano is a tiny GNU editor -License: GPLv3+ +License: GPL-3.0-or-later URL: https://www.nano-editor.org Source0: https://www.nano-editor.org/dist/v8/%{name}-%{version}.tar.xz +Patch0: nano-spec.nanorc.patch -BuildRequires: file-devel gettext-devel gcc ncurses-devel sed texinfo groff -Conflicts: filesystem < 3 +BuildRequires: file-devel gettext-devel gcc sed texinfo groff +BuildRequires: pkgconfig(ncursesw) +Conflicts: filesystem < 3 %description Nano is a tiny GNU editor @@ -18,9 +20,6 @@ Nano is a tiny GNU editor %autosetup -p1 %build -install -d build -cd build -%global _configure ../configure %configure %make_build @@ -29,21 +28,19 @@ sed -e 's/^#.*set speller.*$/set speller "hunspell"/' \ doc/sample.nanorc >> ./nanorc %install -cd build %make_install rm -rf %{buildroot}%{_infodir}/dir rm -rf %{buildroot}%{_docdir}/nano/{nano,nano.1,nanorc.5,rnano.1}.html install -d %{buildroot}%{_sysconfdir} -install -m 0644 ./nanorc %{buildroot}%{_sysconfdir}/nanorc +install -m 0644 nanorc %{buildroot}%{_sysconfdir}/nanorc mv %{buildroot}%{_datadir}/nano/extra/* %{buildroot}%{_datadir}/nano rm -rf %{buildroot}%{_datadir}/nano/extra %find_lang %{name} -%files -f build/%{name}.lang -%defattr(-,root,root) +%files -f %{name}.lang %doc AUTHORS %license COPYING @@ -53,14 +50,17 @@ rm -rf %{buildroot}%{_datadir}/nano/extra %{_infodir}/nano.info* %files help -%defattr(-,root,root) %doc ChangeLog INSTALL NEWS README THANKS TODO -%doc build/doc/sample.nanorc +%doc doc/sample.nanorc %doc doc/nano.html %{_mandir}/man*/* %{_defaultdocdir}/nano/faq.html %changelog +* Thu Jul 25 2024 Funda Wang - 8.1-1 +- Update to 8.1 +- Update settings against rpm spec format + * Mon Jun 17 2024 yaoxin - 8.0-1 - Update to 8.0 * CVE-2024-5742: Avoid privilege escalations via symlink attacks