- Move requires to be scriptlet specific
- chmod functions, to shut rpmlint up (false positive warning) - sed only the requied functions (again, shuts rpmlint up) - Remove zsh-4.0.6-make-test-fail.patch - Remove RPM_SOURCE_DIR var, using %{SOURCEx} and basename Resolves: rhbz#226813
This commit is contained in:
parent
41d85bb551
commit
2cc004c0f3
35
zsh.spec
35
zsh.spec
@ -3,7 +3,7 @@
|
|||||||
Summary: A powerful interactive shell
|
Summary: A powerful interactive shell
|
||||||
Name: zsh
|
Name: zsh
|
||||||
Version: 4.2.6
|
Version: 4.2.6
|
||||||
Release: 5%{?dist}
|
Release: 6%{?dist}
|
||||||
License: BSD
|
License: BSD
|
||||||
URL: http://zsh.sunsite.dk/
|
URL: http://zsh.sunsite.dk/
|
||||||
Group: System Environment/Shells
|
Group: System Environment/Shells
|
||||||
@ -16,12 +16,14 @@ Source5: zshenv.rhs
|
|||||||
Source6: dotzshrc
|
Source6: dotzshrc
|
||||||
Source7: zshprompt.pl
|
Source7: zshprompt.pl
|
||||||
Patch0: zsh-serial.patch
|
Patch0: zsh-serial.patch
|
||||||
Patch1: zsh-4.0.6-make-test-fail.patch
|
#Patch1: zsh-4.0.6-make-test-fail.patch
|
||||||
#Patch3: zsh-4.0.7-bckgrnd-bld-102042.patch
|
#Patch3: zsh-4.0.7-bckgrnd-bld-102042.patch
|
||||||
Prereq: fileutils grep /sbin/install-info
|
Prereq: fileutils grep /sbin/install-info
|
||||||
Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
|
Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
|
||||||
Requires: mktemp coreutils grep info
|
BuildRequires: mktemp coreutils sed ncurses-devel libcap-devel texinfo tetex texi2html
|
||||||
BuildRequires: ncurses-devel libcap-devel texinfo tetex texi2html
|
Requires(post): /sbin/install-info grep
|
||||||
|
Requires(preun): /sbin/install-info
|
||||||
|
Requires(postun): mktemp coreutils grep
|
||||||
|
|
||||||
%description
|
%description
|
||||||
The zsh shell is a command interpreter usable as an interactive login
|
The zsh shell is a command interpreter usable as an interactive login
|
||||||
@ -84,15 +86,22 @@ rm -f ${RPM_BUILD_ROOT}%{_bindir}/zsh-%{version}
|
|||||||
rm -f $RPM_BUILD_ROOT%{_infodir}/dir
|
rm -f $RPM_BUILD_ROOT%{_infodir}/dir
|
||||||
|
|
||||||
mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}
|
mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}
|
||||||
for i in zshrc zlogin zlogout zshenv zprofile; do
|
for i in %{SOURCE4} %{SOURCE1} %{SOURCE2} %{SOURCE5} %{SOURCE3}; do
|
||||||
install -m 644 $RPM_SOURCE_DIR/${i}.rhs ${RPM_BUILD_ROOT}%{_sysconfdir}/$i
|
install -m 644 $i ${RPM_BUILD_ROOT}%{_sysconfdir}/"$(basename $i .rhs)"
|
||||||
done
|
done
|
||||||
|
|
||||||
mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/skel
|
mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/skel
|
||||||
install -m 644 %{SOURCE6} ${RPM_BUILD_ROOT}%{_sysconfdir}/skel/.zshrc
|
install -m 644 %{SOURCE6} ${RPM_BUILD_ROOT}%{_sysconfdir}/skel/.zshrc
|
||||||
|
|
||||||
sed -i -e 's!/usr/local/bin/zsh!%{_bindir}/zsh!' \
|
# This is just here to shut up rpmlint, and is very annoying.
|
||||||
${RPM_BUILD_ROOT}%{_datadir}/zsh/*/functions/*
|
# 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
|
||||||
|
done
|
||||||
|
|
||||||
|
|
||||||
%clean
|
%clean
|
||||||
rm -rf $RPM_BUILD_ROOT
|
rm -rf $RPM_BUILD_ROOT
|
||||||
@ -142,11 +151,19 @@ fi
|
|||||||
%doc Doc/zsh/*.html
|
%doc Doc/zsh/*.html
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Mar 5 2007 James Antill <james@and.org> - 4.2.6-6
|
||||||
|
- Move requires to be scriptlet specific
|
||||||
|
- chmod functions, to shut rpmlint up (false positive warning)
|
||||||
|
- sed only the requied functions (again, shuts rpmlint up)
|
||||||
|
- Remove zsh-4.0.6-make-test-fail.patch
|
||||||
|
- Remove RPM_SOURCE_DIR var, using %%{SOURCEx} and basename
|
||||||
|
Resolves: rhbz#226813
|
||||||
|
|
||||||
* Tue Feb 27 2007 James Antill <james@and.org> - 4.2.6-5
|
* Tue Feb 27 2007 James Antill <james@and.org> - 4.2.6-5
|
||||||
- Fix sed typo.
|
- Fix sed typo.
|
||||||
- Fix skel expansion problem.
|
- Fix skel expansion problem.
|
||||||
- Add Requires for mktemp/info/etc.
|
- Add Requires for mktemp/info/etc.
|
||||||
- Use cp again due to SELinux context.
|
- Use cp again due to SELinux context
|
||||||
Resolves: rhbz#226813
|
Resolves: rhbz#226813
|
||||||
|
|
||||||
* Tue Feb 27 2007 James Antill <james@and.org> - 4.2.6-4
|
* Tue Feb 27 2007 James Antill <james@and.org> - 4.2.6-4
|
||||||
|
Loading…
Reference in New Issue
Block a user