SPECS: solid-pop3d.spec - added APOP, IPv6, Maildir and standalone...

[gotar]

Author: gotar                        Date: Fri Jan  4 14:58:56 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- added APOP, IPv6, Maildir and standalone bconds,
- more ./configure options and docs,
- rel. 14

---- Files affected:
SPECS:
   solid-pop3d.spec (1.84 -> 1.85) 

---- Diffs:

================================================================
Index: SPECS/solid-pop3d.spec
diff -u SPECS/solid-pop3d.spec:1.84 SPECS/solid-pop3d.spec:1.85
--- SPECS/solid-pop3d.spec:1.84	Mon Feb 12 23:09:15 2007
+++ SPECS/solid-pop3d.spec	Fri Jan  4 15:58:51 2008
@@ -1,15 +1,19 @@
 # $Revision$, $Date$
 #
 # Conditional build:
-%bcond_with	whoson	# build with whoson support
+%bcond_without	apop	# build without APOP support
+%bcond_without	ipv6	# build without IPv6 support
+%bcond_without	maildir	# build without Maildir support
 %bcond_with	sasl	# build with SASL support (uses obsolete cyrus-sasl 1.x)
 %bcond_without	ssl	# build without SSL support
+%bcond_with	standalone	# compile server as a standalone server, not inetd
+%bcond_with	whoson	# build with whoson support
 #
 Summary:	POP3 server
 Summary(pl.UTF-8):	Serwer POP3
 Name:		solid-pop3d
 Version:	0.16d
-Release:	13
+Release:	14
 License:	GPL
 Group:		Networking/Daemons
 Source0:	ftp://dione.ids.pl/pub/solidpop3d/%{name}-%{version}.tar.gz
@@ -29,7 +33,7 @@
 BuildRequires:	rpmbuild(macros) >= 1.268
 %{?with_whoson:BuildRequires:	whoson-devel}
 Requires:	pam >= 0.79.0
-Requires:	rc-inetd >= 0.8.1
+%{?with_standalone:Requires:	rc-inetd >= 0.8.1}
 Provides:	pop3daemon
 Provides:	user(pop3)
 Obsoletes:	imap-pop
@@ -69,23 +73,29 @@
 %{__autoconf}
 %configure \
 	--localstatedir=/var/mail \
-	--enable-apop \
 	--enable-pam \
+	%{?with_apop:--enable-apop} \
 	--enable-mailbox \
-	--enable-maildir \
+	%{!?with_maildir:--disable-maildir} \
+	--disable-crlfmaildir \
 	--enable-bulletins \
 	--enable-expire \
 	--enable-configfile \
 	--enable-userconfig \
+	%{?with_standalone:--enable-standalone} \
 	--enable-last \
-	--enable-createmail \
-	--enable-ipv6 \
 	--enable-mapping \
 	--enable-nonip \
+	--disable-allowroot \
+	--enable-createmail \
+	%{?with_ipv6:--enable-ipv6} \
+	--disable-resolve \
+	--disable-connect \
+	--enable-logextend \
 	--enable-statistics \
 	--enable-dpuid \
-	--enable-logextend \
 	--enable-userpasswd \
+	--enable-hashspool \
 	--enable-authonly \
 	%{?with_ssl:--with-openssl} \
 	%{?with_whoson:--enable-whoson} \
@@ -94,7 +104,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_sysconfdir}/{pam.d,sysconfig/rc-inetd,security} \
+install -d $RPM_BUILD_ROOT%{_sysconfdir}/{pam.d,%{!?with_standalone:sysconfig/rc-inetd,}security} \
 	$RPM_BUILD_ROOT/var/mail/bulletins
 
 %{__make} install \
@@ -102,8 +112,8 @@
 
 install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/spop3d.conf
 install %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/spop3d-ssl.conf
-install %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/rc-inetd/spop3d
-install %{SOURCE4} $RPM_BUILD_ROOT/etc/sysconfig/rc-inetd/spop3d-ssl
+%{!?with_standalone:install %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/rc-inetd/spop3d}
+%{!?with_standalone:install %{SOURCE4} $RPM_BUILD_ROOT/etc/sysconfig/rc-inetd/spop3d-ssl}
 install %{SOURCE5} $RPM_BUILD_ROOT/etc/pam.d/spop3d
 
 touch $RPM_BUILD_ROOT%{_sysconfdir}/security/blacklist.spop3d
@@ -115,11 +125,11 @@
 %useradd -u 60 -r -d /var/mail/bulletins -s /bin/false -c "pop3 user" -g nobody pop3
 
 %post
-%service -q rc-inetd reload
+%{!?with_standalone:%service -q rc-inetd reload}
 
 %postun
 if [ "$1" = 0 ]; then
-	%service -q rc-inetd reload
+	%{!?with_standalone:%service -q rc-inetd reload}
 	%userremove pop3
 fi
 
@@ -130,11 +140,11 @@
 
 %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 md5 mtime size) /etc/sysconfig/rc-inetd/spop3d
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/rc-inetd/spop3d-ssl
+%{!?with_standalone:%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/rc-inetd/spop3d}
+%{!?with_standalone:%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/rc-inetd/spop3d-ssl}
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/security/blacklist.spop3d
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/pam.d/spop3d
 %attr(640,pop3,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/spop3d.conf
@@ -148,6 +158,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.85  2008-01-04 14:58:51  gotar
+- added APOP, IPv6, Maildir and standalone bconds,
+- more ./configure options and docs,
+- rel. 14
+
 Revision 1.84  2007-02-12 22:09:15  glen
 - tabs in preamble
 
================================================================

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