From e21ca8a6d231e8f7dd6abbdb04ccb995b4d3b4f66b0c8adf560c748e9936cd8b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= <ismail@i10z.com>
Date: Tue, 29 Nov 2011 14:19:15 +0000
Subject: [PATCH] - Cleanup spec file - Make /bin/zsh a symlink to /usr/bin/zsh

OBS-URL: https://build.opensuse.org/package/show/shells/zsh?expand=0&rev=81
---
 zsh.changes |  6 ++++++
 zsh.spec    | 22 ++++++++++------------
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/zsh.changes b/zsh.changes
index 1a2a245..4a29869 100644
--- a/zsh.changes
+++ b/zsh.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Nov 29 14:19:04 UTC 2011 - idoenmez@suse.de
+
+- Cleanup spec file
+- Make /bin/zsh a symlink to /usr/bin/zsh
+
 -------------------------------------------------------------------
 Mon Nov 28 08:36:51 UTC 2011 - idoenmez@suse.de
 
diff --git a/zsh.spec b/zsh.spec
index d1259ce..39456f9 100644
--- a/zsh.spec
+++ b/zsh.spec
@@ -46,13 +46,15 @@ Patch1:         %{name}-4.3.12-disable-c02cond-test.patch
 Patch2:         %{name}-4.3.12-ksh-emulation-syntax-checking.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %if 0%{?suse_version}
-PreReq:         %{install_info_prereq}
+Requires(pre):  %{install_info_prereq}
 %if 0%{?suse_version} >= 1110
 BuildRequires:  fdupes
 BuildRequires:  yodl
 %endif
 %else
-PreReq:         fileutils grep /sbin/install-info
+Requires(pre):  /sbin/install-info
+Requires(pre):  fileutils
+Requires(pre):  grep
 %endif
 
 BuildRequires:  libcap-devel
@@ -60,9 +62,9 @@ BuildRequires:  ncurses-devel
 BuildRequires:  pcre-devel
 %if 0%{?rhel_version} || 0%{?centos_version} || 0%{?fedora_version}
 BuildRequires:  libtermcap-devel
+BuildRequires:  tetex
 BuildRequires:  texi2html
 BuildRequires:  texinfo
-BuildRequires:  tetex
 %endif
 
 %description
@@ -98,8 +100,7 @@ This package contains the Zsh manual in html format.
 %patch1
 %patch2 -p1
 
-##rpmlint
-# spurious-executable-perm
+# Remove executable bit
 chmod 0644 Etc/changelog2html.pl
 
 %if 0%{?rhel_version} || 0%{?centos_version} || 0%{?fedora_version}
@@ -113,7 +114,6 @@ perl -p -i -e 's|/usr/local/bin|%{_bindir}|' \
     Util/reporter
 
 %build
-# readd the site-* dir.
 %configure \
     --enable-site-scriptdir=%{_datadir}/%{name}/site/scripts/ \
     --enable-site-fndir=%{_datadir}/%{name}/site/scripts/ \
@@ -153,7 +153,7 @@ rm -f Etc/Makefile* Etc/*.yo
 
 %install
 %if 0%{?rhel_version} || 0%{?centos_version} || 0%{?fedora_version}
-  rm -rf %{buildroot}
+    rm -rf %{buildroot}
 %endif
 
 %if 0%{?suse_version}
@@ -169,7 +169,7 @@ install -m 0755 -Dd  %{buildroot}/{etc,bin}
 install -m 0644 %{SOURCE1} %{SOURCE2} %{SOURCE3} %{buildroot}%{_sysconfdir}
 
 # Create custom completion directory
-mkdir %{buildroot}/etc/zsh_completion.d
+mkdir %{buildroot}%{_sysconfdir}/zsh_completion.d
 %endif
 
 %if 0%{?rhel_version} || 0%{?centos_version} || 0%{?fedora_version}
@@ -185,8 +185,7 @@ install -m 0755 -Dd    %{buildroot}%{_datadir}/%{name}/%{version}/help
 install -m 0644 Help/* %{buildroot}%{_datadir}/%{name}/%{version}/help/
 
 # link zsh binary
-mv %{buildroot}%{_bindir}/zsh %{buildroot}/bin/zsh
-ln -s -f ../../bin/zsh %{buildroot}%{_bindir}/zsh
+ln -sf %{_bindir}/zsh %{buildroot}/bin/zsh
 
 # Remove versioned zsh binary
 rm -f %{buildroot}%{_bindir}/zsh-*
@@ -265,14 +264,13 @@ fi
 %endif
 
 %if 0%{?suse_version}
-%dir /etc/zsh_completion.d
+%dir %{_sysconfdir}/zsh_completion.d
 %endif
 
 %{_bindir}/zsh
 /bin/zsh
 %{_libdir}/zsh/
 %{_datadir}/zsh/
-#exclude %{_datadir}/zsh/htmldoc
 %{_infodir}/zsh.info*.gz
 %{_mandir}/man1/zsh*.1.gz