SPECS: openvcp-web.spec - apache conf moved to separate source

[glen]

Author: glen                         Date: Sat Sep 22 10:38:35 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- apache conf moved to separate source

---- Files affected:
SPECS:
   openvcp-web.spec (1.4 -> 1.5) 

---- Diffs:

================================================================
Index: SPECS/openvcp-web.spec
diff -u SPECS/openvcp-web.spec:1.4 SPECS/openvcp-web.spec:1.5
--- SPECS/openvcp-web.spec:1.4	Sat Sep 22 11:50:09 2007
+++ SPECS/openvcp-web.spec	Sat Sep 22 12:38:30 2007
@@ -7,6 +7,7 @@
 Group:		Applications/WWW
 Source0:	http://files.openvcp.org/%{name}-%{version}.tar.gz
 # Source0-md5:	2d9733679fbb0b3a5f1b028d551043a1
+Source1:	%{name}-apache.conf
 URL:		http://www.openvcp.org/
 BuildRequires:	rpmbuild(macros) >= 1.268
 Requires(triggerpostun):	sed >= 4.0
@@ -34,23 +35,6 @@
 %prep
 %setup -q -n %{name}-%{version}-rc2
 
-cat > httpd.conf <<'EOF'
-Alias /%{name} %{_appdir}
-<Directory %{_appdir}>
-	RewriteEngine On
-	RewriteRule ^openvcp(.*)$ index.php$1
-
-	Order Deny,Allow
-	Deny from all
-	Allow from localhost
-</Directory>
-
-<Directory %{_appdir}/core>
-	Order Deny,Allow
-	Deny from all
-</Directory>
-EOF
-
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_appdir},/var/cache/openvcp-web}
@@ -64,7 +48,8 @@
 ln -sf /var/cache/openvcp-web $RPM_BUILD_ROOT%{_appdir}/core/cache
 ln -sf %{_sysconfdir}/openvcp.conf $RPM_BUILD_ROOT%{_appdir}/core/openvcp.conf
 
-install httpd.conf $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
+install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
+install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -91,10 +76,9 @@
 %defattr(644,root,root,755)
 %doc AUTHORS INSTALL README core/mysql.sql
 %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}/apache.conf
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf
-#%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/lighttpd.conf
-%attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/*
+%attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/openvcp.conf
 %{_appdir}
 %dir %attr(770,httpd,httpd) /var/cache/openvcp-web
 
@@ -104,6 +88,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.5  2007/09/22 10:38:30  glen
+- apache conf moved to separate source
+
 Revision 1.4  2007/09/22 09:50:09  glen
 - correct php dependency
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/openvcp-web.spec?r1=1.4&r2=1.5&f=u