SPECS (AC-branch): solid-pop3d.spec - rel.13 - facility_mail patch...

[blues]

Author: blues                        Date: Mon Jan  7 12:24:30 2008 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- rel.13 - facility_mail patch added; some merged from HEAD

---- Files affected:
SPECS:
   solid-pop3d.spec (1.78 -> 1.78.2.1) 

---- Diffs:

================================================================
Index: SPECS/solid-pop3d.spec
diff -u SPECS/solid-pop3d.spec:1.78 SPECS/solid-pop3d.spec:1.78.2.1
--- SPECS/solid-pop3d.spec:1.78	Thu May 12 15:32:21 2005
+++ SPECS/solid-pop3d.spec	Mon Jan  7 13:24:25 2008
@@ -6,13 +6,12 @@
 %bcond_without	ssl	# build without SSL support
 #
 Summary:	POP3 server
-Summary(pl):	Serwer POP3
+Summary(pl.UTF8):	Serwer POP3
 Name:		solid-pop3d
 Version:	0.16d
-Release:	12
+Release:	13
 License:	GPL
 Group:		Networking/Daemons
-Vendor:		Jerzy Balamut <jurekb at dione.ids.pl>
 Source0:	ftp://dione.ids.pl/pub/solidpop3d/%{name}-%{version}.tar.gz
 # Source0-md5:	ad197a3cf8310994f2fad90376edbd91
 Source1:	%{name}.conf
@@ -22,7 +21,9 @@
 Source5:	%{name}.pamd
 Patch0:		%{name}-whoson2.patch
 Patch1:		%{name}-user.patch
+Patch2:		%{name}-facility_mail.patch
 BuildRequires:	autoconf
+BuildRequires:	automake
 %{?with_sasl:BuildRequires:	cyrus-sasl-devel < 2.0.0}
 BuildRequires:	gdbm-devel
 %{?with_ssl:BuildRequires:	openssl-devel >= 0.9.7d}
@@ -33,7 +34,6 @@
 Provides:	pop3daemon
 Provides:	user(pop3)
 Obsoletes:	imap-pop
-Obsoletes:	pop3daemon
 Obsoletes:	qpopper
 Obsoletes:	qpopper6
 Obsoletes:	solid-pop3d-ssl
@@ -63,6 +63,7 @@
 %setup -q
 %{?with_whoson:%patch0 -p1}
 %patch1 -p1
+%patch2 -p1
 
 %build
 %{__autoheader}
@@ -115,18 +116,11 @@
 %useradd -u 60 -r -d /var/mail/bulletins -s /bin/false -c "pop3 user" -g nobody pop3
 
 %post
-if [ -f /var/lock/subsys/rc-inetd ]; then
-	/etc/rc.d/init.d/rc-inetd reload 1>&2
-else
-	echo "Type \"/etc/rc.d/init.d/rc-inetd start\" to start inet server" 1>&2
-fi
+%service -q rc-inetd reload
 
 %postun
-if [ -f /var/lock/subsys/rc-inetd ]; then
-	/etc/rc.d/init.d/rc-inetd reload 1>&2
-fi
-
-if [ "$1" = "0" ]; then
+if [ "$1" = 0 ]; then
+	%service -q rc-inetd reload
 	%userremove pop3
 fi
 
@@ -137,7 +131,7 @@
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS README THANKS VIRTUALS doc/config.example
+%doc AUTHORS ChangeLog README SASL THANKS TLS VIRTUALS doc/config.example
 %attr(755,root,root) %{_sbindir}/*
 %attr(755,root,root) %{_bindir}/*
 %attr(640,root,root) %config(noreplace) %verify(not size mtime md5) /etc/sysconfig/rc-inetd/spop3d
@@ -155,6 +149,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.78.2.1  2008-01-07 12:24:25  blues
+- rel.13 - facility_mail patch added; some merged from HEAD
+
 Revision 1.78  2005-05-12 13:32:21  baggins
 - release 12
 - req pam 0.79
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/solid-pop3d.spec?r1=1.78&r2=1.78.2.1&f=u