SPECS: apache-mod_mono.spec - use conf.d for apache config fragmen...

[glen]

Author: glen                         Date: Wed Dec 26 18:09:44 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- use conf.d for apache config fragment; rel 2

---- Files affected:
SPECS:
   apache-mod_mono.spec (1.50 -> 1.51) 

---- Diffs:

================================================================
Index: SPECS/apache-mod_mono.spec
diff -u SPECS/apache-mod_mono.spec:1.50 SPECS/apache-mod_mono.spec:1.51
--- SPECS/apache-mod_mono.spec:1.50	Sat Dec 15 21:33:51 2007
+++ SPECS/apache-mod_mono.spec	Wed Dec 26 19:09:39 2007
@@ -7,7 +7,7 @@
 Summary(pl.UTF-8):	Moduł Mono dla serwera Apache 2
 Name:		apache-%{mod_name}
 Version:	1.2.6
-Release:	1
+Release:	2
 Epoch:		1
 License:	Apache 2.0
 Group:		Networking/Daemons
@@ -30,8 +30,8 @@
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_httpdir	/home/services/httpd
-%define		_pkglibdir	%(%{apxs} -q LIBEXECDIR 2>/dev/null)
-%define		_sysconfdir	%(%{apxs} -q SYSCONFDIR 2>/dev/null)
+%define		apacheconfdir	%(%{apxs} -q SYSCONFDIR 2>/dev/null)/conf.d
+%define		apachelibdir	%(%{apxs} -q LIBEXECDIR 2>/dev/null)
 
 %description
 This is an experimental module that allows you to run ASP.NET pages on
@@ -62,12 +62,12 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_sysconfdir}/httpd.conf,%{_pkglibdir},%{_mandir}/man8}
+install -d $RPM_BUILD_ROOT{%{apacheconfdir},%{apachelibdir},%{_mandir}/man8}
 
-install src/.libs/%{mod_name}.so $RPM_BUILD_ROOT%{_pkglibdir}
+install src/.libs/%{mod_name}.so $RPM_BUILD_ROOT%{apachelibdir}
 install man/%{mod_name}.8 $RPM_BUILD_ROOT%{_mandir}/man8
 
-cat > $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf/70_mod_%{mod_name}.conf <<EOF
+cat > $RPM_BUILD_ROOT%{apacheconfdir}/70_mod_%{mod_name}.conf <<'EOF'
 LoadModule mono_module modules/%{mod_name}.so
 MonoApplications "/asp_net:%{_httpdir}/asp_net"
 Alias /asp_net "%{_httpdir}/asp_net"
@@ -82,8 +82,8 @@
 %files
 %defattr(644,root,root,755)
 %doc ChangeLog INSTALL NEWS README
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf/*_mod_%{mod_name}.conf
-%attr(755,root,root) %{_pkglibdir}/mod_mono.so
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{apacheconfdir}/*_mod_%{mod_name}.conf
+%attr(755,root,root) %{apachelibdir}/mod_mono.so
 %{_mandir}/man8/mod_mono.8*
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -92,6 +92,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.51  2007-12-26 18:09:39  glen
+- use conf.d for apache config fragment; rel 2
+
 Revision 1.50  2007-12-15 20:33:51  qboosh
 - License is Apache 2.0
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/apache-mod_mono.spec?r1=1.50&r2=1.51&f=u