rpms/cyrus-imapd/devel cyrus-imapd.pam-config, 1.2, 1.3 cyrus-imapd.spec, 1.37, 1.38

Rex Dieter (rdieter) fedora-extras-commits at redhat.com
Wed Mar 19 19:14:11 UTC 2008


Author: rdieter

Update of /cvs/pkgs/rpms/cyrus-imapd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31766

Modified Files:
	cyrus-imapd.pam-config cyrus-imapd.spec 
Log Message:
* Wed Mar 19 2008 Rex Dieter <rdieter at fedoraproject.org> - 2.3.9-12
- cyrus-imapd conflicts with uw-imap (#222506)



Index: cyrus-imapd.pam-config
===================================================================
RCS file: /cvs/pkgs/rpms/cyrus-imapd/devel/cyrus-imapd.pam-config,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- cyrus-imapd.pam-config	27 Jul 2006 10:41:04 -0000	1.2
+++ cyrus-imapd.pam-config	19 Mar 2008 19:13:26 -0000	1.3
@@ -1,3 +1,5 @@
 #%PAM-1.0
+auth       required     pam_nologin.so
 auth       include      system-auth
 account    include      system-auth
+session    include      system-auth


Index: cyrus-imapd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cyrus-imapd/devel/cyrus-imapd.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- cyrus-imapd.spec	18 Mar 2008 15:38:01 -0000	1.37
+++ cyrus-imapd.spec	19 Mar 2008 19:13:26 -0000	1.38
@@ -1,7 +1,7 @@
 %define upstream_ver 2.3.9
 Name: cyrus-imapd
 Version: 2.3.9
-Release: 11%{?dist}
+Release: 12%{?dist}
 
 # ********************** BUILD TIME OPTIONS START **********************
 
@@ -442,19 +442,23 @@
 find %{buildroot}%{_libdir}/perl5/ -type f -name "*.so" -exec %{__chmod} 755 {} \;
 
 # Install config files
-%{__install} -m 644 %{_cyrusconf} %{buildroot}%{_sysconfdir}/cyrus.conf
-%{__install} -m 644 %{SOURCE6}    %{buildroot}%{_sysconfdir}/imapd.conf
-%{__install} -m 644 %{SOURCE7}    %{buildroot}%{_sysconfdir}/pam.d/pop
-%{__install} -m 644 %{SOURCE7}    %{buildroot}%{_sysconfdir}/pam.d/imap
-%{__install} -m 644 %{SOURCE7}    %{buildroot}%{_sysconfdir}/pam.d/sieve
-%{__install} -m 644 %{SOURCE7}    %{buildroot}%{_sysconfdir}/pam.d/mupdate
-%{__install} -m 644 %{SOURCE7}    %{buildroot}%{_sysconfdir}/pam.d/lmtp
-%{__install} -m 644 %{SOURCE7}    %{buildroot}%{_sysconfdir}/pam.d/nntp
-%{__install} -m 644 %{SOURCE7}    %{buildroot}%{_sysconfdir}/pam.d/csync
-%{__install} -m 644 %{SOURCE12}   %{buildroot}%{_sysconfdir}/sysconfig/%{name}
-%{__install} -m 644 %{SOURCE5}    %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
-%{__install} -m 755 %{SOURCE25}   %{buildroot}%{_sysconfdir}/cron.daily/%{name}
-%{__install} -m 755 %{SOURCE11}   %{buildroot}%{_sysconfdir}/rc.d/init.d/%{name}
+%{__install} -p -m 644 %{_cyrusconf} %{buildroot}%{_sysconfdir}/cyrus.conf
+%{__install} -p -m 644 %{SOURCE6}    %{buildroot}%{_sysconfdir}/imapd.conf
+%{__install} -p -m 644 %{SOURCE7}    %{buildroot}%{_sysconfdir}/pam.d/pop
+%{__install} -p -m 644 %{SOURCE7}    %{buildroot}%{_sysconfdir}/pam.d/imap
+%{__install} -p -m 644 %{SOURCE7}    %{buildroot}%{_sysconfdir}/pam.d/sieve
+%{__install} -p -m 644 %{SOURCE7}    %{buildroot}%{_sysconfdir}/pam.d/mupdate
+%{__install} -p -m 644 %{SOURCE7}    %{buildroot}%{_sysconfdir}/pam.d/lmtp
+%{__install} -p -m 644 %{SOURCE7}    %{buildroot}%{_sysconfdir}/pam.d/nntp
+%{__install} -p -m 644 %{SOURCE7}    %{buildroot}%{_sysconfdir}/pam.d/csync
+%{__install} -p -m 644 %{SOURCE12}   %{buildroot}%{_sysconfdir}/sysconfig/%{name}
+%{__install} -p -m 644 %{SOURCE5}    %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
+%{__install} -p -m 755 %{SOURCE25}   %{buildroot}%{_sysconfdir}/cron.daily/%{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} -m 755 -d doc/conf
@@ -804,6 +808,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Wed Mar 19 2008 Rex Dieter <rdieter at fedoraproject.org> - 2.3.9-12
+- cyrus-imapd conflicts with uw-imap (#222506)
+
 * Tue Mar 18 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 2.3.9-11
 - add Requires for versioned perl (libperl.so)
 




More information about the fedora-extras-commits mailing list