Author: andree Date: Fri Mar 4 22:46:16 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - updated to 5.0.1, removed -build.patch (obsolete) - updated URL, change imagedir - updated post, preun for apache1,2
---- Files affected: SPECS: sqwebmail.spec (1.70.2.2 -> 1.70.2.3) ---- Diffs: ================================================================ Index: SPECS/sqwebmail.spec diff -u SPECS/sqwebmail.spec:1.70.2.2 SPECS/sqwebmail.spec:1.70.2.3 --- SPECS/sqwebmail.spec:1.70.2.2 Tue Dec 21 01:19:40 2004 +++ SPECS/sqwebmail.spec Fri Mar 4 23:46:10 2005 @@ -1,7 +1,7 @@ # $Revision$, $Date$ # # TODO -# - triggers, tests +# - tests # # Conditional build: %bcond_without ispell @@ -12,12 +12,12 @@ Summary: SqWebMail - Maildir Webmail CGI client Summary(pl): SqWebMail - Klient pocztowy CGI dla skrzynek Maildir Name: sqwebmail -Version: 5.0.0 +Version: 5.0.1 Release: 0.1 License: GPL Group: Applications/Mail -Source0: http://www.courier-mta.org/beta/sqwebmail/%{name}-%{version}.tar.bz2 -# Source0-md5: f6d57fd7b1cbf7044d5d20e89d147b22 +Source0: http://dl.sourceforge.net/courier/%{name}-%{version}.tar.bz2 +# Source0-md5: 43bdf4521e8512411da5dad53395ca68 Source1: %{name}-cron-cleancache Source2: %{name}.init %{?with_pl:Source3: %{name}-3.4.1-mgt.pl-beautifull_patch.tgz} @@ -25,12 +25,12 @@ Patch1: %{name}-prowizorka.patch Patch2: %{name}-maildir.patch Patch3: %{name}-init.patch -Patch4: %{name}-build.patch -URL: http://www.inter7.com/sqwebmail/ +URL: http://www.courier-mta.org/sqwebmail/ BuildRequires: autoconf BuildRequires: automake BuildRequires: courier-authlib-devel BuildRequires: expect +BuildRequires: fam-devel BuildRequires: gdbm-devel BuildRequires: gnupg >= 1.0.4 # perhaps only because of test sources written in C, but with ".C" extension(?) @@ -58,7 +58,7 @@ %define httpddir /home/services/httpd %define cgibindir %{httpddir}/cgi-bin -%define imagedir %{_datadir}/sqwebmail/html/webmail +%define imagedir %{_datadir}/sqwebmail/images %define imageurl /webmail %define cacheowner bin @@ -103,7 +103,6 @@ %patch1 -p1 %patch2 -p1 %patch3 -p1 -%patch4 -p1 %build rm -f missing @@ -146,7 +145,6 @@ %endif rm $RPM_BUILD_ROOT%{_mandir}/man1/maildirmake.1 -mv $RPM_BUILD_ROOT%{_sysconfdir}/sqwebmail/ldapaddressbook.dist $RPM_BUILD_ROOT%{_sysconfdir}/sqwebmail/ldapaddressbook cp pcp/README.html pcp_README.html echo net >$RPM_BUILD_ROOT%{_sysconfdir}/sqwebmail/calendarmode @@ -155,8 +153,8 @@ %endif # make config file -./sysconftool $RPM_BUILD_ROOT%{_sysconfdir}/sqwebmail/sqwebmaild.dist -rm -f $RPM_BUILD_ROOT%{_sysconfdir}/sqwebmail/sqwebmaild.dist +./sysconftool $RPM_BUILD_ROOT%{_sysconfdir}/sqwebmail/*.dist +rm -f $RPM_BUILD_ROOT%{_sysconfdir}/sqwebmail/*.dist # delete man pages in conflict with courier-imap rm -f $RPM_BUILD_ROOT%{_mandir}/man8/deliverquota* @@ -173,13 +171,16 @@ rm -rf $RPM_BUILD_ROOT %post -if [ -f /etc/httpd/httpd.conf ] && ! grep -q "^Include.*%{name}.conf" /etc/httpd; then - echo "Include /etc/httpd/%{name}.conf" >> /etc/httpd/httpd.conf +if [ -f /etc/apache/apache.conf ] && ! grep -q "^Include.*%{name}.conf" /etc/apache/apache.conf; then + echo "Include /etc/httpd/%{name}.conf" >> /etc/apache/apache.conf + if [ -f /var/lock/subsys/apache ]; then + /etc/rc.d/init.d/apache restart 1>&2 + fi elif [ -d /etc/httpd/httpd.conf ]; then ln -sf /etc/httpd/%{name}.conf /etc/httpd/httpd.conf/99_%{name}.conf -fi -if [ -f /var/lock/subsys/httpd ]; then - /usr/sbin/apachectl restart 1>&2 + if [ -f /var/lock/subsys/httpd ]; then + /usr/sbin/apachectl restart 1>&2 + fi fi [ -L %{_datadir}/sqwebmail/html/en ] || ln -fs en-us %{_datadir}/sqwebmail/html/en @@ -193,16 +194,19 @@ %preun if [ "$1" = "0" ]; then umask 027 - if [ -d /etc/httpd/httpd.conf ]; then - rm -f /etc/httpd/httpd.conf/99_%{name}.conf - else - grep -v "^Include.*%{name}.conf" /etc/httpd/httpd.conf > \ - /etc/httpd/httpd.conf.tmp - mv -f /etc/httpd/httpd.conf.tmp /etc/httpd/httpd.conf - if [ -f /var/lock/subsys/httpd ]; then - /usr/sbin/apachectl restart 1>&2 - fi + if [ -d /etc/httpd/httpd.conf ]; then + rm -f /etc/httpd/httpd.conf/99_%{name}.conf + if [ -f /var/lock/subsys/httpd ]; then + /usr/sbin/apachectl restart 1>&2 + fi + elif [ -f /etc/apache/apache.conf ]; then + grep -v "^Include.*%{name}.conf" /etc/apache/apache.conf > \ + /etc/apache/apache.conf.tmp + mv -f /etc/apache/apache.conf.tmp /etc/apache/apache.conf + if [ -f /var/lock/subsys/apache ]; then + /etc/rc.d/init.d/apache restart 1>&2 fi + fi fi if [ "$1" = "0" ]; then @@ -276,6 +280,7 @@ %dir %{_datadir}/sqwebmail %dir %{_datadir}/sqwebmail/html %dir %{_datadir}/sqwebmail/html/en-us +%{_datadir}/sqwebmail/images %config(noreplace) %verify(not size mtime md5) %{_datadir}/sqwebmail/html/en-us/CHARSET %config(noreplace) %verify(not size mtime md5) %{_datadir}/sqwebmail/html/en-us/LANGUAGE %config(noreplace) %verify(not size mtime md5) %{_datadir}/sqwebmail/html/en-us/LANGUAGE_PREF @@ -326,6 +331,11 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.70.2.3 2005/03/04 22:46:10 andree +- updated to 5.0.1, removed -build.patch (obsolete) +- updated URL, change imagedir +- updated post, preun for apache1,2 + Revision 1.70.2.2 2004/12/21 00:19:40 andree - fixed moving to pam dir, %%files fixes ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/sqwebmail.spec?r1=1.70.2.2&r2=1.70.2.3&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
