From 1efcd2189321607602174fdd903a765dfa32e4d9e9a01c2ed433ad82619ccd41 Mon Sep 17 00:00:00 2001 From: OBS User mrdocs Date: Sun, 5 Feb 2012 00:32:14 +0000 Subject: [PATCH] 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