From 95c4f40167fcd7380b41b8fee1086efb25bad635 Mon Sep 17 00:00:00 2001
From: Jason Tibbitts <tibbs@math.uh.edu>
Date: Wed, 23 Nov 2016 11:16:12 -0600
Subject: [PATCH] Remove some commented cruft that's no longer useful

---
 cyrus-imapd.spec | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/cyrus-imapd.spec b/cyrus-imapd.spec
index f50f0b3..bd3bcdc 100644
--- a/cyrus-imapd.spec
+++ b/cyrus-imapd.spec
@@ -30,6 +30,7 @@ Source13: cyr_systemd_helper
 # There is a conflict between the sched_param structure defined in the source
 # and one defined by a system header.  Fixed upstream as
 # https://github.com/cyrusimap/cyrus-imapd/commit/a288b4fea15f843e309dcdf7039a1ebcc3d19616
+# but was not fixed on the 2.5 branch
 Patch0: fix-sched_param.patch
 
 BuildRequires: autoconf automake bison flex groff libtool
@@ -121,14 +122,6 @@ perl -pi -e "s@/var/imap/@/var/lib/imap/@" master/conf/*.conf doc/cyrusv2.mc
 find . -type f -name "*.pl" -exec chmod 755 {} \;
 
 %build
-#CPPFLAGS="${__global_cflags} -I%{_includedir}/et -I%{_includedir}/kerberosIV -fno-strict-aliasing"; export CPPFLAGS
-#CFLAGS="%{__global_cflags} -fno-strict-aliasing"; export CFLAGS
-#CCDLFLAGS="-rdynamic"; export CCDLFLAGS
-#LDFLAGS="-Wl,-z,now -Wl,-z,relro"
-#%ifnarch ppc ppc64
-#LDFLAGS="$LDFLAGS -pie"; export LDFLAGS
-#%endif
-
 autoreconf -vi
 %{configure} \
     --with-bdb-incdir=%_includedir/libdb \
@@ -158,7 +151,6 @@ make -C tools/vzic
 
 #make -C man -f Makefile.dist
 #make -C doc -f Makefile.dist
-#make LDFLAGS="$LDFLAGS -pie %{__global_ldflags}"
 
 %install
 echo AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA