- merged from DEVEL

Changed files:
    nano.spec -> 1.80

diff --git a/nano.spec b/nano.spec
index d2d20a929cbbc73dd7ad2227a3646893e78c9285..eed73f7cad3be91facea6f4838c3d50b2d49a32f 100644 (file)
--- a/nano.spec
+++ b/nano.spec
@@ -1,12 +1,12 @@
-Summary:       nano (Nano's ANOther editor)
-Summary(pl):   nano - jeszcze jeden edytor
+Summary:       nano - Nano's ANOther editor, an enhanced free Pico clone
+Summary(pl):   nano - jeszcze jeden edytor, darmowy, rozbudowany klon Pico
 Name:          nano
-Version:       1.3.11
-Release:       1
+Version:       2.0.0
+Release:       0.1
 License:       GPL v2
 Group:         Applications/Editors
-Source0:       http://www.nano-editor.org/dist/v1.3/%{name}-%{version}.tar.gz
-# Source0-md5: ad6c2270fd674065ef994a58d3a8a7b7
+Source0:       http://www.nano-editor.org/dist/v2.0/%{name}-%{version}.tar.gz
+# Source0-md5: d1a8ac92b1985217f405a4c54562d8f3
 Source1:       %{name}.desktop
 Source2:       %{name}.png
 Patch0:                %{name}-info.patch
@@ -21,28 +21,32 @@ BuildRequires:      texinfo
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
-nano (Nano's ANOther editor) is the editor formerly known as TIP (TIP
-Isn't Pico). It aims to emulate Pico as closely as possible while also
-offering a few enhancements.
+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
-nano to edytor wcze¶niej znany jako TIP (Tip to nIe Pico). Jego celem
-jest emulowanie Pico tak dobrze jak to mo¿liwe, jednocze¶nie oferuj±c
-kilka rozszerzeñ.
+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".
 
 %prep
 %setup -q
-#%patch0 -p1
-%patch1 -p1
+%patch0 -p1
+%patch1 -p2
 
 %build
-rm -f missing m4/*.m4
 %{__gettextize}
-%{__aclocal}
+%{__aclocal} -I m4
 %{__autoconf}
 %{__autoheader}
 %{__automake}
-%configure
+%configure \
+       --enable-all
 %{__make}
 
 %install
@@ -68,9 +72,11 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc README ChangeLog AUTHORS NEWS TODO
+%doc AUTHORS BUGS ChangeLog NEWS README THANKS TODO UPGRADE doc/nanorc.sample doc/faq.html
 %attr(755,root,root) %{_bindir}/nano
 %{_desktopdir}/nano.desktop
 %{_mandir}/man[15]/*
+%lang(fr) %{_mandir}/fr/man[15]/*
 %{_infodir}/*info*
 %{_pixmapsdir}/*
+%{_datadir}/nano