- addedd paths.patch

[packages/ecartis.git] / ecartis.spec

diff --git a/ecartis.spec b/ecartis.spec
index 66d76c96f3a89414f925dd90dbff3cc36029a6e8..4691eaf6f5697b3b69e900f7dfc60e0e4d7bc738 100644 (file)
--- a/ecartis.spec
+++ b/ecartis.spec
@@ -1,5 +1,5 @@
-%define                _snap   20020718
-%define                _rel    0.8
+%define                _snap   20020811
+%define                _rel    0.1
 
 Summary:       Ecartis Mailing List Manager
 Summary(pl):   Zarz±dca List Dyskusyjnych
@@ -11,8 +11,10 @@ Vendor:              NodeRunner Software
 Group:         Applications/Mail
 Source0:       ftp://ftp.ecartis.org/pub/ecartis/snapshots/tar/%{name}-%{version}-snap%{_snap}.tar.gz
 Source1:       %{name}.logrotate
-Patch0:                http://www.misiek.eu.org/ipv6/listar-0.129a-ipv6-20000915.patch.gz
+#Original taken from: http://www.misiek.eu.org/ipv6/listar-0.129a-ipv6-20000915.patch.gz
+Patch0:                %{name}-ipv6.patch
 Patch1:                %{name}-conf.patch
+Patch1:                %{name}-paths.patch
 URL:           http://www.ecartis.org/
 Requires(pre): %{_sbindir}/useradd
 Requires(pre): %{_sbindir}/groupadd
@@ -23,7 +25,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
@@ -60,6 +63,7 @@ Summary(pl):  Web interfejs dla Ecartis
 Group:         Applications/Mail
 Requires:      %{name} = %{version}
 Requires:      webserver
+Obsoletes:     listar-cgi
 
 %description cgi
 ecartis-cgi program, which provides a web-based front-end for your
@@ -70,8 +74,9 @@ Program ecartis-cgi, kt
 
 %prep
 %setup -q
-#%patch0 -p1
+%patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %{__make} -Csrc -fMakefile.dist WFLAGS="%{rpmcflags} -Wall"
@@ -79,10 +84,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,17 +100,17 @@ 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}
 
 # Links for configuration:
-ln -sf %{_sysconfdir}/%{name}/%{name}.cfg      $RPM_BUILD_ROOT%{_ecartisdir}/%{name}.cfg
-ln -sf %{_sysconfdir}/%{name}/%{name}.aliases  $RPM_BUILD_ROOT%{_ecartisdir}/%{name}.aliases
-ln -sf %{_sysconfdir}/%{name}/banned           $RPM_BUILD_ROOT%{_ecartisdir}/banned
-ln -sf %{_sysconfdir}/%{name}/%{name}.hlp      $RPM_BUILD_ROOT%{_ecartisdir}/%{name}.hlp
+#ln -sf %{_sysconfdir}/%{name}/%{name}.cfg     $RPM_BUILD_ROOT%{_ecartisdir}/%{name}.cfg
+#ln -sf %{_sysconfdir}/%{name}/%{name}.aliases $RPM_BUILD_ROOT%{_ecartisdir}/%{name}.aliases
+#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
@@ -153,9 +157,16 @@ fi
 # alias:
 umask 022
 if [ -f /etc/mail/aliases ]; then
-       if ! grep -q "^%{name}:" /etc/mail/aliases; then
-               echo "%{name}:  \"|%{_ecartisdir}/%{name}\"" >> /etc/mail/aliases
-               newaliases || :
+       if [ -e /etc/smrsh ]; then
+               if ! grep -q "^%{name}:" /etc/mail/aliases; then
+                       echo "%{name}:  \"|/etc/smrsh/ecartis\"" >> /etc/mail/aliases
+                       newaliases || :
+               fi
+       else
+               if ! grep -q "^%{name}:" /etc/mail/aliases; then
+                       echo "%{name}:  \"|%{_ecartisdir}/%{name}\"" >> /etc/mail/aliases
+                       newaliases || :
+               fi
        fi
 fi
 
@@ -167,7 +178,7 @@ fi
 # Detect SMRSH
 if [ -e /etc/smrsh -a ! -e /etc/smrsh/ecartis ]; then
     echo "#!/bin/sh" > /etc/smrsh/ecartis
-    echo "%{_ecartisdir}/ecartis $@" >> /etc/smrsh/ecartis
+    echo "%{_ecartisdir}/ecartis \$@" >> /etc/smrsh/ecartis
     chmod ug+rx /etc/smrsh/ecartis
 
     echo "Your installation has been detected to have SMRSH, the SendMail"
@@ -177,15 +188,15 @@ 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
 chmod 711 %{_ecartisdir}
 
 # Run upgrade
-echo -n "Run upgrade now... "
+echo "Run upgrade now... "
 %{_ecartisdir}/%{name} -upgrade
-echo "done."
 exit 0
 
 %triggerpostun -- listar
@@ -194,8 +205,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/ /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
@@ -210,18 +221,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/*
@@ -231,6 +243,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