Author: glen                         Date: Mon Mar 13 15:50:39 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- fixed qmail initscript, adapterized

---- Files affected:
SPECS:
   qmail.spec (1.150 -> 1.151) 

---- Diffs:

================================================================
Index: SPECS/qmail.spec
diff -u SPECS/qmail.spec:1.150 SPECS/qmail.spec:1.151
--- SPECS/qmail.spec:1.150      Mon Mar 13 15:49:51 2006
+++ SPECS/qmail.spec    Mon Mar 13 16:50:34 2006
@@ -33,7 +33,7 @@
 Summary(pl):   qmail - serwer pocztowy (MTA)
 Name:          qmail
 Version:       1.03
-Release:       59
+Release:       59.1
 License:       DJB (http://cr.yp.to/qmail/dist.html)
 Group:         Networking/Daemons
 Source0:       http://cr.yp.to/software/%{name}-%{version}.tar.gz
@@ -46,8 +46,8 @@
 # Source4-md5: 6818629dc74737f3ca33ca97ab4ffcc4
 Source5:       http://www.netmeridian.com/e-huss/queue-fix-1.4.tar.gz
 # Source5-md5: 43f915c104024e6f33a5b3ff52dfb75b
-Source6:       http://glen.alkohol.ee/pld/qmail/%{name}-conf-20060127.tar.bz2
-# Source6-md5: aa657bf41b9349abefdd84e3364f9ae8
+Source6:       http://glen.alkohol.ee/pld/qmail/%{name}-conf-20060313.tar.bz2
+# Source6-md5: 0c3dca9f50e2226e634f41ef4be12a65
 Source7:       http://iidea.pl/~paweln/tlum/%{name}-doki.tar.bz2
 # Source7-md5: 2d85f0f9f8408cf6caab9f9bc8f68657
 Source8:       %{name}-linux.sh
@@ -234,7 +234,6 @@
 Requires:      rc-scripts >= 0.2.0
 Requires:      sh-utils
 Requires:      ucspi-tcp >= 0.88
-Conflicts:     qmail-client
 Provides:      group(nofiles)
 Provides:      group(qmail)
 Provides:      qmail-server
@@ -260,6 +259,7 @@
 Obsoletes:     smtpdaemon
 Obsoletes:     ssmtp
 Obsoletes:     zmailer
+Conflicts:     qmail-client
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _sysconfdir     /etc/qmail
@@ -325,10 +325,8 @@
 Requires(post):        /bin/hostname
 Requires(post):        /bin/sed
 Requires(post):        fileutils
-Conflicts:     qmail
 Provides:      qmailmta
 Provides:      smtpdaemon
-Obsoletes:     smtpdaemon
 Obsoletes:     exim
 Obsoletes:     masqmail
 Obsoletes:     omta
@@ -337,7 +335,9 @@
 Obsoletes:     sendmail-cf
 Obsoletes:     sendmail-doc
 Obsoletes:     smail
+Obsoletes:     smtpdaemon
 Obsoletes:     zmailer
+Conflicts:     qmail
 
 %description client
 qmail is a small, fast, secure replacement for the SENDMAIL package,
@@ -381,11 +381,11 @@
 Requires:      bzip2
 Requires:      logrotate
 Provides:      pop3daemon
+Obsoletes:     imap-pop
 Obsoletes:     qpopper
 Obsoletes:     qpopper6
-Obsoletes:     imap-pop
-Obsoletes:     solid-pop3d-ssl
 Obsoletes:     solid-pop3d
+Obsoletes:     solid-pop3d-ssl
 
 %description pop3
 POP3 server for qmail.
@@ -1259,6 +1259,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.151  2006/03/13 15:50:34  glen
+- fixed qmail initscript, adapterized
+
 Revision 1.150  2006/03/13 14:49:51  glen
 - QMTP and QMQP aren't really "supported"
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/qmail.spec?r1=1.150&r2=1.151&f=u

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to