rpms/uw-imap/devel c-client.cf,1.1,1.2 uw-imap.spec,1.18,1.19

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/extras/rpms/uw-imap/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4921

Modified Files:
	c-client.cf uw-imap.spec 
Log Message:
* Fri Oct 06 2006 Rex Dieter <rexdieter[AT]users.sf.net> 2006a-6
- omit EOL whitespace from c-client.cf



Index: c-client.cf
===================================================================
RCS file: /cvs/extras/rpms/uw-imap/devel/c-client.cf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- c-client.cf	4 Oct 2006 18:04:13 -0000	1.1
+++ c-client.cf	6 Oct 2006 15:34:48 -0000	1.2
@@ -1,3 +1,3 @@
 I accept the risk of using UW-IMAP
 set new-folder-format same-as-inbox
-set mail-subdirectory Mail 
+set mail-subdirectory Mail


Index: uw-imap.spec
===================================================================
RCS file: /cvs/extras/rpms/uw-imap/devel/uw-imap.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- uw-imap.spec	5 Oct 2006 12:04:36 -0000	1.18
+++ uw-imap.spec	6 Oct 2006 15:34:48 -0000	1.19
@@ -2,7 +2,7 @@
 Summary: UW Server daemons for IMAP and POP network mail protocols
 Name:	 uw-imap 
 Version: 2006a
-Release: 4%{?dist}
+Release: 6%{?dist}
 
 # See LICENSE.txt, http://www.apache.org/licenses/LICENSE-2.0
 License: Apache 2.0 
@@ -231,14 +231,15 @@
 %files
 %defattr(-,root,root,-)
 %doc docs/SSLBUILD
-%config %{_sysconfdir}/pam.d/imap
-%config %{_sysconfdir}/pam.d/pop
+%config(noreplace) %{_sysconfdir}/pam.d/imap
+%config(noreplace) %{_sysconfdir}/pam.d/pop
 %config(noreplace) %{_sysconfdir}/xinetd.d/imap
 %config(noreplace) %{_sysconfdir}/xinetd.d/ipop2
 %config(noreplace) %{_sysconfdir}/xinetd.d/ipop3
 # These need to be replaced (ie, can't use %%noreplace), or imaps/pop3s can fail on upgrade
-%config %{_sysconfdir}/xinetd.d/imaps
-%config %{_sysconfdir}/xinetd.d/pop3s
+# do this in a %trigger or something not here... -- Rex
+%config(noreplace) %{_sysconfdir}/xinetd.d/imaps
+%config(noreplace) %{_sysconfdir}/xinetd.d/pop3s
 %attr(0600,root,root) %ghost %config(missingok,noreplace) %verify(not md5 size mtime) %{sslcerts}/imapd.pem
 %attr(0600,root,root) %ghost %config(missingok,noreplace) %verify(not md5 size mtime) %{sslcerts}/ipop3d.pem
 %{_mandir}/man8/*
@@ -273,6 +274,12 @@
 
 
 %changelog
+* Fri Oct 06 2006 Rex Dieter <rexdieter[AT]users.sf.net> 2006a-6
+- omit EOL whitespace from c-client.cf
+
+* Thu Oct 05 2006 Rex Dieter <rexdieter[AT]users.sf.net> 2006a-5
+- %%config(noreplace) all xinetd.d/pam.d bits
+
 * Thu Oct 05 2006 Rex Dieter <rexdieter[AT]users.sf.net> 2006a-4
 - eek, pam.d/xinet.d bits were all mixed up, fixed.