From f522fa75695edc90724730fcf2dc175c6bb05a64de9e3ec273033942bc51508a Mon Sep 17 00:00:00 2001
From: Pascal Bleser <pascal.bleser@opensuse.org>
Date: Thu, 15 Apr 2010 22:42:05 +0000
Subject: [PATCH] 2.2.4

OBS-URL: https://build.opensuse.org/package/show/editors/nano?expand=0&rev=11
---
 nano-2.2.2.tar.bz2 |  3 ---
 nano-2.2.4.tar.bz2 |  3 +++
 nano.changes       | 18 ++++++++++++++++++
 nano.spec          | 30 +++++++++++++++++-------------
 4 files changed, 38 insertions(+), 16 deletions(-)
 delete mode 100644 nano-2.2.2.tar.bz2
 create mode 100644 nano-2.2.4.tar.bz2

diff --git a/nano-2.2.2.tar.bz2 b/nano-2.2.2.tar.bz2
deleted file mode 100644
index 8b6efc4..0000000
--- a/nano-2.2.2.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c8e8f02a76d76eacac889ed2c63d5d95751f5f6daa55c28fa90f1e9428adadb3
-size 992006
diff --git a/nano-2.2.4.tar.bz2 b/nano-2.2.4.tar.bz2
new file mode 100644
index 0000000..a7df718
--- /dev/null
+++ b/nano-2.2.4.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:83146d952085a0db5ec18b5afe10ecad852632179fc5732696207af0670f1607
+size 1040145
diff --git a/nano.changes b/nano.changes
index 5db43c6..3fef09a 100644
--- a/nano.changes
+++ b/nano.changes
@@ -1,3 +1,21 @@
+-------------------------------------------------------------------
+Thu Apr 15 22:19:02 UTC 2010 - pascal.bleser@opensuse.org
+
+- update to 2.2.4:
+  * security fixes due to an assessment of nano's vulnerability to
+    symlink attacks on open files; the CVEs fixed with this release
+    are CVE-2010-1160 and CVE-2010-1161
+  * fixes for various crash modes when using the spell checker on
+    new files in multibuffer mode
+  * fix for the 'file was modified' message when saving to a new
+    filename
+  * fixes to page up/down due to the soft wrapping code
+  * new syntax higlighting definition for cmake-related files
+
+- changes from 2.2.3:
+  * fix for paging up/down with smooth scrolling causing the cursor
+    position not being preserved due to a bug in 2.2.2
+
 -------------------------------------------------------------------
 Sun Jan 24 14:52:35 UTC 2010 - bitshuffler@opensuse.org
 
diff --git a/nano.spec b/nano.spec
index e3546a9..a64e0d6 100644
--- a/nano.spec
+++ b/nano.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package nano (Version 2.2.2)
+# spec file for package nano (Version 2.2.4)
 #
 # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -24,13 +24,14 @@ BuildRequires:  ncurses-devel
 Url:            http://www.nano-editor.org/
 License:        GPLv3+
 Group:          Productivity/Editors/Other
-AutoReqProv:    on
 Summary:        Pico Editor Clone with Enhancements
-Version:        2.2.2
+Version:        2.2.4
 Release:        1
+# http://www.nano-editor.org/dist/v2.2/nano-%{version}%{nano_extraver}.tar.gz
 Source:         %{name}-%{version}%{nano_extraver}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-PreReq:         %install_info_prereq
+Requires(post): %install_info_prereq
+Requires(postun): %install_info_prereq
 
 %description
 GNU nano is a small and friendly text editor. It aims to emulate the
@@ -38,6 +39,7 @@ Pico text editor while also offering a few enhancements.
 
 
 
+
 Authors:
 --------
     Chris Allegretta <chrisa@asty.org>
@@ -48,39 +50,41 @@ Authors:
     Rocco Corsi <rocco.corsi@sympatico.ca>
     David Benbennick <dbenbenn@math.cornell.edu>
 
-
 %lang_package
 %prep
-%setup -q -n %{name}-%{version}%{nano_extraver}
+%setup -q -n "%{name}-%{version}%{nano_extraver}"
 
 %build
 %configure --disable-rpath --enable-utf8
 %__make %{?_smp_mflags}
 
 %install
-%__make install DESTDIR=$RPM_BUILD_ROOT
+%__make install DESTDIR="%{buildroot}"
 %find_lang %{name} --with-man --all-name
 
 %check
 %__make check
 
 %clean
-%__rm -rf $RPM_BUILD_ROOT
+%{?buildroot:%__rm -rf "%{buildroot}"}
 
 %post
-%install_info --info-dir=%_infodir %_infodir/%name.info.gz
+%install_info --info-dir=%_infodir %_infodir/%name.info%{ext_info}
 
 %postun
-%install_info_delete --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz
+%install_info_delete --info-dir=%{_infodir} %{_infodir}/%{name}.info%{ext_info}
 
 %files
 %defattr(-, root, root)
 %doc AUTHORS BUGS COPYING ChangeLog NEWS README THANKS TODO UPGRADE
 %dir %{_mandir}/fr
-%{_mandir}/man?/*.*
-%{_bindir}/*
-%{_infodir}/*.gz
+%{_bindir}/nano
+%{_bindir}/rnano
 %{_datadir}/nano
+%doc %{_infodir}/nano.info%{ext_info}
+%doc %{_mandir}/man1/nano.1%{ext_man}
+%doc %{_mandir}/man1/rnano.1%{ext_man}
+%doc %{_mandir}/man5/nanorc.5%{ext_man}
 
 %files lang -f %{name}.lang