From ee0be7eecae7d161777b3fcca3b2856930a640bdb29ad03830de4518dc59513c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Fri, 4 Jan 2019 06:20:56 +0000 Subject: [PATCH 1/4] 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} From ea43db526ea024383dc55f9a772527e39b84bfed60bd34cfda229c2c61c5dde0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Fri, 4 Jan 2019 13:40:04 +0000 Subject: [PATCH 2/4] Accepting request 662797 from home:jengelh:branches:utilities - Avoid repetition of package name in summary. OBS-URL: https://build.opensuse.org/request/show/662797 OBS-URL: https://build.opensuse.org/package/show/utilities/ed?expand=0&rev=29 --- ed.changes | 5 +++++ ed.spec | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ed.changes b/ed.changes index d52f49b..c4148c6 100644 --- a/ed.changes +++ b/ed.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Jan 4 13:30:10 UTC 2019 - Jan Engelhardt + +- Avoid repetition of package name in summary. + ------------------------------------------------------------------- Thu Jan 03 16:39:11 UTC 2019 - sean@suspend.net diff --git a/ed.spec b/ed.spec index c9fbcf3..6b4f7c0 100644 --- a/ed.spec +++ b/ed.spec @@ -19,7 +19,7 @@ Name: ed Version: 1.15 Release: 0 -Summary: GNU ed is a line-oriented text editor +Summary: A line-oriented text editor License: GPL-3.0-or-later AND LGPL-2.1-or-later Group: Productivity/Text/Editors Url: http://www.gnu.org/software/ed/ From 26a990a51b77d9b3b193126fefa6f777fb711aa639cf20758d05999d54b0bc33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Mon, 7 Jan 2019 08:50:11 +0000 Subject: [PATCH 3/4] - Use upstream released tarball OBS-URL: https://build.opensuse.org/package/show/utilities/ed?expand=0&rev=30 --- .gitattributes | 2 -- ed-1.15.tar | 3 --- ed-1.15.tar.lz | 3 +++ ed-1.15.tar.lz.sig | Bin 0 -> 72 bytes ed.changes | 5 +++++ ed.spec | 18 +++++++++--------- 6 files changed, 17 insertions(+), 14 deletions(-) delete mode 100644 ed-1.15.tar create mode 100644 ed-1.15.tar.lz create mode 100644 ed-1.15.tar.lz.sig diff --git a/.gitattributes b/.gitattributes index a45bad4..9b03811 100644 --- a/.gitattributes +++ b/.gitattributes @@ -21,5 +21,3 @@ *.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.15.tar b/ed-1.15.tar deleted file mode 100644 index 896f97e..0000000 --- a/ed-1.15.tar +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0feab43e182c72702ad71380703ce5a2be7d92ab00fb3b01a264f462f9168c64 -size 450560 diff --git a/ed-1.15.tar.lz b/ed-1.15.tar.lz new file mode 100644 index 0000000..59ddd00 --- /dev/null +++ b/ed-1.15.tar.lz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ad4489c0ad7a108c514262da28e6c2a426946fb408a3977ef1ed34308bdfd174 +size 67343 diff --git a/ed-1.15.tar.lz.sig b/ed-1.15.tar.lz.sig new file mode 100644 index 0000000000000000000000000000000000000000000000000000000000000000..6a3f57f9fb919643f8aacd6502c5a35bd3575e5848176dd47850f64d4ac05afe GIT binary patch literal 72 zcmV-O0Jr~$Mg#y60ssaD0$eM#LjVd15Rd7V0~0NGLd?Mcpp{vcqMJCJ0D#RsaOz+P e60vSxYXF~eSJfhu{Qa1NYVCOG@ + +- Use upstream released tarball + ------------------------------------------------------------------- Fri Jan 4 13:30:10 UTC 2019 - Jan Engelhardt diff --git a/ed.spec b/ed.spec index 6b4f7c0..27ded3f 100644 --- a/ed.spec +++ b/ed.spec @@ -22,12 +22,12 @@ 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: http://www.gnu.org/software/ed/ -Source0: %{name}-%{version}.tar -BuildRequires: xz +URL: http://www.gnu.org/software/ed/ +Source0: http://ftp.gnu.org/gnu/ed/ed-%{version}.tar.lz +Source1: https://ftp.gnu.org/gnu/ed/ed-%{version}.tar.lz.sig +BuildRequires: lzip Requires(post): %{install_info_prereq} Requires(preun): %{install_info_prereq} -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description GNU ed is a line-oriented text editor. It is used to create, display, @@ -62,13 +62,13 @@ make %{?_smp_mflags} check %install_info_delete --info-dir=%{_infodir} %{_infodir}/%{name}.info%{ext_info} %files -%defattr(-,root,root) -%doc AUTHORS ChangeLog COPYING NEWS README TODO +%license COPYING +%doc AUTHORS ChangeLog NEWS README TODO /bin/%{name} %{_bindir}/%{name} %{_bindir}/r%{name} -%{_infodir}/%{name}.info%{ext_info} -%{_mandir}/man1/%{name}.1%{ext_man} -%{_mandir}/man1/r%{name}.1%{ext_man} +%{_infodir}/%{name}.info%{?ext_info} +%{_mandir}/man1/%{name}.1%{?ext_man} +%{_mandir}/man1/r%{name}.1%{?ext_man} %changelog From a2587cbeb0d9a001565b2723b5ccfc5f4b35a0b0babed1042c83fb3c21fddca5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Thu, 10 Jan 2019 08:54:47 +0000 Subject: [PATCH 4/4] - Switch back to hand provided tarball in order to avoid pulling lzip to the Ring0 OBS-URL: https://build.opensuse.org/package/show/utilities/ed?expand=0&rev=31 --- ed-1.15.tar.lz | 3 --- ed-1.15.tar.lz.sig | Bin 72 -> 0 bytes ed-1.15.tar.xz | 3 +++ ed.changes | 6 ++++++ ed.spec | 8 +++++--- 5 files changed, 14 insertions(+), 6 deletions(-) delete mode 100644 ed-1.15.tar.lz delete mode 100644 ed-1.15.tar.lz.sig create mode 100644 ed-1.15.tar.xz diff --git a/ed-1.15.tar.lz b/ed-1.15.tar.lz deleted file mode 100644 index 59ddd00..0000000 --- a/ed-1.15.tar.lz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ad4489c0ad7a108c514262da28e6c2a426946fb408a3977ef1ed34308bdfd174 -size 67343 diff --git a/ed-1.15.tar.lz.sig b/ed-1.15.tar.lz.sig deleted file mode 100644 index 6a3f57f9fb919643f8aacd6502c5a35bd3575e5848176dd47850f64d4ac05afe..0000000000000000000000000000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 72 zcmV-O0Jr~$Mg#y60ssaD0$eM#LjVd15Rd7V0~0NGLd?Mcpp{vcqMJCJ0D#RsaOz+P e60vSxYXF~eSJfhu{Qa1NYVCOG@ + +- Switch back to hand provided tarball in order to avoid pulling + lzip to the Ring0 + ------------------------------------------------------------------- Mon Jan 7 08:49:12 UTC 2019 - Tomáš Chvátal diff --git a/ed.spec b/ed.spec index 27ded3f..0329165 100644 --- a/ed.spec +++ b/ed.spec @@ -23,9 +23,11 @@ Summary: A line-oriented text editor License: GPL-3.0-or-later AND LGPL-2.1-or-later Group: Productivity/Text/Editors URL: http://www.gnu.org/software/ed/ -Source0: http://ftp.gnu.org/gnu/ed/ed-%{version}.tar.lz -Source1: https://ftp.gnu.org/gnu/ed/ed-%{version}.tar.lz.sig -BuildRequires: lzip +# This is just recompressed bellow in order to avoid pulling lzip to ring0 +Source0: ed-%{version}.tar.xz +#Source0: http://ftp.gnu.org/gnu/ed/ed-%{version}.tar.lz +#Source1: https://ftp.gnu.org/gnu/ed/ed-%{version}.tar.lz.sig +#BuildRequires: lzip Requires(post): %{install_info_prereq} Requires(preun): %{install_info_prereq}