From 9d73bed94f3a7e63a75f582b5d4a947272a7f629 Mon Sep 17 00:00:00 2001 From: Jason Tibbitts Date: Tue, 22 Nov 2016 15:31:53 -0600 Subject: [PATCH] Begin update to 2.5.10. Remove all patches. Calling autoconf in %prep is horrible. --- cyrus-imapd.spec | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/cyrus-imapd.spec b/cyrus-imapd.spec index 8f98807..e9c49f3 100644 --- a/cyrus-imapd.spec +++ b/cyrus-imapd.spec @@ -1,6 +1,6 @@ Name: cyrus-imapd -Version: 2.4.18 -Release: 3%{?dist} +Version: 2.5.10 +Release: 1%{?dist} %define ssl_pem_file %{_sysconfdir}/pki/%{name}/%{name}.pem @@ -27,16 +27,16 @@ Source11: README.rpm Source12: cyrus-imapd.service Source13: cyr_systemd_helper -Patch0: cyrus-imapd-2.1.3-flock.patch -Patch1: cyrus-imapd-2.3.1-authid_normalize.patch +#Patch0: cyrus-imapd-2.1.3-flock.patch +#Patch1: cyrus-imapd-2.3.1-authid_normalize.patch # fedora/rhel specific, find current db lib, rhbz#461875 -Patch2: cyrus-imapd-2.3.12p2-current-db.patch +#Patch2: cyrus-imapd-2.3.12p2-current-db.patch # for c-i <= 2.4.12 -Patch3: cyrus-imapd-2.4.12-debugopt.patch +#Patch3: cyrus-imapd-2.4.12-debugopt.patch -Patch4: cyrus-imapd-2.3.18-potential-overflow.patch +#Patch4: cyrus-imapd-2.3.18-potential-overflow.patch BuildRequires: autoconf BuildRequires: cyrus-sasl-devel, perl-devel, tcp_wrappers @@ -110,12 +110,6 @@ one running the server. %autosetup -p1 install -m 644 %{SOURCE11} doc/ -# only to update config.* files -automake -a -f -c || : -aclocal -I cmulocal -autoheader -autoconf -f - # Modify docs master --> cyrus-master %{__perl} -pi -e "s@master\(8\)@cyrus-master(8)@" man/*5 man/*8 lib/imapoptions sed -i -e 's|\([^-]\)master|\1cyrus-master|g;s|^master|cyrus-master|g;s|Master|Cyrus-master|g;s|MASTER|CYRUS-MASTER|g' \ @@ -134,6 +128,11 @@ find . -type f -name "*.pl" | xargs %{__perl} -pi -e "s@/usr/local/bin/perl@%{__ find . -type f -name "*.pl" -exec chmod 755 {} \; %build +#automake -a -f -c || : +#aclocal -I cmulocal +#autoheader +#autoconf - + 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