From b51e9d718947abaadb78acbd9bdc024064cc4973 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Date: Wed, 12 Apr 2017 18:12:56 +0200 Subject: [PATCH] Update to 2.8.1 --- files/0001-Use-a-stateless-configuration.patch | 21 +++++++++++---------- package.yml | 9 ++++----- pspec_x86_64.xml | 14 +++++++------- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/files/0001-Use-a-stateless-configuration.patch b/files/0001-Use-a-stateless-configuration.patch index b45b87a..503daac 100644 --- a/files/0001-Use-a-stateless-configuration.patch +++ b/files/0001-Use-a-stateless-configuration.patch @@ -1,28 +1,29 @@ -From 58c6a817525a25b0259c2d8e3617d6fd67435d48 Mon Sep 17 00:00:00 2001 -From: Michael Meinertzhagen -Date: Sat, 7 Jan 2017 13:08:27 +0100 +From afaa8b0cef7da4354b7fab012e3533c7d39f08b5 Mon Sep 17 00:00:00 2001 +From: Pierre-Yves +Date: Fri, 31 Mar 2017 15:18:17 +0200 Subject: [PATCH 1/1] Use a stateless configuration +Update of previous patch from Michael Meinertzhagen --- src/Makefile.am | 2 +- src/rcfile.c | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am -index 22baa16f..11ec9e7b 100644 +index bada082..5e163fb 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,4 +1,4 @@ --AM_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\" -DSYSCONFDIR=\"$(sysconfdir)\" -+AM_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\" -DSYSCONFDIR=\"$(sysconfdir)\" -DDATADIR=\"$(datadir)\" +-AM_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\" -DSYSCONFDIR=\"$(sysconfdir)\" \ ++AM_CPPFLAGS = -DDATADIR=\"$(datadir)\" -DLOCALEDIR=\"$(localedir)\" -DSYSCONFDIR=\"$(sysconfdir)\" \ + -I$(top_builddir)/lib -I$(top_srcdir)/lib CLEANFILES = revision.h - diff --git a/src/rcfile.c b/src/rcfile.c -index a9426d22..8ec59112 100644 +index e751d86..e108751 100644 --- a/src/rcfile.c +++ b/src/rcfile.c -@@ -1258,7 +1258,11 @@ void parse_one_nanorc(void) +@@ -1265,7 +1265,11 @@ void parse_one_nanorc(void) /* First read the system-wide rcfile, then the user's rcfile. */ void do_rcfiles(void) { @@ -36,5 +37,5 @@ index a9426d22..8ec59112 100644 /* Process the system-wide nanorc. */ parse_one_nanorc(); -- -2.11.0 +2.12.2 diff --git a/package.yml b/package.yml index a81956b..03ab89d 100644 --- a/package.yml +++ b/package.yml @@ -1,8 +1,8 @@ name : nano -version : 2.7.5 -release : 68 +version : 2.8.1 +release : 69 source : - - https://www.nano-editor.org/dist/v2.7/nano-2.7.5.tar.xz : a64d24e6bc4fc448376d038f9a755af77f8e748c9051b6f45bf85e783a7e67e4 + - https://www.nano-editor.org/dist/v2.8/nano-2.8.1.tar.xz : e935a8bb373345c833dff3a304c6d392775d206b94c802d9285ae80ac6b66d0b license : - GPL-3.0 summary : Small, friendly text editor inspired by Pico @@ -11,8 +11,7 @@ description: | GNU nano is an easy-to-use text editor originally designed as a replacement for Pico, the ncurses-based editor from the non-free mailer package Pine (itself now available under the Apache License as Alpine). setup : | %patch -p1 < $pkgfiles/0001-Use-a-stateless-configuration.patch - autoreconf -vfi - %configure --enable-utf8 --docdir=/usr/share/doc/nano + %reconfigure --enable-utf8 --docdir=/usr/share/doc/nano build : | %make install : | diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml index e35e2af..b1c180b 100644 --- a/pspec_x86_64.xml +++ b/pspec_x86_64.xml @@ -2,8 +2,8 @@ nano - Ikey Doherty - ikey@solus-project.com + Pierre-Yves + pyu@skynet.be GPL-3.0 editor @@ -29,12 +29,12 @@ - - 2017-04-06 - 2.7.5 + + 2017-04-12 + 2.8.1 Packaging update - Ikey Doherty - ikey@solus-project.com + Pierre-Yves + pyu@skynet.be \ No newline at end of file -- 2.12.2