[zsh/f20] remove individual _bindir setting; install to /usr/bin/ (RHBZ#1034060) require info package instead
Dominic Hopf
dmaphy at fedoraproject.org
Wed Jul 2 23:29:06 UTC 2014
commit 3c48134df77e470cef9f0e15c7b33cc13c34275c
Author: Dominic Hopf <dmaphy at fedoraproject.org>
Date: Thu Jul 3 00:46:37 2014 +0200
remove individual _bindir setting; install to /usr/bin/ (RHBZ#1034060)
require info package instead of /sbin/install-info binary
Conflicts:
zsh.spec
zsh.spec | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
---
diff --git a/zsh.spec b/zsh.spec
index 5cdad9f..b7f5a42 100644
--- a/zsh.spec
+++ b/zsh.spec
@@ -24,10 +24,12 @@ Patch5: zsh-test-C02-dev_fd-mock.patch
Patch12: http://ausil.fedorapeople.org/aarch64/zsh/zsh-aarch64.patch
BuildRequires: coreutils sed ncurses-devel libcap-devel
BuildRequires: texinfo texi2html gawk hostname
-Requires(post): /sbin/install-info grep
-Requires(preun): /sbin/install-info
+Requires(post): info grep
+Requires(preun): info
Requires(postun): coreutils grep
+Provides: /bin/zsh
+
%description
The zsh shell is a command interpreter usable as an interactive login
shell and as a shell script command processor. Zsh resembles the ksh
@@ -63,10 +65,9 @@ This package contains the Zsh manual in html format.
cp -p %SOURCE7 .
%build
-%define _bindir /bin
# Avoid stripping...
export LDFLAGS=""
-%configure --enable-etcdir=%{_sysconfdir} --with-tcsetpgrp --enable-maildir-support
+%configure --enable-etcdir=%{_sysconfdir} --with-tcsetpgrp --enable-maildir-support
make all html
@@ -178,9 +179,10 @@ fi
%doc Doc/*.html
%changelog
-* Wed Jul 02 2014 Dominic Hopf <dmaphy at fedoraproject.org> - 5.0.5-1
+* Tue Apr 08 2014 Dominic Hopf <dmaphy at fedoraproject.org> - 5.0.5-1
- Update to latest upstream release: Zsh 5.0.5
-- fix FTBFS issue (RHBZ#1106713)
+- remove individual _bindir setting; install to /usr/bin/ (RHBZ#1034060)
+- require info package instead of /sbin/install-info binary
* Thu Jan 16 2014 James Antill <james at fedoraproject.org> - 5.0.2-8
- Remove unneeded build require on tetex.
More information about the scm-commits
mailing list