From d5e5f0d52ff290c7b27909e9ab3dc9b39041e6e6 Mon Sep 17 00:00:00 2001
From: Karsten Hopp <karsten@redhat.com>
Date: Sep 11 2013 12:14:50 +0000
Subject: update vim icons (#1004788)

check if 'id -u' returns empty string (vim.sh)

---

diff --git a/gvim16.png b/gvim16.png
index b0859d6..fb45d22 100644
Binary files a/gvim16.png and b/gvim16.png differ
diff --git a/gvim32.png b/gvim32.png
index 961040c..c6e04fa 100644
Binary files a/gvim32.png and b/gvim32.png differ
diff --git a/gvim48.png b/gvim48.png
index 7187664..4bac67e 100644
Binary files a/gvim48.png and b/gvim48.png differ
diff --git a/gvim64.png b/gvim64.png
index 2bdc8bd..5dcd4d3 100644
Binary files a/gvim64.png and b/gvim64.png differ
diff --git a/vim.spec b/vim.spec
index bdc0f67..f83a682 100644
--- a/vim.spec
+++ b/vim.spec
@@ -20,7 +20,7 @@ Summary: The VIM editor
 URL:     http://www.vim.org/
 Name: vim
 Version: %{baseversion}.%{patchlevel}
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: Vim
 Group: Applications/Editors
 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
 %patch3012 -p1
 
-%if %{?fedora}%{!?fedora:0} >= 20 || %{?rhel}%{!?rhel:0} >= 7
+%if %{?fedora}%{!?fedora:0} == 20 || %{?rhel}%{!?rhel:0} >= 7
 %patch3013 -p1
 %endif
 %patch3014 -p1
@@ -454,15 +454,16 @@ chmod 644 ../runtime/doc/vim2html.pl
 mkdir -p %{buildroot}/%{_sysconfdir}/profile.d
 cat >%{buildroot}/%{_sysconfdir}/profile.d/vim.sh <<EOF
 if [ -n "\$BASH_VERSION" -o -n "\$KSH_VERSION" -o -n "\$ZSH_VERSION" ]; then
-  [ -x /%{_bindir}/id ] || return
-  [ \`/%{_bindir}/id -u\` -le 200 ] && return
+  [ -x %{_bindir}/id ] || return
+  ID=\`/usr/bin/id -u\`
+  [ -n "\$ID" -a "\$ID" -le 200 ] && return
   # for bash and zsh, only if no alias is already set
   alias vi >/dev/null 2>&1 || alias vi=vim
 fi
 EOF
 cat >%{buildroot}/%{_sysconfdir}/profile.d/vim.csh <<EOF
 if ( -x /usr/bin/id ) then
-    if ( "\`/usr/bin/id -u\`" > 100 ) then
+    if ( "\`/usr/bin/id -u\`" > 200 ) then
         alias vi vim
     endif
 endif
@@ -745,6 +746,10 @@ rm -rf %{buildroot}
 %{_datadir}/icons/hicolor/*/apps/*
 
 %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
 - patchlevel 027