- cyrus-imapd conflicts with uw-imap (#222506)

This commit is contained in:
Rex Dieter 2008-03-19 19:13:26 +00:00
parent 11bc6698ff
commit 26fefd3148
2 changed files with 23 additions and 14 deletions

View File

@ -1,3 +1,5 @@
#%PAM-1.0 #%PAM-1.0
auth required pam_nologin.so
auth include system-auth auth include system-auth
account include system-auth account include system-auth
session include system-auth

View File

@ -1,7 +1,7 @@
%define upstream_ver 2.3.9 %define upstream_ver 2.3.9
Name: cyrus-imapd Name: cyrus-imapd
Version: 2.3.9 Version: 2.3.9
Release: 11%{?dist} Release: 12%{?dist}
# ********************** BUILD TIME OPTIONS START ********************** # ********************** BUILD TIME OPTIONS START **********************
@ -442,19 +442,23 @@ done
find %{buildroot}%{_libdir}/perl5/ -type f -name "*.so" -exec %{__chmod} 755 {} \; find %{buildroot}%{_libdir}/perl5/ -type f -name "*.so" -exec %{__chmod} 755 {} \;
# Install config files # Install config files
%{__install} -m 644 %{_cyrusconf} %{buildroot}%{_sysconfdir}/cyrus.conf %{__install} -p -m 644 %{_cyrusconf} %{buildroot}%{_sysconfdir}/cyrus.conf
%{__install} -m 644 %{SOURCE6} %{buildroot}%{_sysconfdir}/imapd.conf %{__install} -p -m 644 %{SOURCE6} %{buildroot}%{_sysconfdir}/imapd.conf
%{__install} -m 644 %{SOURCE7} %{buildroot}%{_sysconfdir}/pam.d/pop %{__install} -p -m 644 %{SOURCE7} %{buildroot}%{_sysconfdir}/pam.d/pop
%{__install} -m 644 %{SOURCE7} %{buildroot}%{_sysconfdir}/pam.d/imap %{__install} -p -m 644 %{SOURCE7} %{buildroot}%{_sysconfdir}/pam.d/imap
%{__install} -m 644 %{SOURCE7} %{buildroot}%{_sysconfdir}/pam.d/sieve %{__install} -p -m 644 %{SOURCE7} %{buildroot}%{_sysconfdir}/pam.d/sieve
%{__install} -m 644 %{SOURCE7} %{buildroot}%{_sysconfdir}/pam.d/mupdate %{__install} -p -m 644 %{SOURCE7} %{buildroot}%{_sysconfdir}/pam.d/mupdate
%{__install} -m 644 %{SOURCE7} %{buildroot}%{_sysconfdir}/pam.d/lmtp %{__install} -p -m 644 %{SOURCE7} %{buildroot}%{_sysconfdir}/pam.d/lmtp
%{__install} -m 644 %{SOURCE7} %{buildroot}%{_sysconfdir}/pam.d/nntp %{__install} -p -m 644 %{SOURCE7} %{buildroot}%{_sysconfdir}/pam.d/nntp
%{__install} -m 644 %{SOURCE7} %{buildroot}%{_sysconfdir}/pam.d/csync %{__install} -p -m 644 %{SOURCE7} %{buildroot}%{_sysconfdir}/pam.d/csync
%{__install} -m 644 %{SOURCE12} %{buildroot}%{_sysconfdir}/sysconfig/%{name} %{__install} -p -m 644 %{SOURCE12} %{buildroot}%{_sysconfdir}/sysconfig/%{name}
%{__install} -m 644 %{SOURCE5} %{buildroot}%{_sysconfdir}/logrotate.d/%{name} %{__install} -p -m 644 %{SOURCE5} %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
%{__install} -m 755 %{SOURCE25} %{buildroot}%{_sysconfdir}/cron.daily/%{name} %{__install} -p -m 755 %{SOURCE25} %{buildroot}%{_sysconfdir}/cron.daily/%{name}
%{__install} -m 755 %{SOURCE11} %{buildroot}%{_sysconfdir}/rc.d/init.d/%{name} %{__install} -p -m 755 %{SOURCE11} %{buildroot}%{_sysconfdir}/rc.d/init.d/%{name}
# fix conflicts with uw-imap
mv %{buildroot}%{_mandir}/man8/imapd.8 %{buildroot}%{_mandir}/man8/imapd.8cyrus
mv %{buildroot}%{_mandir}/man8/pop3d.8 %{buildroot}%{_mandir}/man8/pop3d.8cyrus
# Install templates # Install templates
%{__install} -m 755 -d doc/conf %{__install} -m 755 -d doc/conf
@ -804,6 +808,9 @@ fi
%{_mandir}/man1/* %{_mandir}/man1/*
%changelog %changelog
* Wed Mar 19 2008 Rex Dieter <rdieter@fedoraproject.org> - 2.3.9-12
- cyrus-imapd conflicts with uw-imap (#222506)
* Tue Mar 18 2008 Tom "spot" Callaway <tcallawa@redhat.com> - 2.3.9-11 * Tue Mar 18 2008 Tom "spot" Callaway <tcallawa@redhat.com> - 2.3.9-11
- add Requires for versioned perl (libperl.so) - add Requires for versioned perl (libperl.so)