Accepting request 201085 from shells

- install into %{_bindir} and add a compatibility symlink to /bin
- reenable commandline editor

OBS-URL: https://build.opensuse.org/request/show/201085
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/dash?expand=0&rev=14
This commit is contained in:
Stephan Kulow 2013-09-29 17:23:04 +00:00 committed by Git OBS Bridge
commit 943632db5e
2 changed files with 18 additions and 13 deletions

View File

@ -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 commandline editor
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Oct 6 22:04:40 UTC 2011 - gber@opensuse.org Thu Oct 6 22:04:40 UTC 2011 - gber@opensuse.org

View File

@ -1,8 +1,8 @@
# #
# spec file for package dash # spec file for package dash
# #
# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2011 Guido Berhoerster. # Copyright (c) 2013 Guido Berhoerster.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -17,19 +17,19 @@
# #
Name: dash Name: dash
Summary: POSIX-compliant Implementation of /bin/sh Summary: POSIX-compliant Implementation of /bin/sh
Version: 0.5.7
Release: 1
License: BSD-3-Clause License: BSD-3-Clause
Group: System/Shells Group: System/Shells
Version: 0.5.7
Release: 0
Url: http://gondor.apana.org.au/~herbert/dash/
Source: dash-%{version}.tar.gz 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) # 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 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) # 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 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 BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description %description
@ -42,21 +42,20 @@ possible without sacrificing speed where possible.
%patch1 -p1 %patch1 -p1
%build %build
%configure %configure --with-libedit
make %{?_smp_mflags} make %{?_smp_mflags}
%install %install
%make_install %make_install
# move to /bin and symlink to /usr/bin # compatibility symlink to /bin
%__mkdir_p $RPM_BUILD_ROOT/bin mkdir -p %{buildroot}/bin
%__mv $RPM_BUILD_ROOT/usr/bin/dash $RPM_BUILD_ROOT/bin ln -s %{_bindir}/dash %{buildroot}/bin/dash
%__ln_s ../../bin/dash $RPM_BUILD_ROOT/usr/bin/dash
%files %files
%defattr(-,root,root,-) %defattr(-,root,root,-)
%doc ChangeLog %doc ChangeLog
%doc %{_mandir}/man1/dash.1* %{_bindir}/dash
/usr/bin/dash
/bin/dash /bin/dash
%{_mandir}/man1/dash.1*
%changelog %changelog