SPECS: nullmailer.spec - up to 1.02 - better %post script

[baggins]

Author: baggins                      Date: Wed Jan 18 12:47:56 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- up to 1.02
- better %post script

---- Files affected:
SPECS:
   nullmailer.spec (1.18 -> 1.19) 

---- Diffs:

================================================================
Index: SPECS/nullmailer.spec
diff -u SPECS/nullmailer.spec:1.18 SPECS/nullmailer.spec:1.19
--- SPECS/nullmailer.spec:1.18	Wed Jan 18 13:41:50 2006
+++ SPECS/nullmailer.spec	Wed Jan 18 13:47:50 2006
@@ -3,15 +3,14 @@
 Summary:	Simple relay-only mail transport agent
 Summary(pl):	Prosty, wyłącznie przekazujący MTA
 Name:		nullmailer
-Version:	1.00
+Version:	1.02
 Release:	0.1
 License:	GPL
 Group:		Networking/Daemons
 Source0:	http://untroubled.org/nullmailer/%{name}-%{version}.tar.gz
-# Source0-md5:	ead32b3543ef652891edf3856ec759dd
+# Source0-md5:	848d5c1f41a78e6897aeeb615e484d38
 Source1:	%{name}.init
-Patch0:		%{name}-time.patch
-Patch1:		%{name}-FHS.patch
+Patch0:		%{name}-FHS.patch
 URL:		http://untroubled.org/nullmailer/
 BuildRequires:	libstdc++-devel
 BuildRequires:	rpmbuild(macros) >= 1.202
@@ -54,8 +53,7 @@
 
 %prep
 %setup -q
-%patch0 -p0
-%patch1 -p1
+%patch0 -p1
 
 %build
 %{__aclocal}
@@ -82,10 +80,16 @@
 
 %pre
 %groupadd -g 62 nullmail
-%useradd -u 62 -d /var/lock/svc/nullmailer -s /bin/false -c "NullMailer User" -g nullmail nullmail
+%useradd -u 62 -d /var/spool/nullmailer -s /bin/false -c "NullMailer User" -g nullmail nullmail
 
 %post
-/sbin/chkconfig --add postfix
+if ! [ -s /etc/nullmailer/me ]; then
+	/bin/hostname --fqdn >/etc/nullmailer/me
+fi
+if ! [ -s /etc/nullmailer/defaultdomain ]; then
+	/bin/hostname --domain >/etc/nullmailer/defaultdomain
+fi
+/sbin/chkconfig --add nullmailer
 if [ -f /var/lock/subsys/nullmailer ]; then
 	/etc/rc.d/init.d/nullmailer restart >&2
 else
@@ -129,6 +133,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.19  2006/01/18 12:47:50  baggins
+- up to 1.02
+- better %post script
+
 Revision 1.18  2006/01/18 12:41:50  baggins
 - FHS compliance
 - init script
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/nullmailer.spec?r1=1.18&r2=1.19&f=u