SPECS: ISMail.spec - works now, rel. 1

[djurban]

Author: djurban                      Date: Wed Dec 21 00:53:25 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- works now, rel. 1

---- Files affected:
SPECS:
   ISMail.spec (1.13 -> 1.14) 

---- Diffs:

================================================================
Index: SPECS/ISMail.spec
diff -u SPECS/ISMail.spec:1.13 SPECS/ISMail.spec:1.14
--- SPECS/ISMail.spec:1.13	Wed Dec 21 01:27:32 2005
+++ SPECS/ISMail.spec	Wed Dec 21 01:53:20 2005
@@ -3,12 +3,12 @@
 Summary(pl):	Webmail firmy Inside Systems
 Name:		ismail
 Version:	2.0
-Release:	0.5
+Release:	1
 License:	GPL
 Group:		Applications/Mail
 Source0:	ftp://ftp.insidesystems.net/ismail/%{name}-%{version}.tar.bz2
 # Source0-md5:	df7b88426f24250cd7ffee6f29d330b2
-Source1:	%{name}.conf
+Source1:	%{name}-apache.conf
 # from http://alexandre.alapetite.net/doc-alex/domxml-php4-php5/index.en.html
 Source2:	%{name}-domxml4-to5-fixup.php
 Patch0:		%{name}-php5.patch
@@ -18,12 +18,18 @@
 Requires:	php-imap
 Requires:	php-domxml
 Requires:	php-xml
+Requires:       webapps
 Requires:	webserver
 Provides:	webmail
+BuildRequires:  rpmbuild(macros) >= 1.264
+BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_ismaildir	%{_datadir}/%{name}
 %define 	_sysconfdir     /etc/%{name}
+%define         _webapps        /etc/webapps
+%define         _webapp         %{name}
+%define		_webappsdir	%{_webapps}/%{name}
 
 %description
 This package contains ISMail, a webmail system for modern browsers.
@@ -40,7 +46,7 @@
 rm -rf $RPM_BUILD_ROOT
 
 install -d $RPM_BUILD_ROOT%{_ismaildir} \
-	    $RPM_BUILD_ROOT{%{_sysconfdir},/etc/httpd}
+	    $RPM_BUILD_ROOT{%{_sysconfdir},%{_webappsdir}}
 mv ismail/include/ismail.conf.sample ismail/include/ismail.conf
 mv ismail/include/istheme.conf.sample ismail/include/istheme.conf
 
@@ -51,9 +57,22 @@
 ln -sf %{_sysconfdir}/ismail.conf               $RPM_BUILD_ROOT%{_ismaildir}/include/ismail.conf
 ln -sf %{_sysconfdir}/istheme.conf               $RPM_BUILD_ROOT%{_ismaildir}/include/istheme.conf
 
-install %{SOURCE1} $RPM_BUILD_ROOT/etc/httpd/%{name}.conf
+install %{SOURCE1} $RPM_BUILD_ROOT%{_webappsdir}/apache.conf
+install %{SOURCE1} $RPM_BUILD_ROOT%{_webappsdir}/httpd.conf
 install %{SOURCE2} $RPM_BUILD_ROOT%{_ismaildir}/include/datastores/domxml4-to5-fixup.php
 
+%triggerin -- apache1
+%webapp_register apache %{_webapp}
+
+%triggerun -- apache1
+%webapp_unregister apache %{_webapp}
+
+%triggerin -- apache >= 2.0.0
+%webapp_register httpd %{_webapp}
+
+%triggerun -- apache >= 2.0.0
+%webapp_unregister httpd %{_webapp}
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -64,6 +83,7 @@
 %{_sysconfdir}/*.conf
 %dir %{_ismaildir}
 %dir %{_ismaildir}/include
+%{_webappsdir}
 %config(noreplace) %verify(not md5 mtime size) %{_ismaildir}/include/*.conf
 %{_ismaildir}/include/*.php
 #%{_ismaildir}/include/*.class
@@ -76,7 +96,6 @@
 %{_ismaildir}/themes
 #%{_ismaildir}/graphics
 #%attr(730,root,http) %dir %{_ismaildir}/users
-%attr(640,root,root) /etc/httpd/%{name}.conf
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -84,6 +103,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.14  2005/12/21 00:53:20  djurban
+- works now, rel. 1
+
 Revision 1.13  2005/12/21 00:27:32  djurban
 - builds, converting to webapps
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/ISMail.spec?r1=1.13&r2=1.14&f=u