- fix config dir

[packages/apache-mod_ntlm.git] / apache-mod_ntlm.spec

diff --git a/apache-mod_ntlm.spec b/apache-mod_ntlm.spec
index d62271ce57e0b5cf6b3eee7babb99e1185bac03b..8acd9ba760aff2110e5dfca5b1be0b45b5cd446b 100644 (file)
--- a/apache-mod_ntlm.spec
+++ b/apache-mod_ntlm.spec
@@ -8,10 +8,11 @@ Version:      0.1
 Release:       0.1
 Epoch:         1
 License:       GPL
-Group:         Networking/Daemons
+Group:         Networking/Daemons/HTTP
 Source0:       http://dl.sourceforge.net/modntlm/mod_%{mod_name}2-%{version}.tgz
 # Source0-md5: 8abe4f235af6825f723412e187cac96b
 #Patch0:       %{name}-security.patch
+Patch1:                %{name}-apr_pool.patch
 URL:           http://modntlm.sourceforge.net/
 BuildRequires: %{apxs}
 BuildRequires: apache-devel >= 2.0
@@ -19,7 +20,7 @@ BuildRequires:        rpmbuild(macros) >= 1.268
 Requires:      apache(modules-api) = %apache_modules_api
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define                _pkglibdir      %(%{apxs} -q LIBEXECDIR 2>/dev/null)
+%define                _sysconfdir     %(%{apxs} -q SYSCONFDIR 2>/dev/null)/conf.d
 %define                _sysconfdir     %(%{apxs} -q SYSCONFDIR 2>/dev/null)
 
 %description
@@ -35,17 +36,18 @@ użyciem protokołu NTLM).
 %prep
 %setup -q -n mod_%{mod_name}2-%{version}
 #%patch -p1
+%patch1 -p0
 
 %build
 %{__make} APXS=%{apxs}
 
 %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}
 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
@@ -60,5 +62,5 @@ fi
 
 %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