SPECS: maildrop.spec - save changes

[glen]

Author: glen                         Date: Tue Jan  3 00:04:26 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- save changes

---- Files affected:
SPECS:
   maildrop.spec (1.42 -> 1.43) 

---- Diffs:

================================================================
Index: SPECS/maildrop.spec
diff -u SPECS/maildrop.spec:1.42 SPECS/maildrop.spec:1.43
--- SPECS/maildrop.spec:1.42	Fri Nov 18 01:42:14 2005
+++ SPECS/maildrop.spec	Tue Jan  3 01:04:21 2006
@@ -1,17 +1,20 @@
 # $Revision$, $Date$
-# TODO
-# - produced binary is inconsistent by depending what's installed on system (fam/courier-authlib, probably others)
+# Conditional build:
+%bcond_without authlib	# disable courier-authlib
+#
 Summary:	maildrop - mail filter/mail delivery agent
 Summary(pl):	maildrop - filtr pocztowy/dostarczyciel poczty
 Name:		maildrop
 Version:	1.8.1
-Release:	1
+Release:	1.10
 License:	GPL
 Group:		Applications/Mail
 Source0:	http://dl.sourceforge.net/courier/%{name}-%{version}.tar.bz2
 # Source0-md5:	da7b312da069f8bacf7388804e0d7cc3
 Patch0:		%{name}-db.patch
 URL:		http://www.courier-mta.org/maildrop/
+%{?with_authlib:BuildRequires:	courier-authlib-devel}
+BuildRequires:	fam-devel
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	db-devel
@@ -19,6 +22,8 @@
 BuildRequires:	libtool
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%define		_sysconfdir		/etc/maildrop
+
 %description
 Maildrop is a combination of a mail filter/mail delivery agent.
 Maildrop reads the message to be delivered to your mailbox, optionally
@@ -88,22 +93,29 @@
 
 %configure \
 	--with-db=db \
+	--with-etcdir=%{_sysconfdir} \
 	--with-devel \
 	--enable-maildirquota \
 	--enable-syslog=1 \
 	--enable-trusted-users='root mail daemon postmaster exim qmaild mmdf' \
 	--enable-restrict-trusted=0 \
+	--enable-maildrop-gid=maildrop \
+	--disable-userdb  \
+	%{!?with_authlib:--disable-authlib} \
 	--enable-sendmail=%{_sbindir}/sendmail
+
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT%{_sysconfdir}
 
-%{__make} install \
+%{__make} -j1 install \
 	DESTDIR=$RPM_BUILD_ROOT \
 	MAILDROPUID="" \
 	MAILDROPGID=""
 
+rm -rf html
 mv $RPM_BUILD_ROOT%{_datadir}/maildrop/html .
 
 # courier-imap-maildirmake
@@ -115,7 +127,7 @@
 rm -f $RPM_BUILD_ROOT%{_mandir}/man8/deliverquota*
 
 # small pld readme file
-cat > README.pld <<EOF
+cat > README.pld <<'EOF'
 To get "userdb" please install courier-authlib-userdb
 To get "deliverquota" please install courier-imap-deliverquota
 To get "maildirmake" please install courier-imap-maildirmake
@@ -134,7 +146,9 @@
 %files
 %defattr(644,root,root,755)
 %doc maildir/README.maildirquota.txt AUTHORS README README.postfix
-%doc NEWS UPGRADE ChangeLog maildroptips.txt INSTALL html README.pld
+%doc NEWS UPGRADE ChangeLog maildroptips.txt INSTALL README.pld
+%doc html/
+%dir %{_sysconfdir}
 %attr(6755,root,mail) %{_bindir}/maildrop
 %attr(6755,root,mail) %{_bindir}/lockmail
 %attr(755,root,root) %{_bindir}/reformail
@@ -156,6 +170,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.43  2006/01/03 00:04:21  glen
+- save changes
+
 Revision 1.42  2005/11/18 00:42:14  glen
 - cosmetics
 
@@ -233,7 +250,7 @@
 - use http for sources from sourceforge
 
 Revision 1.19  2002/11/27 22:06:21  juandon
-- new %%doc
+- new %doc
 
 Revision 1.18  2002/06/29 19:55:06  fvk
 - updated to 1.4.0
@@ -269,14 +286,14 @@
 - removed obsoletes: qmail-maildirmake
 - added requires: courier-imap-{maildirmake,deliverquota,userdb}
 - removed common files with courier-imap-{maildirmake,deliverquota,userdb}
-- %%configure2_13 moved do %%build section
-- added 'exim' user to trusted users in %%configure2_13
+- %configure2_13 moved do %build section
+- added 'exim' user to trusted users in %configure2_13
 
 Revision 1.8  2001/10/03 02:31:31  marcus
 - new version 1.3.4
 
 Revision 1.7  2001/09/27 00:55:18  marcus
-- s/%%configure/%%configure2_13/g
+- s/%configure/%configure2_13/g
 
 Revision 1.6  2000/12/19 19:10:14  marcus
 - added Obsoletes: qmail-maildirmake to avoid conflict
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/maildrop.spec?r1=1.42&r2=1.43&f=u