SPECS: courier.spec - adapterize

[glen]

Author: glen                         Date: Sun Apr 16 21:12:44 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- adapterize

---- Files affected:
SPECS:
   courier.spec (1.131 -> 1.132) 

---- Diffs:

================================================================
Index: SPECS/courier.spec
diff -u SPECS/courier.spec:1.131 SPECS/courier.spec:1.132
--- SPECS/courier.spec:1.131	Sun Apr 16 23:10:22 2006
+++ SPECS/courier.spec	Sun Apr 16 23:12:39 2006
@@ -15,8 +15,7 @@
 Release:	2
 License:	GPL
 Group:		Networking/Daemons
-# !!! Don't change it !!!
-Source0:	http://heanet.dl.sourceforge.net/sourceforge/courier/%{name}-%{version}.tar.bz2
+Source0:	http://dl.sourceforge.net/courier/%{name}-%{version}.tar.bz2
 # Source0-md5:	73cda41adc5425ade94e1f9005b2218b
 Patch0:		%{name}-openssl-path.patch
 Patch1:		%{name}-withoutfam.patch
@@ -165,8 +164,8 @@
 Group:		Networking/Daemons
 Requires:	%{name} = %{version}-%{release}
 Requires:	FHS >= 2.3-12
-Requires:	webserver = apache
 Requires:	webapps
+Requires:	webserver = apache
 Conflicts:	apache-base < 2.2.0-8
 Conflicts:	apache1 < 1.3.34-5.11
 
@@ -183,8 +182,8 @@
 Group:		Networking/Daemons
 Requires:	%{name} = %{version}-%{release}
 Requires:	FHS >= 2.3-12
-Requires:	webserver = apache
 Requires:	webapps
+Requires:	webserver = apache
 Conflicts:	apache-base < 2.2.0-8
 Conflicts:	apache1 < 1.3.34-5.11
 
@@ -337,7 +336,7 @@
 rm -f $RPM_BUILD_ROOT%{_sysconfdir}/*.authpam
 for X in imap esmtp pop3 webmail calendar
 do
-	cat > $RPM_BUILD_ROOT/etc/pam.d/$X <<EOF
+	cat > $RPM_BUILD_ROOT/etc/pam.d/$X <<'EOF'
 #%PAM-1.0
 auth	required	pam_unix.so shadow nullok
 account	required	pam_unix.so
@@ -449,18 +448,18 @@
 
 %post
 if [ "$1" = "1" ]; then
-	[ -s /etc/courier/me ] || /bin/hostname -f > /etc/courier/me
+	[ -s %{_sysconfdir}/me ] || /bin/hostname -f > %{_sysconfdir}/me
 	%banner -e %{name} <<'EOF'
 
 Now courier will refuse to accept SMTP messages except to localhost
-add hosts to /etc/courier/esmtpacceptmailfor.dir/default
+add hosts to %{_sysconfdir}/esmtpacceptmailfor.dir/default
 run makeacceptmailfor
 
-Add hosts to /etc/courier/locals you want to accept mail for
+Add hosts to %{_sysconfdir}/locals you want to accept mail for
 run makealiases
 
 Enter user, who should receive mail for root, mailer-daemon and postmaster
-into /etc/courier/aliases/system
+into %{_sysconfdir}/aliases/system
 
 Default maildir is in ~/Mail/Maildir
 
@@ -913,6 +912,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.132  2006/04/16 21:12:39  glen
+- adapterize
+
 Revision 1.131  2006/04/16 21:10:22  glen
 - use %service
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/courier.spec?r1=1.131&r2=1.132&f=u