SPECS: apache-mod_vhs.spec - unified

[glen]

Author: glen                         Date: Tue Dec 27 01:17:46 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- unified

---- Files affected:
SPECS:
   apache-mod_vhs.spec (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: SPECS/apache-mod_vhs.spec
diff -u SPECS/apache-mod_vhs.spec:1.2 SPECS/apache-mod_vhs.spec:1.3
--- SPECS/apache-mod_vhs.spec:1.2	Wed Nov  2 23:55:03 2005
+++ SPECS/apache-mod_vhs.spec	Tue Dec 27 02:17:41 2005
@@ -1,4 +1,6 @@
 # $Revision$, $Date$
+# TODO
+# - fix build with apache 2.2 (regex_t)
 %define		mod_name	vhs
 %define 	apxs		/usr/sbin/apxs
 Summary:	Apache module: Virtual Hosting
@@ -14,11 +16,11 @@
 BuildRequires:	apache-devel >= 2.0.0
 BuildRequires:	%{apxs}
 BuildRequires:	libhome-devel
-Requires(post,preun):	%{apxs}
-Requires:	apache >= 2.0.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
 mod_vhs is an Apache 2.0 Web Server module allowing mass virtual
@@ -40,8 +42,11 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_sysconfdir}/httpd.conf}
 
-install -D .libs/mod_%{mod_name}.so $RPM_BUILD_ROOT%{_pkglibdir}/mod_%{mod_name}.so
+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
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -53,7 +58,6 @@
 
 %preun
 if [ "$1" = "0" ]; then
-	umask 027
 	if [ -f /var/lock/subsys/httpd ]; then
 		/etc/rc.d/init.d/httpd restart 1>&2
 	fi
@@ -62,7 +66,8 @@
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog README* THANKS TODO WARNING*
-%attr(755,root,root) %{_pkglibdir}/*
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf/*_mod_%{mod_name}.conf
+%attr(755,root,root) %{_pkglibdir}/*.so
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -70,9 +75,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.3  2005/12/27 01:17:41  glen
+- unified
+
 Revision 1.2  2005/11/02 22:55:03  zbyniu
 - up to 1.0.26
 
 Revision 1.1  2005/06/20 13:12:30  zbyniu
 - init
-
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/apache-mod_vhs.spec?r1=1.2&r2=1.3&f=u