Accepting request 102762 from utilities

- switch license to spdx format
- keep executable in /usr (UsrMerge project)

- Update to 1.6 (bugfix release)

OBS-URL: https://build.opensuse.org/request/show/102762
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ed?expand=0&rev=13

ed-1.5.tar.gz

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

ed-1.6.tar.gz

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

ed.changes

@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+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
+
+- Update to 1.6 (bugfix release)
+
 -------------------------------------------------------------------
 Sun Sep 18 17:17:12 UTC 2011 - jengelh@medozas.de
 

ed.spec

@@ -17,10 +17,10 @@
 
 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.5
+Version:        1.6
 Release:        1
 Summary:        Standard UNIX Line Editor
 Source:         %{name}-%{version}.tar.gz
@@ -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