SPECS: masqmail.spec - move configs to /etc/mail as all other MTA-...

glen glen at pld-linux.org
Tue Mar 7 18:07:21 CET 2006


Author: glen                         Date: Tue Mar  7 17:07:21 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- move configs to /etc/mail as all other MTA-s
- install quite useable configs
- include aliases file in package

---- Files affected:
SPECS:
   masqmail.spec (1.38 -> 1.39) 

---- Diffs:

================================================================
Index: SPECS/masqmail.spec
diff -u SPECS/masqmail.spec:1.38 SPECS/masqmail.spec:1.39
--- SPECS/masqmail.spec:1.38	Mon Dec  5 00:10:18 2005
+++ SPECS/masqmail.spec	Tue Mar  7 18:07:15 2006
@@ -3,11 +3,14 @@
 Summary(pl):	Serwer pocztowy offline ze wsparciem dla pop3
 Name:		masqmail
 Version:	0.2.20
-Release:	4
+Release:	4.3
 License:	GPL
 Group:		Networking/Daemons
 Source0:	http://masqmail.cx/masqmail/download/%{name}-%{version}.tar.gz
 # Source0-md5:	74540980ecde45783e888d1da80cb318
+Source1:	%{name}.aliases
+Source2:	%{name}.conf
+Source3:	%{name}.default.route
 Patch0:		%{name}-resolv.patch
 URL:		http://masqmail.cx/masqmail/
 BuildRequires:	autoconf
@@ -18,8 +21,8 @@
 Provides:	smtpdaemon
 Obsoletes:	courier
 Obsoletes:	exim
-Obsoletes:	omta
 Obsoletes:	nullmailer
+Obsoletes:	omta
 Obsoletes:	postfix
 Obsoletes:	qmail
 Obsoletes:	sendmail
@@ -31,7 +34,8 @@
 Obsoletes:	zmailer
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		specflags_ia32	 -fomit-frame-pointer 
+%define		specflags_ia32	 -fomit-frame-pointer
+%define		_sysconfdir		/etc/mail
 
 %description
 MasqMail is a mail server designed for hosts that do not have a
@@ -56,6 +60,7 @@
 %{__automake}
 %configure \
 	--%{!?debug:dis}%{?debug:en}able-debug \
+	--with-confdir=%{_sysconfdir} \
 	--enable-auth \
 	--enable-maildir \
 	--enable-ident \
@@ -68,11 +73,13 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_sysconfdir}/masqmail,%{_bindir},/usr/lib} \
+install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_bindir},/usr/lib} \
 	$RPM_BUILD_ROOT{%{_sbindir},%{_datadir}/masqmail/tpl,%{_mandir}/man{5,8}} \
 	$RPM_BUILD_ROOT%{_var}/spool/masqmail/{input,lock,popuidl}
 
-install examples/masqmail.conf $RPM_BUILD_ROOT%{_sysconfdir}/masqmail
+install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/aliases
+install %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}
+install %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/default.route
 install src/mservdetect $RPM_BUILD_ROOT%{_bindir}
 install src/masqmail $RPM_BUILD_ROOT%{_sbindir}
 install tpl/* $RPM_BUILD_ROOT%{_datadir}/masqmail/tpl
@@ -84,6 +91,12 @@
 ln -sf ../sbin/masqmail $RPM_BUILD_ROOT/usr/lib/sendmail
 ln -sf masqmail $RPM_BUILD_ROOT%{_sbindir}/sendmail
 
+%triggerpostun -- %{name} < 0.2.20-4.1
+if [ -f /etc/masqmail/masqmail.conf.rpmsave ]; then
+	cp -f  %{_sysconfdir}/masqmail.conf{,.rpmnew}
+	mv -f /etc/masqmail/masqmail.conf.rpmsave %{_sysconfdir}/masqmail.conf
+fi
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -92,9 +105,12 @@
 %doc AUTHORS ChangeLog NEWS README TODO examples/example.*
 %attr(755,root,root) %{_bindir}/*
 %attr(755,root,root) /usr/lib/sendmail
-%attr(4755,root,root) %{_sbindir}/*
-%dir %{_sysconfdir}/masqmail
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/masqmail/masqmail.conf
+%attr(4755,root,root) %{_sbindir}/masqmail
+%attr(755,root,root) %{_sbindir}/sendmail
+%dir %{_sysconfdir}
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/masqmail.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/default.route
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/aliases
 %dir %{_datadir}/masqmail
 %dir %{_datadir}/masqmail/tpl
 %{_datadir}/masqmail/tpl/*.tpl
@@ -114,6 +130,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.39  2006/03/07 17:07:15  glen
+- move configs to /etc/mail as all other MTA-s
+- install quite useable configs
+- include aliases file in package
+
 Revision 1.38  2005/12/04 23:10:18  glen
 - adapterized (sorted %verify flags)
 
@@ -173,7 +194,7 @@
 - 0.2.17, STBR
 
 Revision 1.21  2002/11/25 19:51:54  qboosh
-- shortened symlink without %%{_sbindir}
+- shortened symlink without %{_sbindir}
 
 Revision 1.20  2002/11/25 12:15:50  qboosh
 - SECURITY update to 0.2.16 (includes many more fixes)
@@ -192,16 +213,16 @@
 - ac/am macros
 
 Revision 1.15  2002/05/21 23:14:07  kloczek
-perl -pi -e "s/^automake -a -c -f --foreing/\%\{__automake\}/; \
+- perl -pi -e "s/^automake -a -c -f --foreing/\%\{__automake\}/; \
              s/^automake -a -c -f/\%\{__automake\}/; \
-	     s/^autoconf/\%\{__autoconf\}/"
+     s/^autoconf/\%\{__autoconf\}/"
 
 Revision 1.14  2002/02/22 23:29:15  kloczek
 - removed all Group fields translations (oure rpm now can handle translating
   Group field using gettext).
 
 Revision 1.13  2002/01/18 02:13:48  kloczek
-perl -pi -e "s/pld-list\@pld.org.pl/feedback\@pld.org.pl/"
+- perl -pi -e "s/pld-list\@pld.org.pl/feedback\@pld.org.pl/"
 
 Revision 1.12  2001/10/18 16:40:22  gotar
 - cosmetics.
@@ -213,7 +234,7 @@
 - upgraded to 0.2.6.
 
 Revision 1.9  2001/08/30 12:18:48  gotar
-- awful %%configure macro expansions removed,
+- awful %configure macro expansions removed,
 - other specs' changelogs cosmetical fixes,
 - no functional nor release changes.
 
@@ -237,7 +258,7 @@
 - Erghhh... T. K. - you've lost two example files!
 
 Revision 1.2  2001/04/09 23:38:56  kloczek
-- few cosmetics and make spec %%{debug} ready.
+- few cosmetics and make spec %{debug} ready.
 
 Revision 1.1  2001/04/08 15:01:03  gotar
 - spec rewrited from scratch (maybe except %description etc.),
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/masqmail.spec?r1=1.38&r2=1.39&f=u



More information about the pld-cvs-commit mailing list