- confdir enabled apache1 (no triggers as it wasn't on ftp)

Changed files:
    apache1-mod_xslt.spec -> 1.28

diff --git a/apache1-mod_xslt.spec b/apache1-mod_xslt.spec
index 0fd161ba921d73ac54e0bdbce5a3a9c1893df544..ee704a392c5367753dd72e713495719f77e3f9f1 100644 (file)
--- a/apache1-mod_xslt.spec
+++ b/apache1-mod_xslt.spec
@@ -1,10 +1,14 @@
+# TODO
+# - doesn't build
+# mod_xslt.c:212: warning: passing arg 6 of `SablotRunProcessor' from incompatible pointer type
+# ...
 %define                mod_name        xslt
 %define        apxs            /usr/sbin/apxs1
 Summary:       Module to serve XML based content
 Summary(pl):   Modu³ do udostêpniania dokumentów XML
 Name:          apache1-mod_%{mod_name}
 Version:       1.1
-Release:       1
+Release:       1.1
 License:       GPL
 Group:         Networking/Daemons
 Source0:       http://dl.sourceforge.net/modxslt/mod_%{mod_name}-%{version}.tar.gz
@@ -16,17 +20,17 @@ Patch2:             %{name}-make.patch
 Patch3:                %{name}-module.patch
 URL:           http://modxslt.userworld.com/
 BuildRequires: %{apxs}
-BuildRequires: apache1-devel
+BuildRequires: apache1-devel >= 1.3.33-2
 BuildRequires: sablotron-devel
 Requires(post,preun):  %{apxs}
-Requires:      apache1
+Requires:      apache1 >= 1.3.33-2
 Requires:      expat
 Requires:      sablotron
 Obsoletes:     apache-mod_%{mod_name} <= %{version}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define                _pkglibdir      %(%{apxs} -q LIBEXECDIR)
-%define                _sysconfdir     %(%{apxs} -q SYSCONFDIR)
+%define                _pkglibdir      %(%{apxs} -q LIBEXECDIR 2>/dev/null)
+%define                _sysconfdir     %(%{apxs} -q SYSCONFDIR 2>/dev/null)
 
 %description
 mod_xslt is a simple Apache module to serve XML based content. Data is
@@ -66,23 +70,21 @@ odbywa si
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_sysconfdir}}
+install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_sysconfdir}/conf.d}
 
 install mod_%{mod_name}.so $RPM_BUILD_ROOT%{_pkglibdir}
-install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/mod_xslt.conf
+install %{SOURCE1} $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
@@ -90,5 +92,5 @@ fi
 
 %files
 %defattr(644,root,root,755)
+%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/*_mod_%{mod_name}.conf
 %attr(755,root,root) %{_pkglibdir}/*.so
-%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/*.conf