SHA256
1
0
forked from pool/nano

Accepting request 293129 from editors

1

OBS-URL: https://build.opensuse.org/request/show/293129
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/nano?expand=0&rev=36
This commit is contained in:
Dominique Leuenberger 2015-03-27 08:40:39 +00:00 committed by Git OBS Bridge
commit b09abeebf1
4 changed files with 147 additions and 41 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a74bf3f18b12c1c777ae737c0e463152439e381aba8720b4bc67449f36a09534
size 1816012

3
nano-2.4.0.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:5076fb502680503e648cbdcbf2077e39fba193420ae19203f0a54cb2d94a75bd
size 1886052

View File

@ -1,3 +1,113 @@
-------------------------------------------------------------------
Mon Mar 23 20:10:23 UTC 2015 - sor.alexei@meowr.ru
- Update to 2.4.0:
* doc/nanorc.sample.in: Remove undo section which is now obsolete.
* doc/syntax/nanorc.nanorc: Remove 'undo' from the valid options.
* doc/texinfo/nano.texi, doc/man/nanorc.5: Typo fix.
* src/global.c (add_to_sclist): Remove the now unused and unneeded
addition ability from this builder function of the shortcut list.
* src/global.c (strtokeytype): Move this to a better place.
* src/global.c (first_sc_for): Move this too to a better place.
* src/prompt.c (do_yesno_prompt): Use the new and more direct
func_from_key() wrapper instead of get_shortcut().
* src/text.c (do_linter): Likewise.
* src/files.c (do_insertfile, do_writeout): Likewise.
* src/files.c (do_insertfile): Adjust some indentation.
* src/prompt.c (do_statusbar_input), src/browser.c (do_browser):
Reorder a few things, and adjust some whitespace.
* doc/man/nano.1, doc/man/rnano.1: Separate short and long option
by a comma instead of putting the long one between parentheses.
And showing the required quotes around the argument of -Q.
* doc/texinfo/nano.texi: Standardize the formatting of command-line
options -- each one separately. Also add some more markup.
* doc/man/nano.1, doc/man/rnano.1: Tweak the formatting a bit so
that po4a will create a nicer POT file.
* doc/man/nanorc.5: Improve some of the wordings and formatting.
* doc/syntax/nanorc.nanorc: Remove a mistaken OR which causes a
'Bad regex, empty (sub)expression' error on some systems.
* doc/texinfo/nano.texi: Improve some wordings and formatting.
* src/text.c (do_justify): Replace the old get_shortcut() wrapper
with the new func_from_key().
* doc/syntax/{perl,python,ruby,sh}.nanorc: Recognize also header
lines of the form "#!/usr/bin/env thing" besides "#!/bin/thing".
* doc/syntax/spec.nanorc: Colorize %pretrans and %posttrans fully.
* src/files.c (do_lockfile): Gettextize the "File being edited"
prompt, and improve its wording.
* src/winio.c (do_credits): Remove the names of past translators
from the Easter-egg scroll.
* THANKS: Add a missing historical translator name.
* src/winio.c (do_credits): Add Mark to the scroll, for all his
undo work, colouring nano's interface, and other patches.
* New formatter code to support syntaxes like
go which have tools to automatically lint and reformat the text
for you (gofmt), which is lovely. rcfile option formatter,
function text.c:do_formatter() and some other calls.
* src/files.c (open_buffer): Check here for locking and properly
handle choosing to not open a file when locked instead of in
open_file().
* src/winio.c (do_credits): Add a general entry for all translators.
* src/files.c (write_lockfile): Avoid writing uninitialized bytes
to the lock file -- a simple null_at() would not initialize the
buffer.
* src/files.c (do_lockfile): Make sure that 'lockprog' and
'lockuser' are terminated -- strncpy() does not guarantee that
on its own.
* src/files.c (do_lockfile): Avoid printing a wrong PID on the
status bar due to treating serialized PID bytes as signed
integers.
* src/files.c (write_lockfile): Do not trim the nano version
number -- snprintf() counts the trailing zero into the size limit.
* src/cut.c (do_cut_text): Make sure to set modified even when
using --enable-tiny.
* src/file.c (do_lockfile): Also show the name of the affected file
when finding a lock file, for when many files are opened at once.
* src/file.c (do_lockfile): The user does the editing, not the editor.
* doc/syntax/sh.nanorc: Recognize also dash, openrc and runscript.
* README: Fix the explanation of how to subscribe to a mailing list.
* doc/syntax/{java,lua,python,ruby}.nanorc: Wrap some overlong lines.
* src/rcfile.c (parse_binding): Add an exception for do_toggle() as
rebinding toggles broke with r5022. (Fixed in r5134.)
* doc/man/nanorc.5, doc/texinfo/nano.texi: Add a note about the
inherent imperfection of using regular expressions for syntax
highlighting.
* doc/man/nanorc.5: Improve the indentation of some lists.
* doc/man/nanorc.5, doc/texinfo/nano.texi: Remove the mistaken
square brackets around the arguments of "header" and "magic" --
those arguments are not optional. Also add "formatter" to the
texinfo document, and slightly improve its punctuation.
* src/proto.h, src/nano.c: Fix compilation with --enable-tiny plus
--enable-nanorc.
* src/rcfile.c (parse_binding): Fix the rebinding of toggles.
* doc/man/{nano.1,rnano.1,nanorc.5}, doc/texinfo/nano.texi: Update
years and version numbers in the docs in anticipation of a release.
* src/nano.c (version): Drop compile time from version information
to enable a reproducible build.
* src/nano.c (renumber): Get out if there is nothing to renumber,
to prevent do_undo() from falling over trying to renumber emptiness.
* src/text.c (do_formatter): Fix a message plus a few comments.
* src/text.c (do_alt_speller): Do not set the modified flag when
an external spell checker didn't make any changes.
* src/nano.c (finish_stdin_pager, cancel_stdin_pager, stdin_pager):
Normalize the whitespace, remove an old comment, and place another
one better.
* src/text.c (do_undo): Make a message equal to another one. It
was mistakenly changed in r4950. (This is translation-neutral.)
* src/global.c (shortcut_init): Keep related items together in the
^G help screen.
* src/text.c (do_alt_speller): Restore the positions of the mark
and the cursor in a better way: to the columns where they were.
* src/text.c (do_alt_speller): Remove some leftovers.
* src/search.c: Place some comments better and unwrap some lines.
* src/chars.c (move_mbleft): Start looking for a multibyte char
not at the start of the string, but only as far back as such a
char can possibly be. Change suggested by Mark Majeres.
* src/search.c (findnextstr): Step backward or forward not simply
one byte but one character (possibly multibyte).
* src/winio.c (edit_redraw): Do not center the current line when
smooth scrolling is used.
- Do less manually in spec.
-------------------------------------------------------------------
Tue Sep 16 18:24:20 UTC 2014 - asterios.dramis@gmail.com

View File

@ -1,7 +1,7 @@
#
# spec file for package nano
#
# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -16,15 +16,22 @@
#
%define _version 2.4
Name: nano
Version: 2.3.6
Version: 2.4.0
Release: 0
Summary: Pico Editor Clone with Enhancements
Summary: Pico editor clone with enhancements
License: GPL-3.0+
Group: Productivity/Editors/Other
Url: http://www.nano-editor.org/
Source0: http://www.nano-editor.org/dist/v2.3/%{name}-%{version}.tar.gz
Url: http://nano-editor.org/
Source0: http://nano-editor.org/dist/v%{_version}/%{name}-%{version}.tar.gz
BuildRequires: file-devel
BuildRequires: ncurses-devel
BuildRequires: pkg-config
Requires(post): info
Requires(preun): info
Recommends: %{name}-lang = %{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if 0%{?suse_version} > 1230
BuildRequires: groff-full
%else
@ -35,69 +42,58 @@ BuildRequires: makeinfo
%else
BuildRequires: texinfo
%endif
BuildRequires: ncurses-devel
BuildRequires: pkg-config
Requires(post): info
Requires(preun): info
Recommends: %{name}-lang = %{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
GNU nano is a small and friendly text editor. It aims to emulate the
Pico text editor while also offering a few enhancements.
GNU nano is a small and friendly text editor. It aims to emulate
the Pico text editor while also offering a few enhancements.
%lang_package
%prep
%setup -q
# Remove build time references so build-compare can do its work
# Remove build time references so build-compare can do its work.
FAKE_BUILDTIME=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%H:%%M')
FAKE_BUILDDATE=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%b %%e %%Y')
sed -i "s/__TIME__/\"$FAKE_BUILDTIME\"/" src/nano.c
sed -i "s/__DATE__/\"$FAKE_BUILDDATE\"/" src/nano.c
%build
%configure --disable-rpath --enable-utf8
%configure \
--disable-rpath \
--enable-utf8
make %{?_smp_mflags}
%install
%makeinstall
%make_install
# Remove doc files that should be in defaultdocdir
rm -rf %{buildroot}%{_datadir}/nano/man-html/
rm -rf %{buildroot}%{_datadir}/doc/nano/
# Manually install the doc files in order to easily split them between the main and lang package
install -dpm 0755 %{buildroot}%{_defaultdocdir}/nano
install -pm 0644 AUTHORS COPYING COPYING.DOC ChangeLog ChangeLog.pre-2.1 NEWS README THANKS TODO UPGRADE %{buildroot}%{_defaultdocdir}/nano/
install -pm 0644 doc/faq.html doc/nanorc.sample %{buildroot}%{_defaultdocdir}/nano/
install -dpm 0755 %{buildroot}%{_defaultdocdir}/nano/man-html/fr
install -pm 0644 doc/man/*.html %{buildroot}%{_defaultdocdir}/nano/man-html/
install -pm 0644 doc/man/fr/*.html %{buildroot}%{_defaultdocdir}/nano/man-html/fr/
# Move documents to a proper directory.
mkdir -p %{buildroot}%{_docdir}/
mv -f %{buildroot}%{_datadir}/doc/%{name}/ %{buildroot}%{_docdir}/%{name}/
%find_lang %{name} --with-man --all-name
%post
%install_info --info-dir=%{_infodir} %{_infodir}/%{name}.info%{ext_info}
%install_info --info-dir=%{_infodir} %{_infodir}/%{name}.info%{?ext_info}
%preun
%install_info_delete --info-dir=%{_infodir} %{_infodir}/%{name}.info%{ext_info}
%install_info_delete --info-dir=%{_infodir} %{_infodir}/%{name}.info%{?ext_info}
%files
%defattr(-,root,root,-)
%doc %{_defaultdocdir}/nano/
%exclude %{_defaultdocdir}/nano/man-html/fr/
%defattr(-,root,root)
%doc AUTHORS ChangeLog ChangeLog.pre-2.1 COPYING COPYING.DOC NEWS README THANKS TODO UPGRADE
%doc %{_docdir}/nano/
%exclude %{_docdir}/%{name}/*/
%{_bindir}/nano
%{_bindir}/rnano
%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/
%{_infodir}/nano.info%{?ext_info}
%{_mandir}/man1/nano.1%{?ext_man}
%{_mandir}/man1/rnano.1%{?ext_man}
%{_mandir}/man5/nanorc.5%{?ext_man}
%files lang -f %{name}.lang
%defattr(-,root,root,-)
%doc %{_defaultdocdir}/nano/man-html/fr/
%defattr(-,root,root)
%doc %{_docdir}/%{name}/*/
%changelog