SPECS: courier.spec - updated to 0.52.2 - changed cgi-gin from /ho...

[andree]

Author: andree                       Date: Tue Jan 17 01:24:42 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- updated to 0.52.2
- changed cgi-gin from /home/services to /usr/lib
- rel. 0.1 need testing

---- Files affected:
SPECS:
   courier.spec (1.124 -> 1.125) 

---- Diffs:

================================================================
Index: SPECS/courier.spec
diff -u SPECS/courier.spec:1.124 SPECS/courier.spec:1.125
--- SPECS/courier.spec:1.124	Sat Nov 19 17:15:07 2005
+++ SPECS/courier.spec	Tue Jan 17 02:24:36 2006
@@ -1,7 +1,6 @@
 # $Revision$, $Date$
 # TODO
-# - move stuff out of /home/services/httpd (because that ain't right!)
-# - use %{_prefix}/lib/cgi-bin
+# - test and bump rel. to 1
 #
 # Conditional build:
 %bcond_without	fam		# with fam support
@@ -10,13 +9,13 @@
 Summary:	Courier mail server
 Summary(pl):	Serwer poczty Courier
 Name:		courier
-Version:	0.52.1
-Release:	1.1
+Version:	0.52.2
+Release:	0.1
 License:	GPL
 Group:		Networking/Daemons
-#Source0:	http://dl.sourceforge.net/courier/%{name}-%{version}.tar.bz2
-Source0:	http://dl.sourceforge.net/courier/%{name}-%{version}.tar.bz2
-# Source0-md5:	98005b9bacd44fa9e1a2b2100907522a
+# !!! Don't change it !!!
+Source0:	http://heanet.dl.sourceforge.net/sourceforge/courier/%{name}-%{version}.tar.bz2
+# Source0-md5:	73cda41adc5425ade94e1f9005b2218b
 Patch0:		%{name}-openssl-path.patch
 Patch1:		%{name}-withoutfam.patch
 Patch2:		%{name}-maildir.patch
@@ -76,8 +75,7 @@
 %define		_certsdir	%{_sysconfdir}/certs
 %define		_initrddir	/etc/rc.d/init.d
 
-%define		_httpdir	/home/services/httpd
-%define		_cgibindir	%{_httpdir}/cgi-bin
+%define		_cgibindir	%{_prefix}/lib/cgi-bin
 %define		_imagedir	%{_datadir}/sqwebmail/images
 %define		_imageurl	/webmail
 
@@ -163,10 +161,13 @@
 Summary:	Courier Integrated HTTP administraton panel
 Summary(pl):	Panel administracyjny przez HTTP dla Couriera
 Group:		Networking/Daemons
+Requires:	FHS >= 2.3-12
 Requires:	%{_cgibindir}
 Requires:	%{name} = %{version}-%{release}
 Requires:	webserver = apache
 Conflicts:	apache < 1.3.33-2
+Conflicts:	apache-base < 2.2.0-8
+Conflicts:	apache1 < 1.3.34-5.11
 
 %description webadmin
 This is a web-based administration tool. Webadmin is a web CGI
@@ -179,10 +180,13 @@
 Summary:	Courier Integrated HTTP (webmail) server
 Summary(pl):	Zintegrowany serwer poczty przez HTTP (webmail) do Couriera
 Group:		Networking/Daemons
+Requires:	FHS >= 2.3-12
 Requires:	%{_cgibindir}
 Requires:	%{name} = %{version}-%{release}
 Requires:	webserver = apache
 Conflicts:	apache < 1.3.33-2
+Conflicts:	apache-base < 2.2.0-8
+Conflicts:	apache1 < 1.3.34-5.11
 
 %description webmail
 This package installs Courier mail server's integrated HTTP webmail
@@ -313,7 +317,7 @@
 rm -rf $RPM_BUILD_ROOT
 umask 022
 install -d -p $RPM_BUILD_ROOT{/etc/{cron.hourly,pam.d},%{_initrddir}} \
-$RPM_BUILD_ROOT{%{_cgibindir},%{_prefix}/lib,%{_sysconfdir}/hosteddomains} \
+$RPM_BUILD_ROOT{%{_prefix}/lib,%{_cgibindir},%{_sysconfdir}/hosteddomains} \
 	$RPM_BUILD_ROOT{/etc/cron.hourly,%{_certsdir}}
 
 %{__make} install \
@@ -913,6 +917,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.125  2006/01/17 01:24:36  andree
+- updated to 0.52.2
+- changed cgi-gin from /home/services to /usr/lib
+- rel. 0.1 need testing
+
 Revision 1.124  2005/11/19 16:15:07  glen
 - doesn't work with other webservers than apache2 due apache2 specific documentroot and cgi-bin dirs
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/courier.spec?r1=1.124&r2=1.125&f=u