- fix config dir

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

diff --git a/apache-mod_auth_shadow.spec b/apache-mod_auth_shadow.spec
index c122397bfd318aadbf436a6b4c0b7f6c19a06e18..f97d53ca86df319fb0338ed34de0733b54563f17 100644 (file)
--- a/apache-mod_auth_shadow.spec
+++ b/apache-mod_auth_shadow.spec
@@ -1,14 +1,14 @@
 %define                mod_name        auth_shadow
 %define        apxs            /usr/sbin/apxs
 Summary:       Apache module: authenticating against a /etc/shadow file
-Summary(pl.UTF-8):   Moduł do apache: autoryzacja przez plik /etc/shadow
+Summary(pl.UTF-8):     Moduł do apache: autoryzacja przez plik /etc/shadow
 Name:          apache-mod_%{mod_name}
-Version:       2.1
+Version:       2.3
 Release:       0.1
 License:       GPL
-Group:         Networking/Daemons
+Group:         Networking/Daemons/HTTP
 Source0:       http://dl.sourceforge.net/mod-auth-shadow/mod_auth_shadow-%{version}.tar.gz
-# Source0-md5: 564f11a9d19ea546673644fdacb928e7
+# Source0-md5: 3a7c4e053edd148a18d1eeee54cb73f7
 Patch0:                %{name}-make.patch
 URL:           http://mod-auth-shadow.sourceforge.net/
 BuildRequires: %{apxs}
@@ -19,7 +19,7 @@ Obsoletes:    apache-mod_auth-shadow
 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
 mod_auth_shadow is an Apache module for authenticating users via an
@@ -50,7 +50,7 @@ właściwe sprawdzanie hasła. W przypadku błędu validate zapisuje
 komunikat do loga systemowego i czeka trzy sekundy przed zakończeniem.
 
 %prep
-%setup -q -n mod_%{mod_name}-%{version}
+%setup -q -n mod_%{mod_name}_%{version}
 %patch0 -p1
 
 %build
@@ -61,12 +61,13 @@ komunikat do loga systemowego i czeka trzy sekundy przed zakończeniem.
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_sbindir},%{_sysconfdir}/httpd.conf}
+install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_sbindir},%{_sysconfdir}}
 
-install .libs/mod_%{mod_name}.so $RPM_BUILD_ROOT%{_pkglibdir}
-install validate $RPM_BUILD_ROOT%{_sbindir}
+install -p .libs/mod_%{mod_name}.so $RPM_BUILD_ROOT%{_pkglibdir}
+# XXX: too generic name
+install -p validate $RPM_BUILD_ROOT%{_sbindir}
 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
@@ -82,6 +83,6 @@ fi
 %files
 %defattr(644,root,root,755)
 %doc CHANGES INSTALL README
-%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
 %attr(4755,root,root) %{_sbindir}/validate