SPECS: apache-mod_auth_kerb.spec - unified

[glen]

Author: glen                         Date: Mon Dec 26 18:29:57 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- unified

---- Files affected:
SPECS:
   apache-mod_auth_kerb.spec (1.4 -> 1.5) 

---- Diffs:

================================================================
Index: SPECS/apache-mod_auth_kerb.spec
diff -u SPECS/apache-mod_auth_kerb.spec:1.4 SPECS/apache-mod_auth_kerb.spec:1.5
--- SPECS/apache-mod_auth_kerb.spec:1.4	Mon Aug  8 23:59:56 2005
+++ SPECS/apache-mod_auth_kerb.spec	Mon Dec 26 19:29:52 2005
@@ -13,16 +13,18 @@
 Source0:	http://dl.sourceforge.net/modauthkerb/mod_%{mod_name}-%{version}-%{pre}.tar.gz
 # Source0-md5:	274edfb950af20ce6ef0ddcb7c20263a
 Source1:	%{name}.conf
-Patch1:     	%{name}-aprfix.patch
+Patch1:		%{name}-aprfix.patch
 URL:		http://modauthkerb.sourceforge.net/
 BuildRequires:	%{apxs}
 BuildRequires:	apache-devel
 BuildRequires:	gdbm-devel
 BuildRequires:	heimdal-devel
-Requires(post,preun):	%{apxs}
+BuildRequires:	sed >= 4.0
+Requires:	apache(modules-api) = %apache_modules_api
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%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
@@ -38,17 +40,15 @@
 
 %build
 %configure
-
-sed -i 's/-pthread/-lpthread/' Makefile
-
+%{__sed} -i -e 's/-pthread/-lpthread/' Makefile
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_sysconfdir}/httpd/httpd.conf}
+install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_sysconfdir}/httpd.conf}
 
 install src/.libs/mod_%{mod_name}.so $RPM_BUILD_ROOT%{_pkglibdir}
-install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/httpd.conf/20_%{mod_name}.conf
+install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf/20_mod_%{mod_name}.conf
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -68,8 +68,8 @@
 %files
 %defattr(644,root,root,755)
 %doc README
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf/*_mod_%{mod_name}.conf
 %attr(755,root,root) %{_pkglibdir}/*
-%{_sysconfdir}/httpd/httpd.conf/20_%{mod_name}.conf
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -77,6 +77,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.5  2005/12/26 18:29:52  glen
+- unified
+
 Revision 1.4  2005/08/08 21:59:56  areq
 - s/-pthread/-lpthread/
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/apache-mod_auth_kerb.spec?r1=1.4&r2=1.5&f=u