- confdir enabled apache1

- lang corrections

Changed files:
    apache1-mod_dynvhost.spec -> 1.17

diff --git a/apache1-mod_dynvhost.spec b/apache1-mod_dynvhost.spec
index 06a1fcccbd6a1c1d48847d74339870202ee3cef6..f42c0afaddec6ad5cf0741d2355060b9a7766210 100644 (file)
--- a/apache1-mod_dynvhost.spec
+++ b/apache1-mod_dynvhost.spec
@@ -4,26 +4,27 @@ Summary:      Dynamic Virtual Hosting
 Summary(pl):   Dynamiczne Serwery Wirtualne
 Name:          apache1-mod_%{mod_name}
 Version:       1
-Release:       2
+Release:       2.3
 License:       GPL
 Group:         Networking/Daemons
 Source0:       http://funkcity.com/0101/projects/dynvhost/mod_%{mod_name}.tar.gz
 # Source0-md5: 7608ca6ce5c906bfe960cd0f92bdb6d8
 URL:           http://funkcity.com/0101/
 BuildRequires: %{apxs}
-BuildRequires: apache1-devel
+BuildRequires: apache1-devel >= 1.3.33-2
 BuildRequires: zlib-devel
-Requires(post,preun):  %{apxs}
-Requires:      apache1
+Requires(triggerpostun):       %{apxs}
+Requires:      apache1 >= 1.3.33-2
 Obsoletes:     apache-mod_%{mod_name} <= %{version}
 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
 The "mod_dynvhost" module will create pseudo name based VirtualHosts
 on the fly. All you need is a directory with the fully qualified
-domain name ( FQDN ) of your virtual site and the module will take
+domain name (FQDN) of your virtual site and the module will take
 care of the rest.
 
 %description -l pl
@@ -39,28 +40,36 @@ Modu
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_pkglibdir}
+install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_sysconfdir}/conf.d}
 
 install mod_%{mod_name}.so $RPM_BUILD_ROOT%{_pkglibdir}
 
+echo 'LoadModule %{mod_name}_module    modules/mod_%{mod_name}.so' > \
+       $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/90_mod_%{mod_name}.conf
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
-%{apxs} -e -a -n %{mod_name} %{_pkglibdir}/mod_%{mod_name}.so 1>&2
 if [ -f /var/lock/subsys/apache ]; then
        /etc/rc.d/init.d/apache restart 1>&2
 fi
 
 %preun
 if [ "$1" = "0" ]; then
-       %{apxs} -e -A -n %{mod_name} %{_pkglibdir}/mod_%{mod_name}.so 1>&2
        if [ -f /var/lock/subsys/apache ]; then
                /etc/rc.d/init.d/apache restart 1>&2
        fi
 fi
 
+%triggerpostun -- apache1-mod_%{mod_name} < 1-2.1
+# check that they're not using old apache.conf
+if grep -q '^Include conf\.d' /etc/apache/apache.conf; then
+       %{apxs} -e -A -n %{mod_name} %{_pkglibdir}/mod_%{mod_name}.so 1>&2
+fi
+
 %files
 %defattr(644,root,root,755)
 %doc README ChangeLog
+%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/*_mod_%{mod_name}.conf
 %attr(755,root,root) %{_pkglibdir}/*