Accepting request 449078 from home:pluskalm:branches:utilities

- Update to version 1.14:

OBS-URL: https://build.opensuse.org/request/show/449078
OBS-URL: https://build.opensuse.org/package/show/utilities/ed?expand=0&rev=24
This commit is contained in:
Peter Simons 2017-01-09 07:14:51 +00:00 committed by Git OBS Bridge
parent 36eea51609
commit 99567dd032
4 changed files with 42 additions and 16 deletions

View File

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

3
ed-1.14.tar.xz Normal file
View File

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

View File

@ -1,3 +1,33 @@
-------------------------------------------------------------------
Sat Jan 7 13:35:45 UTC 2017 - mpluskal@suse.com
- Update to version 1.14:
* Print counts, messages, '?' and '!' to stdout instead of stderr.
* buffer.c (append_lines): Fixed current address after empty 'i'.
* regex.c (set_subst_regex): Treat missing delimiters consistently.
* (extract_replacement): Don't replace 'a' with '%' in 's/a/%'.
* Fixed infinite loop with EOF in the middle of a replacement.
* Don't accept newlines in replacement in a global command.
* Last delimiter can't be omitted if not last in command list.
* (search_and_replace): Set current address to last line modified.
* main_loop.c (extract_addresses): Fixed address offsets;
* '3 ---- 2' was calculated as -2 instead of 1.
* Accept ranges with the first address omitted.
* (exec_command): Fixed current address after empty replacement
text in 'c' command.
* Don't clear the modified status after writing the buffer to a
shell command. (Reported by Jérôme Frgacic).
* (get_command_suffix): Don't allow repeated print suffixes.
* (command_s): Accept suffixes in any order.
* Don't allow multiple count suffixes.
* 'sp' now toggles all print suffixes.
* (main_loop): Make EOF on stdin behave as a 'q' command.
* ed.texi: Fixed the description of commands 'acegijkmqrsuw'.
* Documented that ed allows any combination of print suffixes.
* testsuite: Improved most tests. Simplified bug reporting.
* configure: Avoid warning on some shells when testing for gcc.
* Makefile.in: Detect the existence of install-info.
-------------------------------------------------------------------
Fri Feb 12 17:51:01 UTC 2016 - mpluskal@suse.com

22
ed.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package ed
#
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2017 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
@ -17,16 +17,16 @@
Name: ed
Version: 1.13
Version: 1.14
Release: 0
Summary: GNU ed is a line-oriented text editor
License: GPL-3.0+ and LGPL-2.1+
Group: Productivity/Editors/Other
Group: Productivity/Text/Editors
Url: http://www.gnu.org/software/ed/
Source0: %{name}-%{version}.tar.xz
BuildRequires: xz
Requires(preun): %{install_info_prereq}
Requires(post): %{install_info_prereq}
Requires(preun): %{install_info_prereq}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@ -40,17 +40,13 @@ superseded by full-screen editors such as GNU Emacs or GNU Moe.
%prep
%setup -q
sed -i \
-e "s/CFLAGS='.*/CFLAGS='%{optflags}'/" \
-e "s/CXXFLAGS='.*/CXXFLAGS='%{optflags}'/" \
configure
%build
%configure
make %{?_smp_mflags}
make %{?_smp_mflags} CFLAGS="%{optflags}"
%install
make %{?_smp_mflags} DESTDIR=%{buildroot} install
%make_install
#UsrMerge
install -d -m 0755 %{buildroot}/bin
ln -s %{_bindir}/ed %{buildroot}/bin/ed
@ -60,10 +56,10 @@ ln -s %{_bindir}/ed %{buildroot}/bin/ed
make %{?_smp_mflags} check
%post
%install_info --entry="* ed: (ed). Line-oriented text editor" --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz
%install_info --entry="* ed: (ed). Line-oriented text editor" --info-dir=%{_infodir} %{_infodir}/%{name}.info%{ext_info}
%preun
%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)
@ -71,7 +67,7 @@ make %{?_smp_mflags} check
/bin/%{name}
%{_bindir}/%{name}
%{_bindir}/r%{name}
%{_infodir}/%{name}.info.*
%{_infodir}/%{name}.info%{ext_info}
%{_mandir}/man1/%{name}.1%{ext_man}
%{_mandir}/man1/r%{name}.1%{ext_man}