SPECS: apache-mod_whatkilledus.spec - conf.d based apache; rel 2

glen glen at pld-linux.org
Tue Oct 14 21:55:37 CEST 2008


Author: glen                         Date: Tue Oct 14 19:55:37 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- conf.d based apache; rel 2

---- Files affected:
SPECS:
   apache-mod_whatkilledus.spec (1.12 -> 1.13) 

---- Diffs:

================================================================
Index: SPECS/apache-mod_whatkilledus.spec
diff -u SPECS/apache-mod_whatkilledus.spec:1.12 SPECS/apache-mod_whatkilledus.spec:1.13
--- SPECS/apache-mod_whatkilledus.spec:1.12	Mon Jun 16 23:29:37 2008
+++ SPECS/apache-mod_whatkilledus.spec	Tue Oct 14 21:55:32 2008
@@ -5,7 +5,7 @@
 Summary(pl.UTF-8):	Moduł apache wiedzący, co obsługiwał wątek w przypadku naruszenia ochrony pamięci
 Name:		apache-mod_%{mod_name}
 Version:	1.0
-Release:	1.20040323.1
+Release:	1.20040323.2
 License:	Apache v2.0
 Group:		Networking/Daemons
 Source0:	http://people.apache.org/~trawick/mod_whatkilledus.c
@@ -18,8 +18,8 @@
 Requires:	apache(modules-api) = %apache_modules_api
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%define		_sysconfdir	%(%{apxs} -q SYSCONFDIR 2>/dev/null)/conf.d
 %define		_pkglibdir	%(%{apxs} -q LIBEXECDIR 2>/dev/null)
-%define		_sysconfdir	%(%{apxs} -q SYSCONFDIR 2>/dev/null)
 
 %description
 Keeps a little bit of state on each active connection, which allows it
@@ -35,18 +35,18 @@
 install %{SOURCE0} .
 
 %build
-%{__cc} `%{_bindir}/apr-1-config --includes --cppflags` %{SOURCE1} -o gen_test_char
+%{__cc} $(%{_bindir}/apr-1-config --includes --cppflags) %{SOURCE1} -o gen_test_char
 ./gen_test_char > test_char.h
 %{apxs} -c mod_%{mod_name}.c -o mod_%{mod_name}.la
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_sysconfdir}/httpd.conf,/var/log/httpd}
+install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_sysconfdir},/var/log/httpd}
 install .libs/mod_%{mod_name}.so $RPM_BUILD_ROOT%{_pkglibdir}
 
 touch $RPM_BUILD_ROOT/var/log/httpd/whatkilledus_log
 
-cat > $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf/68_mod_%{mod_name}.conf << 'EOF'
+cat > $RPM_BUILD_ROOT%{_sysconfdir}/68_mod_%{mod_name}.conf << 'EOF'
 LoadModule %{mod_name}_module modules/mod_%{mod_name}.so
 EnableExceptionHook On
 WhatKilledUsLog /var/log/httpd/whatkilledus_log
@@ -66,7 +66,7 @@
 
 %files
 %defattr(644,root,root,755)
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf/*_mod_%{mod_name}.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/*_mod_%{mod_name}.conf
 %attr(755,root,root) %{_pkglibdir}/*.so
 # append by webserver
 %attr(620,root,http) %ghost /var/log/httpd/whatkilledus_log
@@ -77,6 +77,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.13  2008/10/14 19:55:32  glen
+- conf.d based apache; rel 2
+
 Revision 1.12  2008/06/16 21:29:37  qboosh
 - cleanup
 
================================================================

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



More information about the pld-cvs-commit mailing list