SPECS: sqwebmail.spec - move cgi program to /usr/lib/cgi-bin - cgi...

[glen]

Author: glen                         Date: Sun Jan  1 18:38:13 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- move cgi program to /usr/lib/cgi-bin
- cgi program permissions changed to 755 root:root (i see no point having them 755 root:mail)
- remove conflicting sharedindex{install,split} with courier-imap

---- Files affected:
SPECS:
   sqwebmail.spec (1.86 -> 1.87) 

---- Diffs:

================================================================
Index: SPECS/sqwebmail.spec
diff -u SPECS/sqwebmail.spec:1.86 SPECS/sqwebmail.spec:1.87
--- SPECS/sqwebmail.spec:1.86	Tue Dec 13 20:46:29 2005
+++ SPECS/sqwebmail.spec	Sun Jan  1 19:38:08 2006
@@ -10,7 +10,7 @@
 Summary(pl):	SqWebMail - Klient pocztowy CGI dla skrzynek Maildir
 Name:		sqwebmail
 Version:	5.0.4
-Release:	1.2
+Release:	1.6
 License:	GPL
 Group:		Applications/Mail
 Source0:	http://dl.sourceforge.net/courier/%{name}-%{version}.tar.bz2
@@ -40,6 +40,7 @@
 BuildRequires:	rpmbuild(macros) >= 1.264
 BuildRequires:	sysconftool
 Requires(post,preun):	/sbin/chkconfig
+Requires:	FHS >= 2.3-12
 %{?with_ssl:Requires:	apache(mod_ssl)}
 Requires:	crondaemon
 Requires:	expect
@@ -48,6 +49,8 @@
 Requires:	mailcap
 Requires:	rc-scripts
 Requires:	webserver = apache
+Conflicts:	apache-base < 2.2.0-8
+Conflicts:	apache1 < 1.3.34-5.11
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define	_libexecdir		/usr/%{_lib}
@@ -56,8 +59,7 @@
 %define	_webapp		%{name}
 %define	_sysconfdir	%{_webapps}/%{_webapp}
 
-%define	httpddir		/home/services/httpd
-%define	cgibindir		%{httpddir}/cgi-bin
+%define	cgibindir		%{_prefix}/lib/cgi-bin
 %define	imagedir		%{_datadir}/sqwebmail/images
 %define	imageurl		/webmail
 
@@ -171,6 +173,8 @@
 # delete man pages in conflict with courier-imap
 rm -f $RPM_BUILD_ROOT%{_mandir}/man8/deliverquota*
 rm -f $RPM_BUILD_ROOT%{_libexecdir}/sqwebmaild.rc
+# these conflict with courier-imap
+rm -f $RPM_BUILD_ROOT%{_sbindir}/sharedindex{install,split}
 
 # pam
 cp sqwebmail/sqwebmail.pamconf $RPM_BUILD_ROOT/etc/pam.d/webmail
@@ -229,7 +233,7 @@
 
 %post pl_html
 [ -L %{_datadir}/sqwebmail/html/pl ] || ln -fs pl-pl %{_datadir}/sqwebmail/html/pl
-echo "echo 'pl-pl' > /usr/share/sqwebmail/html/en/LANGUAGE"
+echo "echo 'pl-pl' > %{_datadir}/sqwebmail/html/en/LANGUAGE"
 
 %preun pl_html
 [ ! -L %{_datadir}/sqwebmail/html/pl ] || rm -f %{_datadir}/sqwebmail/html/pl
@@ -295,11 +299,9 @@
 %doc AUTHORS sqwebmail/BUGS INSTALL NEWS README sqwebmail/SECURITY sqwebmail/TODO gpglib/README.html
 %doc sqwebmail/BUGS.html INSTALL.html README.html sqwebmail/SECURITY.html sqwebmail/TODO.html sqwebmail/ChangeLog
 %doc maildir/README*.html gpglib/README.html
-%attr(%{sqwebmailperm}, %{sqwebmailowner}, %{sqwebmailgroup}) %{cgibindir}/sqwebmail
+%attr(755,root,root) %{cgibindir}/sqwebmail
 
 %attr(755,root,root) %{_sbindir}/webgpg
-%attr(755,root,root) %{_sbindir}/sharedindexinstall
-%attr(755,root,root) %{_sbindir}/sharedindexsplit
 
 %dir %{_libexecdir}/sqwebmail
 %attr(755,root,root) %{_libexecdir}/sqwebmail/deliverquota
@@ -372,6 +374,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.87  2006/01/01 18:38:08  glen
+- move cgi program to /usr/lib/cgi-bin
+- cgi program permissions changed to 755 root:root (i see no point having them 755 root:mail)
+- remove conflicting sharedindex{install,split} with courier-imap
+
 Revision 1.86  2005/12/13 19:46:29  glen
 - use webapps framework
 - cleanups and cosmetics
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/sqwebmail.spec?r1=1.86&r2=1.87&f=u