X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=apache-mod_auth_pam.spec;h=de44ace8dc0cb67d50cc0f34ad8818c749843eff;hb=0ed828a95e4e0051c1319f4f378990eeb0003a02;hp=cefa7cb8ebc9e4c184acf62ed456583e84e6c32a;hpb=63719a24dff88c0ea5c57a4430e5f4e00a594645;p=packages%2Fapache-mod_auth_pam.git

diff --git a/apache-mod_auth_pam.spec b/apache-mod_auth_pam.spec
index cefa7cb..de44ace 100644
--- a/apache-mod_auth_pam.spec
+++ b/apache-mod_auth_pam.spec
@@ -6,7 +6,7 @@ Summary(pl):	Modu
 Summary(pt_BR):	Este módulo provê autenticação PAM para o Apache
 Name:		apache-mod_%{mod_name}
 Version:	2.0
-Release:	4
+Release:	5
 License:	GPL
 Group:		Networking/Daemons
 Source0:	http://pam.sourceforge.net/mod_%{mod_name}/dist/mod_%{mod_name}-%{version}.tar.gz
@@ -15,13 +15,14 @@ Source1:	apache-mod_auth_pam.conf
 Patch0:		%{name}-missing_constant.patch
 URL:		http://pam.sourceforge.net/mod_auth_pam/
 BuildRequires:	%{apxs}
-BuildRequires:	apache-devel >= 2
+BuildRequires:	apache-devel >= 2.0
 BuildRequires:	pam-devel
-Requires:	apache >= 2
+Requires:	apache(modules-api) = %apache_modules_api
+Requires:	apache >= 2.0
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		_sysconfdir	%(%{apxs} -q SYSCONFDIR)
-%define		_pkglibdir	%(%{apxs} -q LIBEXECDIR)
+%define		_pkglibdir	%(%{apxs} -q LIBEXECDIR 2>/dev/null)
+%define		_sysconfdir	%(%{apxs} -q SYSCONFDIR 2>/dev/null)
 
 %description
 This is an authentication module for Apache that allows you to
@@ -39,20 +40,22 @@ Este m
 diretório PAM.
 
 %prep
-%setup -q -n mod_%{mod_name}/apache-2.0
+%setup -q -n mod_%{mod_name}
+cd apache-2.0
 %patch0 -p0
 
 %build
+cd apache-2.0
 %{apxs} -c mod_%{mod_name}2.c	-o mod_%{mod_name}2.la	 -lpam
 %{apxs} -c mod_auth_etc_group.c -o mod_auth_etc_group.la -lpam
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_pkglibdir},/etc/pam.d,%{_sysconfdir}/httpd.conf/}
+install -d $RPM_BUILD_ROOT{%{_pkglibdir},/etc/pam.d,%{_sysconfdir}/httpd.conf}
 
-install .libs/mod_*.so $RPM_BUILD_ROOT%{_pkglibdir}
-install ../samples/httpd- $RPM_BUILD_ROOT/etc/pam.d/httpd
-install %SOURCE1 $RPM_BUILD_ROOT/%{_sysconfdir}/httpd.conf/52_mod_auth_pam.conf
+install apache-2.0/.libs/mod_*.so $RPM_BUILD_ROOT%{_pkglibdir}
+install samples/httpd- $RPM_BUILD_ROOT/etc/pam.d/httpd
+install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf/52_mod_auth_pam.conf
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -71,7 +74,7 @@ fi
 
 %files
 %defattr(644,root,root,755)
-%doc ../doc/{configure,faq}.txt ../samples/dot-htaccess ../README
-%config(noreplace) /etc/pam.d/httpd
-%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/httpd.conf/*_mod_auth_pam.conf
+%doc doc/{configure,faq}.txt samples/dot-htaccess README
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf/*_mod_auth_pam.conf
 %attr(755,root,root) %{_pkglibdir}/*.so
+%config(noreplace) /etc/pam.d/httpd