- updated to 2.7.4

- updated info patch

diff --git a/nano-info.patch b/nano-info.patch
index 32c6f354aa6792bcc6c488dea06ca9ed848ab09b..e1506257899bcbbe81007d66bae2e67806544959 100644 (file)
--- a/nano-info.patch
+++ b/nano-info.patch
@@ -1,8 +1,8 @@
---- nano-1.9.99pre2/doc/texinfo/nano.texi.orig Fri Jul 31 01:41:31 2006
-+++ nano-1.9.99pre2/doc/texinfo/nano.texi      Wed Sep 10 02:34:34 2006
-@@ -11,9 +11,9 @@
- @set VERSION 1.9.99pre1
- @set UPDATED 30 Jul 2006
+--- nano-2.7.4/doc/nano.texi.orig      2017-01-10 11:31:53.000000000 +0100
++++ nano-2.7.4/doc/nano.texi   2017-02-09 18:41:40.616295727 +0100
+@@ -9,9 +9,9 @@
+ @set VERSION 2.7.4
+ @set UPDATED January 2017
  
 -@dircategory Editors
 +@dircategory Editors:
@@ -12,14 +12,14 @@
  @end direntry
  
  @c tex
-@@ -31,8 +31,8 @@
- This manual documents GNU @code{nano}, a small and friendly text
- editor.
+@@ -28,8 +28,8 @@
+ 
+ This manual documents GNU @code{nano}, a small and friendly text editor.
  
 -This manual is part of the GNU @code{nano} distribution.@*
--@sp4
+-@sp 4
 +This manual is part of the GNU @code{nano} distribution.
 +
  Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
- 2008, 2009 Free Software Foundation, Inc.
+ 2009, 2014, 2015 Free Software Foundation, Inc.
  

diff --git a/nano.spec b/nano.spec
index 1a126f1b07f05517a2e62e459fadc2a0a4310c76..dad1372db96d9338e6786f4e4529a862995e498e 100644 (file)
--- a/nano.spec
+++ b/nano.spec
@@ -1,39 +1,41 @@
-Summary:       nano - Nano's ANOther editor, an enhanced free Pico clone
-Summary(pl.UTF-8):     nano - jeszcze jeden edytor, darmowy, rozbudowany klon Pico
+Summary:       GNU nano - Nano's ANOther editor, an enhanced free Pico clone
+Summary(pl.UTF-8):     GNU nano - jeszcze jeden edytor: darmowy, rozbudowany klon Pico
 Name:          nano
-Version:       2.2.6
-Release:       5
+Version:       2.7.4
+Release:       1
 License:       GPL v3+
 Group:         Applications/Editors
-Source0:       http://www.nano-editor.org/dist/v2.2/%{name}-%{version}.tar.gz
-# Source0-md5: 03233ae480689a008eb98feb1b599807
+Source0:       https://www.nano-editor.org/dist/v2.7/%{name}-%{version}.tar.gz
+# Source0-md5: e3a6b2740eb31f8a06d585f44d883895
 Source1:       %{name}.desktop
 Source2:       %{name}.png
 Patch0:                %{name}-info.patch
 Patch1:                %{name}-ncurses-ncurses.h.patch
 URL:           http://www.nano-editor.org/
-BuildRequires: autoconf
+BuildRequires: autoconf >= 2.61
 BuildRequires: automake
-BuildRequires: gettext-tools
-BuildRequires: glib2-devel
+BuildRequires: gettext-tools >= 0.11.5
 BuildRequires: groff
+BuildRequires: libmagic-devel
 BuildRequires: ncurses-devel >= 5.0
 BuildRequires: texinfo
+BuildRequires: zlib-devel
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
-nano (Nano's ANOther editor) is a small, free and friendly editor
+GNU nano (Nano's ANOther editor) is a small, free and friendly editor
 which aims to replace Pico, the default editor included in the
 non-free Pine package. Rather than just copying Pico's look and feel,
 nano also implements some missing (or disabled by default) features in
 Pico, such as "search and replace" and "go to line number".
 
 %description -l pl.UTF-8
-nano to mały, otwarty i przyjazny edytor, którego celem jest
-zastąpienie Pico, standardowego edytora zawartego w niewolnym pakiecie
-Pine. Oprócz wyglądu oraz interfejsu, nano posiada kilka brakujących
-(lub wyłączonych standardowo) w Pico funkcji, takich jak: "znajdź i
-zastąp" lub "idź do wiersza numer".
+GNU nano (Nano's ANOther editor - Nano to kolejny edytor) to mały,
+otwarty i przyjazny edytor, którego celem jest zastąpienie Pico,
+standardowego edytora zawartego w niewolnym pakiecie Pine. Oprócz
+wyglądu oraz interfejsu, nano posiada kilka brakujących (lub
+wyłączonych standardowo) w Pico funkcji, takich jak: "znajdź i zastąp"
+lub "idź do wiersza numer".
 
 %prep
 %setup -q
@@ -46,8 +48,8 @@ zastąp" lub "idź do wiersza numer".
 %{__autoconf}
 %{__autoheader}
 %{__automake}
-%configure \
-       --enable-all
+%configure
+
 %{__make}
 
 %install
@@ -65,20 +67,21 @@ install %{SOURCE2} $RPM_BUILD_ROOT%{_pixmapsdir}
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post  -p      /sbin/postshell
+%post  -p /sbin/postshell
 -/usr/sbin/fix-info-dir -c %{_infodir}
 
-%postun        -p      /sbin/postshell
+%postun        -p /sbin/postshell
 -/usr/sbin/fix-info-dir -c %{_infodir}
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc AUTHORS BUGS ChangeLog NEWS README THANKS TODO UPGRADE doc/nanorc.sample doc/faq.html
+%doc AUTHORS ChangeLog IMPROVEMENTS NEWS README THANKS TODO doc/{faq.html,sample.nanorc}
 %attr(755,root,root) %{_bindir}/nano
 %attr(755,root,root) %{_bindir}/rnano
+%{_datadir}/nano
 %{_desktopdir}/nano.desktop
-%{_mandir}/man[15]/*
-%lang(fr) %{_mandir}/fr/man[15]/*
-%{_infodir}/*info*
 %{_pixmapsdir}/nano.png
-%{_datadir}/nano
+%{_mandir}/man1/nano.1*
+%{_mandir}/man1/rnano.1*
+%{_mandir}/man5/nanorc.5*
+%{_infodir}/nano.info*