- don't use %{name} where it shouldn't be,

- moved tpl files to their place since 0.2.17,
- release 2, STBR.

Changed files:
    masqmail.spec -> 1.25

diff --git a/masqmail.spec b/masqmail.spec
index af49fb7db74553c0d85282fe58c845e60d872fca..bc09e6bcb2c4c5bc28ab0e179b4dff414f02f628 100644 (file)
--- a/masqmail.spec
+++ b/masqmail.spec
@@ -2,7 +2,7 @@ Summary:        An offline mail server with pop3 client support
 Summary(pl):   Serwer pocztowy offline ze wsparciem dla pop3
 Name:          masqmail
 Version:       0.2.18
-Release:       1
+Release:       2
 License:       GPL
 Group:         Networking/Daemons
 Source0:       http://masqmail.cx/masqmail/download/%{name}-%{version}.tar.gz
@@ -42,12 +42,14 @@ rm -f missing
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_sysconfdir}/%{name}/tpl,%{_bindir},%{_libdir},%{_sbindir},%{_mandir}/man{5,8},%{_var}/spool/%{name}/{input,lock,popuidl}}
+install -d $RPM_BUILD_ROOT{%{_sysconfdir}/masqmail,%{_bindir},%{_libdir}} \
+       $RPM_BUILD_ROOT{%{_sbindir},%{_datadir}/masqmail/tpl,%{_mandir}/man{5,8}} \
+       $RPM_BUILD_ROOT%{_var}/spool/masqmail/{input,lock,popuidl}
 
-install tpl/failmsg.tpl $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/tpl
-install examples/masqmail.conf $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
+install examples/masqmail.conf $RPM_BUILD_ROOT%{_sysconfdir}/masqmail
 install src/mservdetect $RPM_BUILD_ROOT%{_bindir}
 install src/masqmail $RPM_BUILD_ROOT%{_sbindir}
+install tpl/* $RPM_BUILD_ROOT%{_datadir}/masqmail/tpl
 install docs/man/masqmail.*.5 $RPM_BUILD_ROOT%{_mandir}/man5
 install docs/man/masqmail.8 $RPM_BUILD_ROOT%{_mandir}/man8
 install debian/*.8 $RPM_BUILD_ROOT%{_mandir}/man8
@@ -61,18 +63,21 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog INSTALL NEWS README TODO examples/example.*
+%doc AUTHORS ChangeLog NEWS README TODO examples/example.*
 %attr(755,root,root) %{_bindir}/*
-%attr(755,root,root) %{_libdir}/sendmail
-%attr(755,root,root) %{_sbindir}/sendmail
-%attr(4755,root,root) %{_sbindir}/masqmail
-%dir %{_sysconfdir}/%{name}
-%config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/%{name}/masqmail.conf
+%attr(755,root,root) %{_libdir}/*
+%attr(4755,root,root) %{_sbindir}/*
+%dir %{_sysconfdir}/masqmail
+%config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/masqmail/masqmail.conf
+%dir %{_datadir}/masqmail
+%dir %{_datadir}/masqmail/tpl
+%{_datadir}/masqmail/tpl/*.tpl
+%lang(de) %{_datadir}/masqmail/tpl/*.tpl.de
+%lang(fr) %{_datadir}/masqmail/tpl/*.tpl.fr
+%lang(it) %{_datadir}/masqmail/tpl/*.tpl.it
 %{_mandir}/man[58]/*
 %defattr(644,mail,mail,755)
-%dir %{_sysconfdir}/%{name}/tpl
-%config %{_sysconfdir}/%{name}/tpl/failmsg.tpl
-%dir %{_var}/spool/%{name}
-%dir %{_var}/spool/%{name}/input
-%dir %{_var}/spool/%{name}/lock
-%dir %{_var}/spool/%{name}/popuidl
+%dir %{_var}/spool/masqmail
+%dir %{_var}/spool/masqmail/input
+%dir %{_var}/spool/masqmail/lock
+%dir %{_var}/spool/masqmail/popuidl