From fe5be78e623826fb31898cabb2a14887e202286b26d1ee37b069dd35d6ce77cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= <ismail@i10z.com>
Date: Tue, 10 Mar 2020 09:26:21 +0000
Subject: [PATCH] Accepting request 783187 from home:marxin:branches:shells

- Remove stack-protector option addition, it's already in $optflags.

OBS-URL: https://build.opensuse.org/request/show/783187
OBS-URL: https://build.opensuse.org/package/show/shells/zsh?expand=0&rev=217
---
 zsh.changes | 5 +++++
 zsh.spec    | 7 +------
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/zsh.changes b/zsh.changes
index a6cd2cd..f7e032e 100644
--- a/zsh.changes
+++ b/zsh.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Mar 10 08:38:10 UTC 2020 - Martin Liška <mliska@suse.cz>
+
+- Remove stack-protector option addition, it's already in $optflags.
+
 -------------------------------------------------------------------
 Mon Feb 17 05:18:47 UTC 2020 - Ismail Dönmez <idonmez@suse.com>
 
diff --git a/zsh.spec b/zsh.spec
index b68b6dd..f603666 100644
--- a/zsh.spec
+++ b/zsh.spec
@@ -108,15 +108,10 @@ perl -p -i -e 's|%{_prefix}/local/bin|%{_bindir}|' \
 
 %build
 
-%define _stack_protector "-fstack-protector-strong"
-%if 0%{?suse_version} <= 1315
-%define _stack_protector "-fstack-protector"
-%endif
-
 %configure \
 %if 0%{?suse_version}
     --with-term-lib="ncursesw" \
-    --enable-cflags="%{optflags} -fPIE %{_stack_protector} %(ncursesw6-config --cflags)" \
+    --enable-cflags="%{optflags} -fPIE %(ncursesw6-config --cflags)" \
     --enable-ldflags="%(ncursesw6-config --libs) -pie -Wl,-z,relro" \
 %endif
     --enable-fndir=%{_datadir}/%{name}/${version}/functions \