From 92691e477d6e26c9b6fd88c7859554a4fb67dbba Mon Sep 17 00:00:00 2001
From: John Dennis <jdennis@fedoraproject.org>
Date: Apr 22 2005 20:21:59 +0000
Subject: openssl package moved all its certs, CA, Makefile to /etc/pki


---

diff --git a/cyrus-imapd.spec b/cyrus-imapd.spec
index 404aa1c..a13a7ee 100644
--- a/cyrus-imapd.spec
+++ b/cyrus-imapd.spec
@@ -1,6 +1,6 @@
 Name:			cyrus-imapd
 Version:		2.2.12
-Release:		5.fc4
+Release:		6.fc4
 
 # ********************** BUILD TIME OPTIONS START **********************
 
@@ -120,6 +120,7 @@ BuildRoot:		%{_tmppath}/%{name}-%{version}-root
 Prereq:			e2fsprogs, diffutils, /sbin/chkconfig, /sbin/service
 Requires:		cyrus-sasl >= 2.1.15, file >= 3.35-1
 Requires:		filesystem >= 2.3.2-1
+Requires:		openssl >= 0.9.7f-4
 BuildPrereq:		cyrus-sasl-devel >= 2.1.15-1, perl, tcp_wrappers, %{_dbver}-devel, openssl-devel
 BuildPrereq:		flex, bison, groff >= 1.15-8, autoconf
 
@@ -448,7 +449,10 @@ done
 # create the ghost pem file
 touch %{buildroot}%{ssl_pem_file}
 # change config file so ssl certificates are under /etc rather than /usr/share
-%{__perl} -pi -e 's@/usr/share/ssl/certs/cyrus-imapd.pem@%{ssl_pem_file}@g' %{buildroot}%{_sysconfdir}/imapd.conf
+%{__perl} -pi -e \
+'s@/usr/share/ssl/certs/cyrus-imapd.pem@%{ssl_pem_file}@g; \
+ s@/usr/share/ssl/certs/ca-bundle.crt@/etc/pki/tls/certs/ca-bundle.crt@' \
+ %{buildroot}%{_sysconfdir}/imapd.conf
 
 
 # Rename 'master' binary and manpage to avoid crash with postfix
@@ -537,7 +541,7 @@ if [ -f %{_datadir}/ssl/certs/%{name}.pem -a ! %{ssl_pem_file} ]; then
 mv %{_datadir}/ssl/certs/%{name}.pem %{ssl_pem_file}
 fi
 if [ ! -f %{ssl_pem_file} ]; then
-pushd %{_datadir}/ssl/certs
+pushd /etc/pki/tls/certs
 umask 077
 %{__cat} << EOF | make %{name}.pem
 --
@@ -719,6 +723,10 @@ fi
 %{_mandir}/man1/*
 
 %changelog
+* Fri Apr 22 2005 John Dennis <jdennis@redhat.com> - 2.2.12-6.fc4
+- the openssl package moved all its certs, CA, Makefile, etc. to /etc/pki
+  now we are consistent with the openssl directory changes.
+
 * Thu Apr 21 2005 John Dennis <jdennis@redhat.com> - 2.2.12-5.fc4
 - we finally have a common directory, /etc/pki for certs, so create
   /etc/pki/cyrus-imapd and put the ssl pem file there. The /etc/cyrus-imapd