From b811987635f983906b9a96b6cbeb76d289d756bd58f604abfed93b064d7c55ff Mon Sep 17 00:00:00 2001 From: OBS User mrdocs Date: Tue, 3 Jan 2012 02:30:37 +0000 Subject: [PATCH 1/2] Accepting request 98540 from home:dlovasko:branches:utilities Update to 1.6 (bugfix release) OBS-URL: https://build.opensuse.org/request/show/98540 OBS-URL: https://build.opensuse.org/package/show/utilities/ed?expand=0&rev=3 --- ed-1.5.tar.gz | 3 --- ed-1.6.tar.gz | 3 +++ ed.changes | 5 +++++ ed.spec | 2 +- 4 files changed, 9 insertions(+), 4 deletions(-) delete mode 100644 ed-1.5.tar.gz create mode 100644 ed-1.6.tar.gz diff --git a/ed-1.5.tar.gz b/ed-1.5.tar.gz deleted file mode 100644 index 6e8cb80..0000000 --- a/ed-1.5.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:97dd34a49ebc9c97e414b90a087d63eafc41377a340848c97e75a9cba187fba1 -size 91818 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 diff --git a/ed.changes b/ed.changes index 6d9ee64..31a0d94 100644 --- a/ed.changes +++ b/ed.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Jan 2 15:16:42 UTC 2012 - dlovasko@suse.com + +- Update to 1.6 (bugfix release) + ------------------------------------------------------------------- Sun Sep 18 17:17:12 UTC 2011 - jengelh@medozas.de diff --git a/ed.spec b/ed.spec index a5397f2..ca0bce2 100644 --- a/ed.spec +++ b/ed.spec @@ -20,7 +20,7 @@ Url: http://www.gnu.org/software/ed/ License: GPLv3+ ; LGPLv2.1+ Group: Productivity/Editors/Other PreReq: %install_info_prereq -Version: 1.5 +Version: 1.6 Release: 1 Summary: Standard UNIX Line Editor Source: %{name}-%{version}.tar.gz From 1efcd2189321607602174fdd903a765dfa32e4d9e9a01c2ed433ad82619ccd41 Mon Sep 17 00:00:00 2001 From: OBS User mrdocs Date: Sun, 5 Feb 2012 00:32:14 +0000 Subject: [PATCH 2/2] Accepting request 102623 from home:rjschwei:branches:utilities usrMerge project - move files from toplevel to /usr OBS-URL: https://build.opensuse.org/request/show/102623 OBS-URL: https://build.opensuse.org/package/show/utilities/ed?expand=0&rev=4 --- ed.changes | 6 ++++++ ed.spec | 7 ++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ed.changes b/ed.changes index 31a0d94..c3de44e 100644 --- a/ed.changes +++ b/ed.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Feb 3 15:02:12 UTC 2012 - rschweikert@suse.com + +- switch license to spdx format +- keep executable in /usr (UsrMerge project) + ------------------------------------------------------------------- Mon Jan 2 15:16:42 UTC 2012 - dlovasko@suse.com diff --git a/ed.spec b/ed.spec index ca0bce2..d33f67a 100644 --- a/ed.spec +++ b/ed.spec @@ -17,7 +17,7 @@ Name: ed Url: http://www.gnu.org/software/ed/ -License: GPLv3+ ; LGPLv2.1+ +License: GPL-3.0+ ; LGPL-2.1+ Group: Productivity/Editors/Other PreReq: %install_info_prereq Version: 1.6 @@ -42,9 +42,10 @@ make %{?_smp_mflags} %install %{makeinstall} +#UsrMerge %{__install} -d -m 0755 %{buildroot}/bin -%{__mv} %{buildroot}/%{_bindir}/ed %{buildroot}/bin/ed -%{__ln_s} /bin/ed %{buildroot}/%{_bindir}/ed +%{__ln_s} %{_bindir}/ed %{buildroot}/bin/ed +#UsrMerge %check make check