packages: nagios-vshell/nagios-vshell.spec - use own apache config

[glen]

Author: glen                         Date: Sat Jan  7 17:16:50 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- use own apache config

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

---- Diffs:

================================================================
Index: packages/nagios-vshell/nagios-vshell.spec
diff -u packages/nagios-vshell/nagios-vshell.spec:1.2 packages/nagios-vshell/nagios-vshell.spec:1.3
--- packages/nagios-vshell/nagios-vshell.spec:1.2	Sat Jan  7 18:01:00 2012
+++ packages/nagios-vshell/nagios-vshell.spec	Sat Jan  7 18:16:44 2012
@@ -5,11 +5,12 @@
 Summary:	Nagios V-Shell
 Name:		nagios-%{pkg}
 Version:	1.8
-Release:	0.3
+Release:	0.4
 License:	GPL v2
 Group:		Applications/WWW
 Source0:	http://assets.nagios.com/downloads/exchange/nagiosvshell/%{pkg}.tar.gz
 # Source0-md5:	802a80daa263b441af1b729cb3e7fa35
+Source1:	apache.conf
 Patch0:		config.patch
 URL:		http://exchange.nagios.org/directory/Addons/Frontends-(GUIs-and-CLIs)/Web-Interfaces/Nagios-V-2DShell/details
 Requires:	nagios-cgi
@@ -23,7 +24,7 @@
 %define		_webapps	/etc/webapps
 %define		_webapp		nagios-%{pkg}
 %define		_sysconfdir	%{_webapps}/%{_webapp}
-%define		_appdir		%{_datadir}/%{_webapp}
+%define		_appdir		%{_datadir}/nagios/%{pkg}
 
 %description
 Nagios V-Shell is a PHP web interface to Nagios Core that is designed
@@ -36,6 +37,9 @@
 mv %{pkg}/* .
 %patch0 -p1
 
+# standard license
+doc/gpl.txt
+
 # we handle ourself the installation
 mv install.php{,.sample}
 
@@ -46,7 +50,7 @@
 cp -a controllers css data js locale views $RPM_BUILD_ROOT%{_appdir}
 
 cp -p config/vshell.conf $RPM_BUILD_ROOT%{_sysconfdir}
-cp -p config/vshell_apache.conf $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
+cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
 cp -p $RPM_BUILD_ROOT%{_sysconfdir}/{apache,httpd}.conf
 
 %clean
@@ -66,7 +70,7 @@
 
 %files
 %defattr(644,root,root,755)
-%doc INSTALL.txt doc
+%doc INSTALL.txt doc/*
 %dir %attr(750,root,http) %{_sysconfdir}
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/apache.conf
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf
@@ -79,6 +83,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.3  2012/01/07 17:16:44  glen
+- use own apache config
+
 Revision 1.2  2012/01/07 17:01:00  glen
 - add webserver interation, patch config
 
================================================================

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