Accepting request 963368 from home:dirkmueller:Factory

- update to 1.18:
  * The shell escape command (!) now flushes stdout so that the modified command
    is always printed before being executed even if standard output is fully
    buffered (for example, a file).
  * A couple of harmless memory leaks have been fixed. (They both happened just
    before ed exits). 
  * The pointer returned by the function 'strip_escapes' is now checked. (It may
    be null if memory is exhausted).
  * The shell escape command (!) now removes the backslash from each escaped '%'
    character within the text of the shell command line.
  * Case-insensitive regular expressions have been implemented as in GNU sed.
  * Syntax errors in regular expressions, for example unmatched ( or \(, no
    longer overwrite a previously compiled regular expression, preventing a
    "No previous pattern" error.
  * The option '--strip-trailing-cr', which removes carriage returns at end of
    text lines, has been added.
  * Loading a file now fails if a line is longer than INT_MAX bytes or if the
    file contains more than INT_MAX lines (usually 2 Gi lines). (Instead of
    overflowing line addresses).
  * In interactive mode ed now sets final exit status to 1 if a fatal error
    happens while reading the file passed in the command line.
  * red now reports "Directory access restricted" instead of "Invalid filename"
    when trying to edit a file outside of the current directory.
  * The new chapter "The 's' Command" has been added to the manual.
- switch to zstd
- remove usrmerged handling

OBS-URL: https://build.opensuse.org/request/show/963368
OBS-URL: https://build.opensuse.org/package/show/utilities/ed?expand=0&rev=39

ed-1.17.tar.xz

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

ed-1.18.tar.zst

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

ed.changes

@@ -1,3 +1,33 @@
+-------------------------------------------------------------------
+Sun Mar 20 21:35:29 UTC 2022 - Dirk Müller <dmueller@suse.com>
+
+- update to 1.18:
+  * The shell escape command (!) now flushes stdout so that the modified command
+    is always printed before being executed even if standard output is fully
+    buffered (for example, a file).
+  * A couple of harmless memory leaks have been fixed. (They both happened just
+    before ed exits). 
+  * The pointer returned by the function 'strip_escapes' is now checked. (It may
+    be null if memory is exhausted).
+  * The shell escape command (!) now removes the backslash from each escaped '%'
+    character within the text of the shell command line.
+  * Case-insensitive regular expressions have been implemented as in GNU sed.
+  * Syntax errors in regular expressions, for example unmatched ( or \(, no
+    longer overwrite a previously compiled regular expression, preventing a
+    "No previous pattern" error.
+  * The option '--strip-trailing-cr', which removes carriage returns at end of
+    text lines, has been added.
+  * Loading a file now fails if a line is longer than INT_MAX bytes or if the
+    file contains more than INT_MAX lines (usually 2 Gi lines). (Instead of
+    overflowing line addresses).
+  * In interactive mode ed now sets final exit status to 1 if a fatal error
+    happens while reading the file passed in the command line.
+  * red now reports "Directory access restricted" instead of "Invalid filename"
+    when trying to edit a file outside of the current directory.
+  * The new chapter "The 's' Command" has been added to the manual.
+- switch to zstd
+- remove usrmerged handling
+
 -------------------------------------------------------------------
 Mon Jan 25 10:34:49 UTC 2021 - Paolo Stivanin <info@paolostivanin.com>
 

ed.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package ed
 #
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,17 +17,18 @@
 
 
 Name:           ed
-Version:        1.17
+Version:        1.18
 Release:        0
 Summary:        A line-oriented text editor
 License:        GPL-3.0-or-later AND LGPL-2.1-or-later
 Group:          Productivity/Text/Editors
 URL:            https://www.gnu.org/software/ed/
-# This is just recompressed from  http://ftp.gnu.org/gnu/ed/ed-%{version}.tar.lz
+# This is just recompressed from  https://ftp.gnu.org/gnu/ed/ed-%%{version}.tar.lz
 # in order to avoid pulling lzip to ring0
-Source0:        ed-%{version}.tar.xz
+Source0:        ed-%{version}.tar.zst
+BuildRequires:  zstd
 Requires(post): %{install_info_prereq}
-Requires(preun): %{install_info_prereq}
+Requires(preun):%{install_info_prereq}
 
 %description
 GNU ed is a line-oriented text editor. It is used to create, display,
@@ -47,10 +48,6 @@ superseded by full-screen editors such as GNU Emacs or GNU Moe.
 
 %install
 %make_install
-%if !0%{?usrmerged}
-install -d -m 0755 %{buildroot}/bin
-ln -s %{_bindir}/ed %{buildroot}/bin/ed
-%endif
 
 %check
 %make_build check
@@ -63,10 +60,7 @@ ln -s %{_bindir}/ed %{buildroot}/bin/ed
 
 %files
 %license COPYING
-%doc AUTHORS ChangeLog NEWS README TODO
+%doc AUTHORS ChangeLog NEWS README
-%if !0%{?usrmerged}
-/bin/%{name}
-%endif
 %{_bindir}/%{name}
 %{_bindir}/r%{name}
 %{_infodir}/%{name}.info%{?ext_info}