From 5b0776b72c654b93cfa016e77f29daeb323b3533 Mon Sep 17 00:00:00 2001
From: John Dennis <jdennis@fedoraproject.org>
Date: Apr 21 2005 20:10:08 +0000
Subject: move ssl pem file to /etc/pki/cyrus-imapd


---

diff --git a/cyrus-imapd.spec b/cyrus-imapd.spec
index c6b3e79..404aa1c 100644
--- a/cyrus-imapd.spec
+++ b/cyrus-imapd.spec
@@ -1,6 +1,6 @@
 Name:			cyrus-imapd
 Version:		2.2.12
-Release:		4.fc4
+Release:		5.fc4
 
 # ********************** BUILD TIME OPTIONS START **********************
 
@@ -61,8 +61,8 @@ Release:		4.fc4
 %define			_perl_man3dir %(eval "$(perl -V:man3dir)"; echo $man3dir)
 # Disable -debuginfo package generation
 #define debug_package	%{nil}
-%define cyrus_imapd_configdir %{_sysconfdir}/cyrus-imapd
-%define ssl_pem_file %{cyrus_imapd_configdir}/%{name}.pem
+%define pki_dir %{_sysconfdir}/pki/%{name}
+%define ssl_pem_file %{pki_dir}/%{name}.pem
 
 Summary:		A high-performance mail server with IMAP, POP3, NNTP and SIEVE support.
 License:		BSD
@@ -119,6 +119,7 @@ Patch50:		cyrus-imapd-gcc4.patch
 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
 BuildPrereq:		cyrus-sasl-devel >= 2.1.15-1, perl, tcp_wrappers, %{_dbver}-devel, openssl-devel
 BuildPrereq:		flex, bison, groff >= 1.15-8, autoconf
 
@@ -405,7 +406,7 @@ done
   %{buildroot}%{_spooldata} \
   %{buildroot}%{_vardata}/{user,quota,proc,log,msg,socket,db,sieve,rpm,backup} \
   %{buildroot}%{_datadir}/%{name}/rpm \
-  %{buildroot}%{cyrus_imapd_configdir} \
+  %{buildroot}%{pki_dir} \
   %{_contribdir}
 
 # Install additional files
@@ -681,7 +682,7 @@ fi
 %{_mandir}/man8/*
 %doc COPYRIGHT README
 %doc doc/*
-%dir %{cyrus_imapd_configdir}
+%dir %{pki_dir}
 %attr(0640,root,%{_cyrusgroup}) %ghost %config(missingok,noreplace) %verify(not md5 size mtime) %{ssl_pem_file}
 
 %files murder
@@ -718,6 +719,11 @@ fi
 %{_mandir}/man1/*
 
 %changelog
+* 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
+  location will not be used, this change supercedes that.
+
 * Mon Apr 18 2005 John Dennis <jdennis@redhat.com> - 2.2.12-4.fc4
 - fix bug #141479, move ssl pem file from /usr/share/ssl/certs to /etc/cyrus-imapd/cyrus-imapd.pem
 - change license field to BSD, its not exact BSD, but BSD is the closest.