From ee0be7eecae7d161777b3fcca3b2856930a640bdb29ad03830de4518dc59513c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.com>
Date: Fri, 4 Jan 2019 06:20:56 +0000
Subject: [PATCH] Accepting request 662704 from home:seanlew:branches:utilities

Update ed

OBS-URL: https://build.opensuse.org/request/show/662704
OBS-URL: https://build.opensuse.org/package/show/utilities/ed?expand=0&rev=28
---
 .gitattributes   |  2 ++
 ed-1.14.2.tar.xz |  3 ---
 ed-1.15.tar      |  3 +++
 ed.changes       | 14 ++++++++++++++
 ed.spec          | 10 +++++-----
 5 files changed, 24 insertions(+), 8 deletions(-)
 delete mode 100644 ed-1.14.2.tar.xz
 create mode 100644 ed-1.15.tar

diff --git a/.gitattributes b/.gitattributes
index 9b03811..a45bad4 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -21,3 +21,5 @@
 *.xz filter=lfs diff=lfs merge=lfs -text
 *.zip filter=lfs diff=lfs merge=lfs -text
 *.zst filter=lfs diff=lfs merge=lfs -text
+## Specific LFS patterns
+ed-1.15.tar filter=lfs diff=lfs merge=lfs -text
diff --git a/ed-1.14.2.tar.xz b/ed-1.14.2.tar.xz
deleted file mode 100644
index 0708483..0000000
--- a/ed-1.14.2.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3264b7293c25bb92d59ffb81a544aad3e549824bfef583492a4c8da7fa3d8395
-size 67660
diff --git a/ed-1.15.tar b/ed-1.15.tar
new file mode 100644
index 0000000..896f97e
--- /dev/null
+++ b/ed-1.15.tar
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0feab43e182c72702ad71380703ce5a2be7d92ab00fb3b01a264f462f9168c64
+size 450560
diff --git a/ed.changes b/ed.changes
index 961e6d0..d52f49b 100644
--- a/ed.changes
+++ b/ed.changes
@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Thu Jan 03 16:39:11 UTC 2019 - sean@suspend.net
+
+- Update to version 1.15:
+        * io.c (print_line): Make '1' command print '\\' before every
+          '$' within the text.
+        * main_loop.c (extract_addresses): Fixed address ',,' to mean
+          '$,$' instead of '1,$'.
+        * regex.c (extract_replacement): Allow newlines even if global.
+        * main_loop.c (exec_command): Make 'c' command reject address 0.
+        * ed.texi: Minor fixes.
+        * configure: Accept appending to CFLAGS, 'CFLAGS+=OPTIONS'.
+        * Switch archive format to tar.
+
 -------------------------------------------------------------------
 Sat Feb 25 07:42:57 UTC 2017 - mpluskal@suse.com
 
diff --git a/ed.spec b/ed.spec
index b430eec..c9fbcf3 100644
--- a/ed.spec
+++ b/ed.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package ed
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 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
@@ -12,18 +12,18 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
 Name:           ed
-Version:        1.14.2
+Version:        1.15
 Release:        0
 Summary:        GNU ed is a line-oriented text editor
-License:        GPL-3.0+ and LGPL-2.1+
+License:        GPL-3.0-or-later AND LGPL-2.1-or-later
 Group:          Productivity/Text/Editors
 Url:            http://www.gnu.org/software/ed/
-Source0:        %{name}-%{version}.tar.xz
+Source0:        %{name}-%{version}.tar
 BuildRequires:  xz
 Requires(post): %{install_info_prereq}
 Requires(preun): %{install_info_prereq}