- several important fixes

Changed files:
    ecartis.spec -> 1.15

diff --git a/ecartis.spec b/ecartis.spec
index b04b4e46fae28be97de9e66ab4dc7e6965ee517b..ddde9fa39c28442b672579ee16561ea8c7aecd69 100644 (file)
--- a/ecartis.spec
+++ b/ecartis.spec
@@ -23,7 +23,8 @@ Provides:     listar
 Buildroot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 Obsoletes:     listar
 
-%define                _ecartisdir     /var/lib/ecartis
+%define                _ecartisdir     /usr/lib/ecartis
+%define                _ecartisdata    /var/lib/ecartis
 
 %description
 Ecartis is a modular mailing list manager; all its functionality is
@@ -79,10 +80,9 @@ Program ecartis-cgi, kt
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_sysconfdir}/{%{name},logrotate.d,cron.daily} \
-       $RPM_BUILD_ROOT%{_ecartisdir}/lists/{test/text,SITEDATA/cookies} \
-       $RPM_BUILD_ROOT%{_ecartisdir}/{modules,scripts,templates,queue} \
-       $RPM_BUILD_ROOT/home/httpd/cgi-bin/ \
-       $RPM_BUILD_ROOT/var/log
+       $RPM_BUILD_ROOT%{_ecartisdata}/{queue,lists/{test/text,SITEDATA/cookies}} \
+       $RPM_BUILD_ROOT%{_ecartisdir}/{modules,scripts,templates} \
+       $RPM_BUILD_ROOT{/home/httpd/cgi-bin/,/var/log}
 
 %{__make} -Csrc -fMakefile.dist install
 
@@ -96,7 +96,7 @@ install ecartis.aliases.dist  $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/ecartis.alias
 install banned                 $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/banned
 install spam-regexp.sample     $RPM_BUILD_ROOT%{_ecartisdir}/spam-regexp.sample
 install templates/*.lsc                $RPM_BUILD_ROOT%{_ecartisdir}/templates
-install -D lists/test/text/*   $RPM_BUILD_ROOT%{_ecartisdir}/lists/test/text
+install -D lists/test/text/*   $RPM_BUILD_ROOT%{_ecartisdata}/lists/test/text
 
 install %{SOURCE1}             $RPM_BUILD_ROOT/etc/logrotate.d/%{name}
 
@@ -106,7 +106,7 @@ ln -sf %{_sysconfdir}/%{name}/%{name}.aliases       $RPM_BUILD_ROOT%{_ecartisdir}/%{na
 ln -sf %{_sysconfdir}/%{name}/banned           $RPM_BUILD_ROOT%{_ecartisdir}/banned
 ln -sf %{_sysconfdir}/%{name}/%{name}.hlp      $RPM_BUILD_ROOT%{_ecartisdir}/%{name}.hlp
 touch  $RPM_BUILD_ROOT%{_var}/log/%{name}.log
-touch  $RPM_BUILD_ROOT%{_ecartisdir}/lists/SITEDATA/cookies
+touch  $RPM_BUILD_ROOT%{_ecartisdata}/lists/SITEDATA/cookies
 
 cat << EOF > $RPM_BUILD_ROOT/home/httpd/cgi-bin/ecartisgate.cgi
 #!/bin/sh
@@ -184,6 +184,7 @@ if [ -e /etc/smrsh -a ! -e /etc/smrsh/ecartis ]; then
     echo "1) add 'listserver-bin-dir = /etc/smrsh' to ecartis.cfg"
     echo "2) change the address for Ecartis in the aliases file to be"
     echo "   /etc/smrsh/ecartis instead of /home/ecartis/ecartis"
+    chmod a+x /etc/smrsh/ecartis
 fi
 
 # Force the %{_ecartisdir} directory permissions to something sane
@@ -201,8 +202,8 @@ if [ -e /etc/smrsh ]; then
        ln -sf /etc/smrsh/ecartis /etc/smrsh/listar
 fi
 echo "Copying lists from listar directories"
-cp -R /var/lib/listar/lists /var/lib/ecartis/
-chown -R ecartis.ecartis /var/lib/ecartis/
+cp -R /var/lib/listar/lists %{_ecartisdata}
+chown -R ecartis.ecartis %{_ecartisdata}
 if [ -e /etc/smrsh ]; then
        echo "Making link /etc/smrsh/listar to /etc/smrsh/ecartis:"
        ln -sf ecartis /etc/smrsh/listar
@@ -217,18 +218,19 @@ rm -Rf $RPM_BUILD_ROOT
 
 %attr(750,root,root) /etc/cron.daily/%{name}
 %attr(640,root,root) %config %verify(not size mtime md5) /etc/logrotate.d/%{name}
-%attr(640,root,ecartis) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/%{name}/*
+%attr(775,ecartis,ecartis) %dir %{_sysconfdir}/%{name}
+%attr(644,root,ecartis) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/%{name}/*
 %attr(640,root,ecartis) %config(noreplace) %verify(not size mtime md5) %{_ecartisdir}/%{name}.aliases
 %attr(640,root,ecartis) %config(noreplace) %verify(not size mtime md5) %{_ecartisdir}/%{name}.hlp
 %attr(640,root,ecartis) %config(noreplace) %verify(not size mtime md5) %{_ecartisdir}/%{name}.cfg
 %attr(640,root,ecartis) %config(noreplace) %verify(not size mtime md5) %{_ecartisdir}/banned
 %attr(640,ecartis,ecartis) %ghost /var/log/%{name}.log
 %attr(711,ecartis,ecartis) %dir %{_ecartisdir}
-%attr(751,ecartis,ecartis) %dir %{_ecartisdir}/lists
-%attr(750,ecartis,ecartis) %dir %{_ecartisdir}/queue
 %attr(750,ecartis,ecartis) %dir %{_ecartisdir}/templates
 %attr(750,ecartis,ecartis) %dir %{_ecartisdir}/modules
 %attr(750,ecartis,ecartis) %dir %{_ecartisdir}/scripts
+%attr(751,ecartis,ecartis) %dir %{_ecartisdata}/lists
+%attr(750,ecartis,ecartis) %dir %{_ecartisdata}/queue
 %attr(640,root,ecartis) %{_ecartisdir}/spam-regexp.sample
 %attr(750,ecartis,ecartis) %{_ecartisdir}/modules/*
 %attr(750,ecartis,ecartis) %{_ecartisdir}/scripts/*
@@ -238,6 +240,6 @@ rm -Rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc src/modules/lsg2/*.txt
 %attr(755,root,   root) /home/httpd/cgi-bin/*.cgi
-%attr(770,root,ecartis) %dir %{_ecartisdir}/lists/SITEDATA
-%attr(660,root,ecartis) %{_ecartisdir}/lists/SITEDATA/cookies
+%attr(770,root,ecartis) %dir %{_ecartisdata}/lists/SITEDATA
+%attr(660,root,ecartis) %{_ecartisdata}/lists/SITEDATA/cookies
 %{_ecartisdir}/templates/*.lsc