From 0b6747cd91ec6464e014de86b2916778ed1660d0 Mon Sep 17 00:00:00 2001
From: Jaroslav Škarvada <jskarvad@redhat.com>
Date: Mar 03 2015 14:20:50 +0000
Subject: Removed CFLAGS hacks


- Fixed building with gcc-5 (by do-not-disable-wall patch)
  Resolves: rhbz#1197698

---

diff --git a/pidgin-2.10.11-do-not-disable-wall.patch b/pidgin-2.10.11-do-not-disable-wall.patch
new file mode 100644
index 0000000..5e4aecc
--- /dev/null
+++ b/pidgin-2.10.11-do-not-disable-wall.patch
@@ -0,0 +1,16 @@
+diff --git a/configure.ac b/configure.ac
+index 51471b1..6b59976 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1227,11 +1227,6 @@ AC_ARG_ENABLE(fortify, [AC_HELP_STRING([--disable-fortify], [compile without FOR
+ 
+ DEBUG_CFLAGS="$DEBUG_CFLAGS -DPURPLE_DISABLE_DEPRECATED -DPIDGIN_DISABLE_DEPRECATED -DFINCH_DISABLE_DEPRECATED -DGNT_DISABLE_DEPRECATED"
+ if test "x$GCC" = "xyes"; then
+-	dnl We enable -Wall later.
+-	dnl If it's set after the warning CFLAGS in the compiler invocation, it counteracts the -Wno... flags.
+-	dnl This leads to warnings we don't want.
+-	CFLAGS=`echo $CFLAGS |$sedpath 's/-Wall//'`
+-
+ 	dnl ENABLE WARNINGS SUPPORTED BY THE VERSION OF GCC IN USE
+ 	dnl
+ 	dnl Future Possibilities
diff --git a/pidgin.spec b/pidgin.spec
index 508dc33..4f1084a 100644
--- a/pidgin.spec
+++ b/pidgin.spec
@@ -124,7 +124,7 @@
 
 Name:           pidgin
 Version:        2.10.11
-Release:        3%{?dist}
+Release:        4%{?dist}
 License:        GPLv2+ and GPLv2 and MIT
 # GPLv2+ - libpurple, gnt, finch, pidgin, most prpls
 # GPLv2 - silc & novell prpls
@@ -164,6 +164,8 @@ Patch1:         pidgin-2.10.9-valgrind.patch
 ## Patches 100+: To be Included in Future Upstream
 Patch100:       pidgin-2.10.1-fix-msn-ft-crashes.patch
 #Patch101:       pidgin-2.10.7-link-libirc-to-libsasl2.patch
+# upstream ticket https://developer.pidgin.im/ticket/16593
+Patch102:         pidgin-2.10.11-do-not-disable-wall.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root
 Summary:        A Gtk+ based multiprotocol instant messaging client
@@ -476,6 +478,8 @@ echo "FEDORA=%{fedora} RHEL=%{rhel}"
 %patch100 -p0 -R -b .ftcrash
 # https://developer.pidgin.im/ticket/15517
 #%patch101 -p1 -b .irc-sasl
+# https://developer.pidgin.im/ticket/16593
+%patch102 -p1
 
 # Our preferences
 cp %{SOURCE1} prefs.xml
@@ -541,12 +545,6 @@ SWITCHES="--with-extraversion=%{release}"
     SWITCHES="$SWITCHES --disable-consoleui --disable-gtkui"
 %endif
 
-# FC5+ automatic -fstack-protector-all switch
-# F20+ uses -fstack-protector-strong
-export RPM_OPT_FLAGS=${RPM_OPT_FLAGS//-fstack-protector /-fstack-protector-all }
-#Work around broken Werror=format-security macro on F21/Rawhide by adding -Wformat in front of it.
-export CFLAGS="-O2 -g -pipe -Wall -Wformat -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches -fstack-protector -fstack-protector-all"
-
 # remove after irc-sasl patch has been merged upstream
 autoreconf --force --install
 
@@ -776,6 +774,11 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Tue Mar  3 2015 Jaroslav Škarvada <jskarvad@redhat.com> - 2.10.11-4
+- Removed CFLAGS hacks
+- Fixed building with gcc-5 (by do-not-disable-wall patch)
+  Resolves: rhbz#1197698
+
 * Sat Feb 21 2015 Till Maas <opensource@till.name> - 2.10.11-3
 - Rebuilt for Fedora 23 Change
   https://fedoraproject.org/wiki/Changes/Harden_all_packages_with_position-independent_code