packages: unxsadmin/unxsadmin.spec - switched to webapps

[paszczus]

Author: paszczus                     Date: Mon Jun 15 07:47:07 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- switched to webapps

---- Files affected:
packages/unxsadmin:
   unxsadmin.spec (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: packages/unxsadmin/unxsadmin.spec
diff -u packages/unxsadmin/unxsadmin.spec:1.2 packages/unxsadmin/unxsadmin.spec:1.3
--- packages/unxsadmin/unxsadmin.spec:1.2	Mon Jun 15 09:34:15 2009
+++ packages/unxsadmin/unxsadmin.spec	Mon Jun 15 09:47:02 2009
@@ -11,9 +11,16 @@
 URL:		http://openisp.net/unxsAdmin/
 BuildRequires:	rpmbuild(macros) >= 1.268
 Patch0:		%{name}-DESTDIR.patch
+Requires(triggerpostun):	sed >= 4.0
 Requires:	apache >= 2.2
-Requires:	apache-mod_ssl
+Requires:	apache-mod_ssl >= 2.2
+Requires:	apache-mod_dir >= 2.2
 Requires:	rrdtool
+Requires:	webapps
+
+%define		_webapps	/etc/webapps
+%define		_webapp		%{name}
+%define		_sysconfdir	%{_webapps}/%{_webapp}
 
 %description
 unxsadmin provides the http shared content and conf for all unxsVZ web
@@ -45,7 +52,13 @@
 cp -a images/*.gif $RPM_BUILD_ROOT%{_datadir}/unxs/html/images/
 cp -a js/*.js $RPM_BUILD_ROOT%{_datadir}/unxs/html/js
 cp -a css/*.css $RPM_BUILD_ROOT%{_datadir}/unxs/html/css
-install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/99_unxs.conf
+install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
+
+%triggerin -- apache < 2.2.0, apache-base
+%webapp_register httpd %{_webapp}
+
+%triggerun -- apache < 2.2.0, apache-base
+%webapp_unregister httpd %{_webapp}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -61,6 +74,8 @@
 %files
 %defattr(644,root,root,755)
 %doc README
+%dir %attr(750,root,http) %{_sysconfdir}
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf
 %dir %{_datadir}/unxs
 %dir %{_datadir}/unxs/cgi-bin
 %dir %{_datadir}/unxs/logs
@@ -71,7 +86,6 @@
 %{_datadir}/unxs/html/images/*.gif
 %dir %{_datadir}/unxs/html/js
 %{_datadir}/unxs/html/js/*.js
-%{_sysconfdir}/httpd/conf.d/99_unxs.conf
 %attr(755,root,root) %{_bindir}/lastmonth
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -80,6 +94,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.3  2009/06/15 07:47:02  paszczus
+- switched to webapps
+
 Revision 1.2  2009/06/15 07:34:15  paszczus
 - updated URL
 - fixed Requires
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/unxsadmin/unxsadmin.spec?r1=1.2&r2=1.3&f=u