update vim icons (#1004788)

check if 'id -u' returns empty string (vim.sh)
This commit is contained in:
Karsten Hopp 2013-09-11 14:14:50 +02:00
parent b7f4bf3890
commit d5e5f0d52f
5 changed files with 10 additions and 5 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 904 B

After

Width:  |  Height:  |  Size: 226 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.4 KiB

After

Width:  |  Height:  |  Size: 347 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.6 KiB

After

Width:  |  Height:  |  Size: 474 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.1 KiB

After

Width:  |  Height:  |  Size: 4.4 KiB

View File

@ -20,7 +20,7 @@ Summary: The VIM editor
URL: http://www.vim.org/ URL: http://www.vim.org/
Name: vim Name: vim
Version: %{baseversion}.%{patchlevel} Version: %{baseversion}.%{patchlevel}
Release: 1%{?dist} Release: 2%{?dist}
License: Vim License: Vim
Group: Applications/Editors Group: Applications/Editors
Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}.tar.bz2 Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}.tar.bz2
@ -263,7 +263,7 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk
%patch3011 -p1 %patch3011 -p1
%patch3012 -p1 %patch3012 -p1
%if %{?fedora}%{!?fedora:0} >= 20 || %{?rhel}%{!?rhel:0} >= 7 %if %{?fedora}%{!?fedora:0} == 20 || %{?rhel}%{!?rhel:0} >= 7
%patch3013 -p1 %patch3013 -p1
%endif %endif
%patch3014 -p1 %patch3014 -p1
@ -454,15 +454,16 @@ chmod 644 ../runtime/doc/vim2html.pl
mkdir -p %{buildroot}/%{_sysconfdir}/profile.d mkdir -p %{buildroot}/%{_sysconfdir}/profile.d
cat >%{buildroot}/%{_sysconfdir}/profile.d/vim.sh <<EOF cat >%{buildroot}/%{_sysconfdir}/profile.d/vim.sh <<EOF
if [ -n "\$BASH_VERSION" -o -n "\$KSH_VERSION" -o -n "\$ZSH_VERSION" ]; then if [ -n "\$BASH_VERSION" -o -n "\$KSH_VERSION" -o -n "\$ZSH_VERSION" ]; then
[ -x /%{_bindir}/id ] || return [ -x %{_bindir}/id ] || return
[ \`/%{_bindir}/id -u\` -le 200 ] && return ID=\`/usr/bin/id -u\`
[ -n "\$ID" -a "\$ID" -le 200 ] && return
# for bash and zsh, only if no alias is already set # for bash and zsh, only if no alias is already set
alias vi >/dev/null 2>&1 || alias vi=vim alias vi >/dev/null 2>&1 || alias vi=vim
fi fi
EOF EOF
cat >%{buildroot}/%{_sysconfdir}/profile.d/vim.csh <<EOF cat >%{buildroot}/%{_sysconfdir}/profile.d/vim.csh <<EOF
if ( -x /usr/bin/id ) then if ( -x /usr/bin/id ) then
if ( "\`/usr/bin/id -u\`" > 100 ) then if ( "\`/usr/bin/id -u\`" > 200 ) then
alias vi vim alias vi vim
endif endif
endif endif
@ -745,6 +746,10 @@ rm -rf %{buildroot}
%{_datadir}/icons/hicolor/*/apps/* %{_datadir}/icons/hicolor/*/apps/*
%changelog %changelog
* Wed Sep 11 2013 Karsten Hopp <karsten@redhat.com> 7.4.027-2
- update vim icons (#1004788)
- check if 'id -u' returns empty string (vim.sh)
* Wed Sep 11 2013 Karsten Hopp <karsten@redhat.com> 7.4.027-1 * Wed Sep 11 2013 Karsten Hopp <karsten@redhat.com> 7.4.027-1
- patchlevel 027 - patchlevel 027