X-Git-Url: http://git.pld-linux.org/?p=packages%2Fapache-mod_authnz_external.git;a=blobdiff_plain;f=apache-mod_authnz_external.spec;h=edf86b30fb3e5f1fdace146d1b46f6f396da7456;hp=c619f426b24009fce529cc5cb5e5c6aee18f52ac;hb=d6753accc31fe5715597ee81543b58e244a7c3ee;hpb=01275bf7409a8c74722b88dd54f0cabe76d5587e

diff --git a/apache-mod_authnz_external.spec b/apache-mod_authnz_external.spec
index c619f42..edf86b3 100644
--- a/apache-mod_authnz_external.spec
+++ b/apache-mod_authnz_external.spec
@@ -1,5 +1,5 @@
-%define	mod_name	authnz_external
-%define apxs		/usr/sbin/apxs
+%define		mod_name	authnz_external
+%define		apxs		/usr/sbin/apxs
 Summary:	Basic authentication for the Apache Web server using arbitrary shell commands
 Summary(cs.UTF-8):	Základní autentizace pro WWW server Apache pomocí shellových příkazů
 Summary(da.UTF-8):	En autenticeringsmodul for webtjeneren Apache hvor man kan bruge vilkårlige skal-kommandoer
@@ -12,21 +12,22 @@ Summary(pt.UTF-8):	Um módulo de autenticação de LDAP para o servidor Web Apac
 Summary(sl.UTF-8):	Osnovna avtentikacija za spletni strežnik Apache, z uporabo poljubnih lupinskih ukazov
 Summary(sv.UTF-8):	Grundläggande autentisering för webbservern Apache med valfria skalkommandon
 Name:		apache-mod_%{mod_name}
-Version:	3.1.0
+Version:	3.3.1
 Release:	1
 License:	BSD
-Group:		Networking/Daemons
-Source0:	http://unixpapa.com/software/mod_%{mod_name}-%{version}.tar.gz
-# Source0-md5:	5051bffe6a3992336f4a9f84430a58d2
-URL:		http://unixpapa.com/mod_auth_external.html
-BuildRequires:	apache-apxs >= 2.0
+Group:		Networking/Daemons/HTTP
+Source0:	http://mod-auth-external.googlecode.com/files/mod_%{mod_name}-%{version}.tar.gz
+# Source0-md5:	4cb3f16ff85b62fbc2cc73bac406bb67
+Patch0:		mod_authnz_external-apache24.patch
+URL:		http://code.google.com/p/mod-auth-external/
+BuildRequires:	%{apxs}
 BuildRequires:	apache-devel >= 2.2
 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)
+%define		_sysconfdir	%(%{apxs} -q SYSCONFDIR 2>/dev/null)/conf.d
 
 %description
 This module allows you to use any command line program to authenticate
@@ -73,17 +74,18 @@ från ett godtyckligt angivet kommando.
 
 %prep
 %setup -q -n mod_%{mod_name}-%{version}
+%patch0 -p1
 
 %build
 %{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}
+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
@@ -98,6 +100,6 @@ fi
 
 %files
 %defattr(644,root,root,755)
-%doc TODO AUTHENTICATORS CHANGES README INSTALL test mysql
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf/*_mod_%{mod_name}.conf
+%doc TODO AUTHENTICATORS CHANGES README INSTALL test
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/*_mod_%{mod_name}.conf
 %attr(755,root,root) %{_pkglibdir}/*.so