packages: apache-mod_macro/apache-mod_macro.spec - fix dirdep; rel 2

[glen]

Author: glen                         Date: Sun Jan  3 02:48:00 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fix dirdep; rel 2

---- Files affected:
packages/apache-mod_macro:
   apache-mod_macro.spec (1.13 -> 1.14) 

---- Diffs:

================================================================
Index: packages/apache-mod_macro/apache-mod_macro.spec
diff -u packages/apache-mod_macro/apache-mod_macro.spec:1.13 packages/apache-mod_macro/apache-mod_macro.spec:1.14
--- packages/apache-mod_macro/apache-mod_macro.spec:1.13	Sat Oct 25 17:50:01 2008
+++ packages/apache-mod_macro/apache-mod_macro.spec	Sun Jan  3 03:47:54 2010
@@ -5,7 +5,7 @@
 Summary(pl.UTF-8):	Moduł do apache pozwalający używać makr w konfiguracji
 Name:		apache-mod_%{mod_name}
 Version:	1.1.10
-Release:	1
+Release:	2
 License:	Apache
 Group:		Networking/Daemons/HTTP
 Source0:	http://www.cri.ensmp.fr/~coelho/mod_macro/mod_%{mod_name}-%{version}.tar.bz2
@@ -17,7 +17,7 @@
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_pkglibdir	%(%{apxs} -q LIBEXECDIR 2>/dev/null)
-%define		_sysconfdir	%(%{apxs} -q SYSCONFDIR 2>/dev/null)
+%define		_sysconfdir	%(%{apxs} -q SYSCONFDIR 2>/dev/null)/conf.d
 
 %description
 Apache module to allow macros in apache config files.
@@ -33,11 +33,11 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_sysconfdir}/httpd.conf}
+install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_sysconfdir}}
 
-install .libs/mod_%{mod_name}.so $RPM_BUILD_ROOT%{_pkglibdir}
+install -p .libs/mod_%{mod_name}.so $RPM_BUILD_ROOT%{_pkglibdir}
 echo 'LoadModule %{mod_name}_module modules/mod_%{mod_name}.so' > \
-	$RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf/90_mod_%{mod_name}.conf
+	$RPM_BUILD_ROOT%{_sysconfdir}/90_mod_%{mod_name}.conf
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -53,7 +53,7 @@
 %files
 %defattr(644,root,root,755)
 %doc README CHANGES
-%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
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -62,6 +62,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.14  2010/01/03 02:47:54  glen
+- fix dirdep; rel 2
+
 Revision 1.13  2008/10/25 15:50:01  blues
 - HTTP group
 
================================================================

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