From eb3d7d95120e2dfb07c098a43ab0aefbcc1754afe482c0e25f58118ececcc680 Mon Sep 17 00:00:00 2001 From: Guido Berhoerster Date: Fri, 27 Sep 2013 11:38:16 +0000 Subject: [PATCH 1/2] - install into %{_bindir} and add a compatibility symlink to /bin - reenable commanline editor OBS-URL: https://build.opensuse.org/package/show/shells/dash?expand=0&rev=13 --- dash.changes | 6 ++++++ dash.spec | 25 ++++++++++++------------- 2 files changed, 18 insertions(+), 13 deletions(-) diff --git a/dash.changes b/dash.changes index 1b2b35b..97241f7 100644 --- a/dash.changes +++ b/dash.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Sep 27 11:32:47 UTC 2013 - gber@opensuse.org + +- install into %{_bindir} and add a compatibility symlink to /bin +- reenable commanline editor + ------------------------------------------------------------------- Thu Oct 6 22:04:40 UTC 2011 - gber@opensuse.org diff --git a/dash.spec b/dash.spec index 81b234d..a5a5a3f 100644 --- a/dash.spec +++ b/dash.spec @@ -1,8 +1,8 @@ # # spec file for package dash # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. -# Copyright (c) 2011 Guido Berhoerster. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 Guido Berhoerster. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,19 +17,19 @@ # - Name: dash Summary: POSIX-compliant Implementation of /bin/sh -Version: 0.5.7 -Release: 1 License: BSD-3-Clause Group: System/Shells +Version: 0.5.7 +Release: 0 +Url: http://gondor.apana.org.au/~herbert/dash/ Source: dash-%{version}.tar.gz # PATCH-FIX-UPSTREAM dash-0.5.7-do-not-close-stderr.patch gber@opensuse.org -- Prevents closing stderr when /dev/tty fails to open (backported from upstream git) Patch0: dash-0.5.7-do-not-close-stderr.patch # PATCH-FIX-UPSTREAM dash-remove-backslash-before-in-double-quotes-in-variable.patch gber@opensuse.org -- Remove backslash before } in double-quotes in variable as it prevents the closing brace from terminating the substitution (from FreeBSD/Debian) Patch1: dash-remove-backslash-before-in-double-quotes-in-variable.patch -Url: http://gondor.apana.org.au/~herbert/dash/ +BuildRequires: libedit-devel BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -42,21 +42,20 @@ possible without sacrificing speed where possible. %patch1 -p1 %build -%configure +%configure --with-libedit make %{?_smp_mflags} %install %make_install -# move to /bin and symlink to /usr/bin -%__mkdir_p $RPM_BUILD_ROOT/bin -%__mv $RPM_BUILD_ROOT/usr/bin/dash $RPM_BUILD_ROOT/bin -%__ln_s ../../bin/dash $RPM_BUILD_ROOT/usr/bin/dash +# compatibility symlink to /bin +mkdir -p %{buildroot}/bin +ln -s %{_bindir}/dash %{buildroot}/bin/dash %files %defattr(-,root,root,-) %doc ChangeLog -%doc %{_mandir}/man1/dash.1* -/usr/bin/dash +%{_bindir}/dash /bin/dash +%{_mandir}/man1/dash.1* %changelog From b9949cb5d51ab706342b55f2d3b46255167e5c78cc1aec788d64eedc06050661 Mon Sep 17 00:00:00 2001 From: Guido Berhoerster Date: Fri, 27 Sep 2013 11:53:50 +0000 Subject: [PATCH 2/2] fix typo OBS-URL: https://build.opensuse.org/package/show/shells/dash?expand=0&rev=14 --- dash.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dash.changes b/dash.changes index 97241f7..aea3de5 100644 --- a/dash.changes +++ b/dash.changes @@ -2,7 +2,7 @@ Fri Sep 27 11:32:47 UTC 2013 - gber@opensuse.org - install into %{_bindir} and add a compatibility symlink to /bin -- reenable commanline editor +- reenable commandline editor ------------------------------------------------------------------- Thu Oct 6 22:04:40 UTC 2011 - gber@opensuse.org