diff --git a/nano-2.2.6.tar.bz2 b/nano-2.2.6.tar.bz2 deleted file mode 100644 index c00f6eb..0000000 --- a/nano-2.2.6.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:43740ee79241e0ba8f1e11ac4679a8de4656024aa3537e57ed4c3d7fbef93f90 -size 1057316 diff --git a/nano-2.3.0.tar.bz2 b/nano-2.3.0.tar.bz2 new file mode 100644 index 0000000..5504020 --- /dev/null +++ b/nano-2.3.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b78cac6778d7bb095a86667c567329c25ef9172c21275d90a661f1d62d900e69 +size 1069399 diff --git a/nano.changes b/nano.changes index 5f230b7..b362453 100644 --- a/nano.changes +++ b/nano.changes @@ -1,3 +1,26 @@ +------------------------------------------------------------------- +Sun Feb 27 13:37:00 UTC 2011 - asterios.dramis@gmail.com + +- Update to version 2.3.0: + * libmagic support for syntax highlighting has been added on top of the + existing file extension and header support already available. + * Cursor position can be saved between editing sessions with the -P or + --poslog command line flags, or via "set poslog" in your .nanorc. + * Also included are some fixes for compilation with g++, and better handling + of issues writing the backup file, which should reduce the need for the + 'set allow_insecure_backup" nanorc option. +- Spec file updates: + * More changes based on rpmdevtools templates and spec-cleaner run. + * Changed License: to GPLv3+ and (GFDL or GPLv3+). + * Added description for the patch based on openSUSE Patches Guidelines. + * Updates in Buildrequires: and Requires: sections. + * Added Recommends: for the lang package. + * Updated Authors: data. + * Updates in %install section. Manually install the doc files in order to + easily split them between the main and lang package. + * Removed %check section (the package doesn't implement "make check"). + * Use %preun instead of %postun for "install_info". + ------------------------------------------------------------------- Sat Jan 1 15:04:22 UTC 2011 - asterios.dramis@gmail.com diff --git a/nano.spec b/nano.spec index cd9310f..75d8b57 100644 --- a/nano.spec +++ b/nano.spec @@ -1,7 +1,7 @@ # -# spec file for package nano (Version 2.2.6) +# spec file for package nano # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,44 +17,47 @@ # norootforbuild -%define nano_extraver %{nil} - Name: nano -Version: 2.2.6 +Version: 2.3.0 Release: 1 -License: GPLv3+ Summary: Pico Editor Clone with Enhancements + +License: GPLv3+ and (GFDL or GPLv3+) Url: http://www.nano-editor.org/ Group: Productivity/Editors/Other -# http://www.nano-editor.org/dist/v2.2/%{name}-%{version}%{nano_extraver}.tar.gz -Source: %{name}-%{version}%{nano_extraver}.tar.bz2 -# Don't show build date in version information +# http://www.nano-editor.org/dist/v2.3/%{name}-%{version}.tar.gz +Source0: %{name}-%{version}.tar.bz2 +# PATCH-FIX-OPENSUSE no-build-date.patch cristian.rodriguez@opensuse.org -- Do not provide build dates in binaries Patch0: nano-no-build-date.patch -BuildRequires: ncurses-devel -Requires(post): %install_info_prereq -Requires(postun): %install_info_prereq BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: file-devel +BuildRequires: ncurses-devel +Requires(post): info +Requires(preun): info +Recommends: %{name}-lang = %{version} + %description GNU nano is a small and friendly text editor. It aims to emulate the Pico text editor while also offering a few enhancements. - Authors: -------- Chris Allegretta - David Lawrence Ramsey - Jordi Mallach + David Lawrence Ramsey + Jordi Mallach Adam Rogoyski Robert Siemborski Rocco Corsi David Benbennick + Mike Frysinger %lang_package + %prep -%setup -q -n "%{name}-%{version}%{nano_extraver}" +%setup -q %patch0 %build @@ -62,34 +65,44 @@ Authors: %__make %{?_smp_mflags} %install -%__make install DESTDIR="%{buildroot}" +%makeinstall + +# Remove doc files from /usr/share/nano (they should be in defaultdocdir) +rm -rf %{buildroot}%{_datadir}/nano/man-html/ + +# Manually install the doc files in order to easily split them between the main and lang package +install -dp -m 0755 %{buildroot}%{_defaultdocdir}/nano +install -p -m 0644 AUTHORS BUGS COPYING COPYING.DOC ChangeLog ChangeLog.pre-2.1 NEWS README THANKS TODO UPGRADE %{buildroot}%{_defaultdocdir}/nano/ +install -p -m 0644 doc/faq.html doc/nanorc.sample %{buildroot}%{_defaultdocdir}/nano/ +install -dp -m 0755 %{buildroot}%{_defaultdocdir}/nano/man-html/fr +install -p -m 0644 doc/man/*.html %{buildroot}%{_defaultdocdir}/nano/man-html/ +install -p -m 0644 doc/man/fr/*.html %{buildroot}%{_defaultdocdir}/nano/man-html/fr/ + %find_lang %{name} --with-man --all-name -%check -%__make check - %clean -%{?buildroot:%__rm -rf "%{buildroot}"} +%__rm -rf %{buildroot} %post %install_info --info-dir=%{_infodir} %{_infodir}/%{name}.info%{ext_info} - -%postun + +%preun %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 -%doc doc/faq.html doc/nanorc.sample -%dir %{_mandir}/fr +%defattr(-,root,root,-) +%doc %{_defaultdocdir}/nano/ +%exclude %{_defaultdocdir}/nano/man-html/fr/ %{_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} +%{_datadir}/nano/ %files lang -f %{name}.lang +%defattr(-,root,root,-) +%doc %{_defaultdocdir}/nano/man-html/fr/ %changelog