From 536e4576671b9ab32603212d0c865b82224e7489 Mon Sep 17 00:00:00 2001 From: Dominic Hopf Date: Jul 02 2014 22:46:37 +0000 Subject: remove individual _bindir setting; install to /usr/bin/ (RHBZ#1034060) require info package instead of /sbin/install-info binary --- diff --git a/zsh.spec b/zsh.spec index 6f5cc9d..b4abd4d 100644 --- a/zsh.spec +++ b/zsh.spec @@ -3,7 +3,7 @@ Summary: Powerful interactive shell Name: zsh Version: 5.0.5 -Release: 3%{?dist} +Release: 4%{?dist} License: MIT URL: http://zsh.sourceforge.net/ Group: System Environment/Shells @@ -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,8 +179,10 @@ fi %doc Doc/*.html %changelog -* Wed Jul 02 2014 Dominic Hopf - 5.0.5-3 +* Wed Jul 02 2014 Dominic Hopf - 5.0.5-4 - fix FTBFS issue (RHBZ#1106713) +- remove individual _bindir setting; install to /usr/bin/ (RHBZ#1034060) +- require info package instead of /sbin/install-info binary * Sat Jun 07 2014 Fedora Release Engineering - 5.0.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild