From f40b0e4afc912a23159179635325021628d036fbfb98d704b8b4034dc06f6419 Mon Sep 17 00:00:00 2001 From: Michal Vyskocil Date: Fri, 26 Apr 2013 08:36:15 +0000 Subject: [PATCH 1/4] - update to 1.8 + Ed now stops reading stdin when reaching real End Of File the first time. (Before it needed to reach EOF twice). + Show the "Try 'ed --help' for more information." message if a bad option is given in the command line. + Quote characters in messages have been changed as advised by GNU Coding Standards. + The description of address offsets in the manual and a link to the Bash manual have been fixed. + Displaying of null characters by the "l" command has been fixed. + The condition deciding when to show the message "Newline appended" has been corrected. + The "modified" flag is now set when reading a non-empty file into an empty buffer. + An error that prevented using NUL characters in regular expressions has been fixed. + Ed now signals an error if it can't create a shell process when executing a shell command. + Ed now flushes stdout/stderr before reading a new command. + Man page is now generated with "help2man". All command-line options are now documented in the man page. - use gpg-offline to verify the package tarball OBS-URL: https://build.opensuse.org/package/show/utilities/ed?expand=0&rev=7 --- ed-1.6.tar.gz | 3 --- ed-1.8.tar.gz | 3 +++ ed-1.8.tar.gz.sig | Bin 0 -> 65 bytes ed.changes | 26 ++++++++++++++++++++++++++ ed.keyring | 28 ++++++++++++++++++++++++++++ ed.spec | 27 +++++++++++++++++++++------ 6 files changed, 78 insertions(+), 9 deletions(-) delete mode 100644 ed-1.6.tar.gz create mode 100644 ed-1.8.tar.gz create mode 100644 ed-1.8.tar.gz.sig create mode 100644 ed.keyring diff --git a/ed-1.6.tar.gz b/ed-1.6.tar.gz deleted file mode 100644 index 5f16431..0000000 --- a/ed-1.6.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:211c67b0c4aae277d34b1c5f842db1952e468e5905142868e4718ac838f08a65 -size 86691 diff --git a/ed-1.8.tar.gz b/ed-1.8.tar.gz new file mode 100644 index 0000000..efd82f6 --- /dev/null +++ b/ed-1.8.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:64c138d33b1ea4b9daa88e045da0619e2a43cb99a9d378417d20163f410a7273 +size 86844 diff --git a/ed-1.8.tar.gz.sig b/ed-1.8.tar.gz.sig new file mode 100644 index 0000000000000000000000000000000000000000000000000000000000000000..324fdf4aab12a449dfbf15e92a096fd955b2a0dcf35186e5fa2cc5a3ca535159 GIT binary patch literal 65 zcmV-H0KWf-KLZ5-QFfgskLi^I6D@Z_5dwuh0H0j)()(*qcv;&@qRp`gby;%H1D61x XyeG(Xn}A2Ax^7Br7Vq0az63l&OTrs_ literal 0 HcmV?d00001 diff --git a/ed.changes b/ed.changes index 72af05d..d707a98 100644 --- a/ed.changes +++ b/ed.changes @@ -1,3 +1,29 @@ +------------------------------------------------------------------- +Fri Apr 26 08:28:40 UTC 2013 - mvyskocil@suse.com + +- update to 1.8 + + Ed now stops reading stdin when reaching real End Of File the first + time. (Before it needed to reach EOF twice). + + Show the "Try 'ed --help' for more information." message if a bad + option is given in the command line. + + Quote characters in messages have been changed as advised by GNU + Coding Standards. + + The description of address offsets in the manual and a link to the + Bash manual have been fixed. + + Displaying of null characters by the "l" command has been fixed. + + The condition deciding when to show the message "Newline appended" has + been corrected. + + The "modified" flag is now set when reading a non-empty file into + an empty buffer. + + An error that prevented using NUL characters in regular expressions + has been fixed. + + Ed now signals an error if it can't create a shell process when + executing a shell command. + + Ed now flushes stdout/stderr before reading a new command. + + Man page is now generated with "help2man". All command-line options + are now documented in the man page. +- use gpg-offline to verify the package tarball + ------------------------------------------------------------------- Tue Mar 26 08:23:07 UTC 2013 - mmeister@suse.com diff --git a/ed.keyring b/ed.keyring new file mode 100644 index 0000000..07f79b9 --- /dev/null +++ b/ed.keyring @@ -0,0 +1,28 @@ +pub 1024D/132D7742 2003-09-17 +uid Antonio Diaz +sub 1024g/754578DA 2003-09-17 + +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v2.0.19 (GNU/Linux) + +mQGiBD9odIARBADkRI3Qc2qWpoxOFBlD8L5JaQlIEAaPI/19Y/z4ORHESY6s2Tfm +EtC51vlu8V/hXX8Sh4OZC3CrBIwhvSyIVIXbas+GR09B+8GRsfekRUS7jiwz/FsZ +Rnb0AjV1zNjJZazjyOUQjBou3Mo1MwiQXzeMQzqLC1xW+ABkAbQnAnZZIwCgvquq +rmQ1LKpBpYhb876T8x9TZIcD/2KTMvrvJVj+tKiRp6Wfiib8B4unllXAQ04hlul2 +FP5oVIETdhQjsxj7/8F8yOONGgnL5Vn1+6sldd0LQ9il4MiZ36VFOec2xAeyYoB1 +D3hup/zUTjzljj+JyKyGXahrwm0941QhYr+Kw/99dvE0pB8CsaQ5/e5R70uv7YnD +ZT9xA/wO4acdvGCLDw5ZPVKZW1rcgGL1Pr2nWCc92hv4SxdSWu3FU8aeGOVwJa2q +I/CwiEk2oEXI/WwTEf9mde3qlsc1SkRKgR0DDj+7Az5MUcilCUDv2BG2mLa+dEus +zwqLDPmjo2AWP1L2UIx7c46U9suvcGBwsI7NSnD9PLrvrUVGYrQjQW50b25pbyBE +aWF6IDxhbnRfZGlhekB0ZWxlbGluZS5lcz6IYQQTEQIAGQUCP2h0gAQLBwMCAxUC +AwMWAgECHgECF4AAEgkQj+mVAxMtd0IHZUdQRwABASgPAJ9FP48ts9GETKX1Kc6m +P6trpaMZdACfTNqHKHiG5qaFqp1dT93+iM4KMgu5AQ0EP2h0khAEALs2v8E4IE6i +8W0gCcW59yUGJRnWMLyS81MLSLy+lquHRaujJEI1/Ni6NzgfrMtt7/2E+F7FJNHw +YPSrebYzEacAOlvCEcWuwwr5OmT929ru3CU9abC3hk6X7CyZdEb13qINd2BV9OG5 +djTT2VjpNFQeU9YIJ7jOSOxFXRKr2rLTAAMFBACHcUXAcqrYz2p+7KTGWEykO3YJ +t6LCch4yk4fBehVwbxqF/GVpPUn1GcoiTMwn0pK57Kpa+MasN9YCagVteBD+u/za +qYQzArCaDvmTOS16VWUUyJypfU3UpPVO1x7RQDG7F3VWL9J8zMkttzSzh8cN1+dV +kft+Cr5Iz0XQMdyqe4hOBBgRAgAGBQI/aHSSABIJEI/plQMTLXdCB2VHUEcAAQFo +dgCfVuhwTHwY3KREb9EF7ahy2MUQWU0AoIwi6s8g7NijbSwECruQhH3Hyq/B +=1P0w +-----END PGP PUBLIC KEY BLOCK----- diff --git a/ed.spec b/ed.spec index cec70fb..f24ac63 100644 --- a/ed.spec +++ b/ed.spec @@ -16,20 +16,35 @@ # Name: ed +Version: 1.8 +Release: 1 +Summary: GNU ed is a line-oriented text editor Url: http://www.gnu.org/software/ed/ +Source0: http://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.gz +Source1: http://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.gz.sig +Source2: ed.keyring License: GPL-3.0+ and LGPL-2.1+ Group: Productivity/Editors/Other -PreReq: %install_info_prereq -Version: 1.6 -Release: 1 -Summary: Standard UNIX Line Editor -Source: http://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.gz +%if 0%{?suse_version} >= 1230 +BuildRequires: gpg-offline +%endif +Requires(pre): %install_info_prereq BuildRoot: %{_tmppath}/%{name}-%{version}-build %description -The standard, old Unix line editor. +GNU ed is a line-oriented text editor. It is used to create, display, +modify and otherwise manipulate text files, both interactively and via +shell scripts. A restricted version of ed, red, can only edit files in +the current directory and cannot execute shell commands. Ed is the +"standard" text editor in the sense that it is the original editor for +Unix, and thus widely available. For most purposes, however, it is +superseded by full-screen editors such as GNU Emacs or GNU Moe. %prep +%if 0%{?suse_version} >= 1230 +%gpg_verify %{SOURCE1} +%endif + %setup -q sed -i \ -e "s/CFLAGS='.*/CFLAGS='%{optflags}'/" \ From b3981596a3b1070308896b41573159261698e588986d7273d6657b8cd34f207f Mon Sep 17 00:00:00 2001 From: Michal Vyskocil Date: Fri, 26 Apr 2013 08:37:17 +0000 Subject: [PATCH 2/4] fixes changes OBS-URL: https://build.opensuse.org/package/show/utilities/ed?expand=0&rev=8 --- ed.changes | 1 + 1 file changed, 1 insertion(+) diff --git a/ed.changes b/ed.changes index d707a98..5d25262 100644 --- a/ed.changes +++ b/ed.changes @@ -23,6 +23,7 @@ Fri Apr 26 08:28:40 UTC 2013 - mvyskocil@suse.com + Man page is now generated with "help2man". All command-line options are now documented in the man page. - use gpg-offline to verify the package tarball +- adapt the Summary and Description according current README ------------------------------------------------------------------- Tue Mar 26 08:23:07 UTC 2013 - mmeister@suse.com From e4abeef9d44bb58718ae616d6acd0a533c2c68f3fbe1ff0504f0fedb9af26560 Mon Sep 17 00:00:00 2001 From: Michal Vyskocil Date: Fri, 26 Apr 2013 10:02:08 +0000 Subject: [PATCH 3/4] OBS-URL: https://build.opensuse.org/package/show/utilities/ed?expand=0&rev=9 --- ed-1.6.tar.gz | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 ed-1.6.tar.gz diff --git a/ed-1.6.tar.gz b/ed-1.6.tar.gz new file mode 100644 index 0000000..5f16431 --- /dev/null +++ b/ed-1.6.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:211c67b0c4aae277d34b1c5f842db1952e468e5905142868e4718ac838f08a65 +size 86691 From 90d446321fdfd589fd9210a5d7f6320e1a9caf6a1b9c332c16988ac4191d52a4 Mon Sep 17 00:00:00 2001 From: Michal Vyskocil Date: Fri, 26 Apr 2013 10:05:17 +0000 Subject: [PATCH 4/4] D ed-1.6.tag.gz OBS-URL: https://build.opensuse.org/package/show/utilities/ed?expand=0&rev=11 --- ed-1.6.tar.gz | 3 --- ed.spec | 11 ++++++----- 2 files changed, 6 insertions(+), 8 deletions(-) delete mode 100644 ed-1.6.tar.gz diff --git a/ed-1.6.tar.gz b/ed-1.6.tar.gz deleted file mode 100644 index 5f16431..0000000 --- a/ed-1.6.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:211c67b0c4aae277d34b1c5f842db1952e468e5905142868e4718ac838f08a65 -size 86691 diff --git a/ed.spec b/ed.spec index f24ac63..7b96751 100644 --- a/ed.spec +++ b/ed.spec @@ -1,7 +1,7 @@ # -# spec file for package ed (Version 1.5) +# spec file for package ed # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,16 +15,17 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: ed Version: 1.8 -Release: 1 +Release: 0 Summary: GNU ed is a line-oriented text editor +License: GPL-3.0+ and LGPL-2.1+ +Group: Productivity/Editors/Other Url: http://www.gnu.org/software/ed/ Source0: http://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.gz Source1: http://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.gz.sig Source2: ed.keyring -License: GPL-3.0+ and LGPL-2.1+ -Group: Productivity/Editors/Other %if 0%{?suse_version} >= 1230 BuildRequires: gpg-offline %endif