From 0adc03854f264fbf2e63a5476b14aba709b1dab4 Mon Sep 17 00:00:00 2001 From: Dominic Hopf Date: Wed, 2 Jul 2014 23:20:00 +0200 Subject: [PATCH] fix FTBFS issue (RHBZ#1106713) --- 0000-zsh-fix-runhelpdir-issue.patch | 11 +++++++++ zsh.spec | 35 +++++++++++++++++------------ 2 files changed, 32 insertions(+), 14 deletions(-) create mode 100644 0000-zsh-fix-runhelpdir-issue.patch diff --git a/0000-zsh-fix-runhelpdir-issue.patch b/0000-zsh-fix-runhelpdir-issue.patch new file mode 100644 index 0000000..bb066ce --- /dev/null +++ b/0000-zsh-fix-runhelpdir-issue.patch @@ -0,0 +1,11 @@ +--- zsh-5.0.5/Config/defs.mk.in.original 2014-06-30 20:48:41.095977646 +0200 ++++ zsh-5.0.5/Config/defs.mk.in 2014-06-30 20:49:06.132076698 +0200 +@@ -95,7 +95,7 @@ + MAKEDEFS = \ + prefix='$(prefix)' exec_prefix='$(exec_prefix)' bindir='$(bindir)' \ + libdir='$(libdir)' MODDIR='$(MODDIR)' infodir='$(infodir)' mandir='$(mandir)' \ +-datadir='$(datadir)' fndir='$(fndir)' htmldir='$(htmldir)' \ ++datadir='$(datadir)' fndir='$(fndir)' htmldir='$(htmldir)' runhelpdir='$(runhelpdir)' \ + CC='$(CC)' CPPFLAGS='$(CPPFLAGS)' DEFS='$(DEFS)' CFLAGS='$(CFLAGS)' \ + LDFLAGS='$(LDFLAGS)' EXTRA_LDFLAGS='$(EXTRA_LDFLAGS)' \ + DLCFLAGS='$(DLCFLAGS)' DLLDFLAGS='$(DLLDFLAGS)' \ diff --git a/zsh.spec b/zsh.spec index 02ae302..6f5cc9d 100644 --- a/zsh.spec +++ b/zsh.spec @@ -3,7 +3,7 @@ Summary: Powerful interactive shell Name: zsh Version: 5.0.5 -Release: 2%{?dist} +Release: 3%{?dist} License: MIT URL: http://zsh.sourceforge.net/ Group: System Environment/Shells @@ -18,10 +18,9 @@ Source7: zshprompt.pl # Give me better tools or die! %global _default_patch_fuzz 2 Patch0: zsh-serial.patch +Patch1: 0000-zsh-fix-runhelpdir-issue.patch Patch4: zsh-4.3.6-8bit-prompts.patch Patch5: zsh-test-C02-dev_fd-mock.patch -# Tmp. -Patch11: zsh-5.0.2.texi-itemx.patch Patch12: http://ausil.fedorapeople.org/aarch64/zsh/zsh-aarch64.patch BuildRequires: coreutils sed ncurses-devel libcap-devel BuildRequires: texinfo texi2html gawk hostname @@ -55,10 +54,10 @@ This package contains the Zsh manual in html format. %setup -q %patch0 -p1 -b .serial +%patch1 -p1 %patch4 -p1 %patch5 -p1 -%patch11 -p1 %patch12 -p1 cp -p %SOURCE7 . @@ -92,32 +91,37 @@ make all html %install rm -rf $RPM_BUILD_ROOT + %makeinstall install.info \ - fndir=$RPM_BUILD_ROOT%{_datadir}/zsh/%{version}/functions \ - sitefndir=$RPM_BUILD_ROOT%{_datadir}/zsh/site-functions \ - scriptdir=$RPM_BUILD_ROOT%{_datadir}/zsh/%{version}/scripts \ - sitescriptdir=$RPM_BUILD_ROOT%{_datadir}/zsh/scripts + fndir=$RPM_BUILD_ROOT%{_datadir}/%{name}/%{version}/functions \ + sitefndir=$RPM_BUILD_ROOT%{_datadir}/%{name}/site-functions \ + scriptdir=$RPM_BUILD_ROOT%{_datadir}/%{name}/%{version}/scripts \ + sitescriptdir=$RPM_BUILD_ROOT%{_datadir}/%{name}/scripts \ + runhelpdir=$RPM_BUILD_ROOT%{_datadir}/%{name}/%{version}/help rm -f ${RPM_BUILD_ROOT}%{_bindir}/zsh-%{version} rm -f $RPM_BUILD_ROOT%{_infodir}/dir mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir} -for i in %{SOURCE4} %{SOURCE1} %{SOURCE2} %{SOURCE5} %{SOURCE3}; do - install -m 644 $i ${RPM_BUILD_ROOT}%{_sysconfdir}/"$(basename $i .rhs)" +for i in %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5}; do + install -m 644 $i $RPM_BUILD_ROOT%{_sysconfdir}/"$(basename $i .rhs)" done -mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/skel -install -m 644 %{SOURCE6} ${RPM_BUILD_ROOT}%{_sysconfdir}/skel/.zshrc +mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/skel +install -m 644 %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/skel/.zshrc # This is just here to shut up rpmlint, and is very annoying. # Note that we can't chmod everything as then rpmlint will complain about # those without a she-bang line. for i in checkmail harden run-help zcalc zkbd; do sed -i -e 's!/usr/local/bin/zsh!%{_bindir}/zsh!' \ - ${RPM_BUILD_ROOT}%{_datadir}/zsh/*/functions/$i - chmod +x ${RPM_BUILD_ROOT}%{_datadir}/zsh/*/functions/$i + $RPM_BUILD_ROOT%{_datadir}/zsh/%{version}/functions/$i + chmod +x $RPM_BUILD_ROOT%{_datadir}/zsh/%{version}/functions/$i done +sed -i "s!$RPM_BUILD_ROOT%{_datadir}/%{name}/%{version}/help!%{_datadir}/%{name}/%{version}/help!" \ + $RPM_BUILD_ROOT%{_datadir}/zsh/%{version}/functions/{run-help,_run-help} + %clean rm -rf $RPM_BUILD_ROOT @@ -174,6 +178,9 @@ fi %doc Doc/*.html %changelog +* Wed Jul 02 2014 Dominic Hopf - 5.0.5-3 +- fix FTBFS issue (RHBZ#1106713) + * Sat Jun 07 2014 Fedora Release Engineering - 5.0.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild