From d4b3a69e661a9657ced87e5784bbb0493c6654e8 Mon Sep 17 00:00:00 2001 From: Dominic Hopf Date: Tue, 25 Jun 2013 23:56:17 +0200 Subject: [PATCH] up-to-date systemd completion (#949003) - apply patch for building for aarch64 (#926864) --- .gitignore | 2 ++ sources | 3 ++- zsh.spec | 11 ++++++++++- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index da4bdbd..660ad2b 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,5 @@ zsh-4.3.11.tar.bz2 /zsh-4.3.17.tar.bz2 /zsh-5.0.0.tar.bz2 /zsh-5.0.2.tar.bz2 +/systemd-zsh-completion.zsh +/zsh-aarch64.patch diff --git a/sources b/sources index 2ba00c5..883888a 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -b8f2ad691acf58b3252225746480dcad zsh-5.0.2.tar.bz2 +e07e6b868e73800db5722712017c4316 systemd-zsh-completion.zsh +21777dc16bbd8f2bcd17038779bcccea zsh-aarch64.patch diff --git a/zsh.spec b/zsh.spec index 7816153..328c95a 100644 --- a/zsh.spec +++ b/zsh.spec @@ -3,7 +3,7 @@ Summary: Powerful interactive shell Name: zsh Version: 5.0.2 -Release: 3%{?dist} +Release: 4%{?dist} License: MIT URL: http://zsh.sourceforge.net/ Group: System Environment/Shells @@ -15,6 +15,7 @@ Source4: zshrc.rhs Source5: zshenv.rhs Source6: dotzshrc Source7: zshprompt.pl +Source8: http://cgit.freedesktop.org/systemd/systemd/plain/shell-completion/systemd-zsh-completion.zsh # Give me better tools or die! %global _default_patch_fuzz 2 Patch0: zsh-serial.patch @@ -22,6 +23,7 @@ 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 tetex texi2html gawk /bin/hostname Requires(post): /sbin/install-info grep @@ -58,6 +60,7 @@ This package contains the Zsh manual in html format. %patch5 -p1 %patch11 -p1 +%patch12 -p1 cp -p %SOURCE7 . @@ -96,6 +99,8 @@ rm -rf $RPM_BUILD_ROOT scriptdir=$RPM_BUILD_ROOT%{_datadir}/zsh/%{version}/scripts \ sitescriptdir=$RPM_BUILD_ROOT%{_datadir}/zsh/scripts +install -p %SOURCE8 $RPM_BUILD_ROOT%{_datadir}/zsh/%{version}/functions/_systemd + rm -f ${RPM_BUILD_ROOT}%{_bindir}/zsh-%{version} rm -f $RPM_BUILD_ROOT%{_infodir}/dir @@ -172,6 +177,10 @@ fi %doc Doc/*.html %changelog +* Tue Jun 25 2013 Dominic Hopf - 5.0.2-4 +- up-to-date systemd completion (#949003) +- apply patch for building for aarch64 (#926864) + * Mon Apr 15 2013 James Antill - 5.0.2-3 - Fix the changelog dates. - Fix the texi itemx bug.