diff -r 41738a0e98d1 -r 610cba0674b9 davical/davical.spec
--- a/davical/davical.spec	Tue Nov 29 18:44:37 2011 +0100
+++ b/davical/davical.spec	Thu Dec 01 13:24:24 2011 +0100
@@ -22,9 +22,9 @@
 ##
 
 #   package version
-%define       V_opkg    0.9.9.5
-%define       V_davical 0.9.9.5
-%define       V_awl     0.47
+%define       V_opkg    0.9.9.7
+%define       V_davical 0.9.9.7
+%define       V_awl     0.49
 
 #   package information
 Name:         davical
@@ -37,7 +37,7 @@
 Group:        Network
 License:      GPL
 Version:      %{V_opkg}
-Release:      20110915
+Release:      20111130
 
 #   package options
 %define       with_ssl  no
@@ -86,7 +86,7 @@
     prog davical:awl = {
         version   = %{V_awl}
         url       = http://debian.mcmillan.net.nz/packages/awl/
-        regex     = awl_(__VER__)\.tar\.gz
+        regex     = awl-(__VER__)\.tar\.gz
     }
 
 %prep
@@ -98,7 +98,11 @@
         davical-%{V_davical}/scripts/build-always.sh
 
 %build
-    cd davical-%{V_davical} && %{l_make} %{l_mflags} htdocs/always.php
+    ln -s awl-%{V_awl} awl
+    ( cd davical-%{V_davical}
+      %{l_shtool} subst %{l_value -s -a} inc/always.php.in
+      %{l_make} %{l_mflags} htdocs/always.php
+    ) || exit $?
 
 %install
     #   remove build cruft
@@ -135,7 +139,11 @@
         $RPM_BUILD_ROOT%{l_prefix}/etc/davical/
 
     #   install DAViCal Apache configuration file
+    l_hostname=`%{l_shtool} echo -e %h`
+    l_domainname=`%{l_shtool} echo -e %d | cut -c2-`
     %{l_shtool} install -c -m 644 %{l_value -s -a} \
+        -e "s;@l_hostname@;$l_hostname;g" \
+        -e "s;@l_domainname@;$l_domainname;g" \
         %{SOURCE davical-apache.conf} \
         $RPM_BUILD_ROOT%{l_prefix}/etc/davical/
 
@@ -162,7 +170,12 @@
     #   determine installation files
     %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
         %{l_files_std} \
-        '%config %{l_prefix}/etc/davical/*' \
+        '%config %attr(-,%{l_rusr},%{l_rgrp}) %{l_prefix}/etc/davical/*' \
+        '%attr(-,%{l_rusr},%{l_rgrp}) %{l_prefix}/lib/davical/*' \
+        '%attr(-,%{l_rusr},%{l_rgrp}) %{l_prefix}/lib/davical/*/*' \
+        '%attr(-,%{l_rusr},%{l_rgrp}) %{l_prefix}/lib/davical/*/*/*' \
+        '%attr(-,%{l_rusr},%{l_rgrp}) %{l_prefix}/lib/davical/*/*/*/*' \
+        '%attr(-,%{l_rusr},%{l_rgrp}) %{l_prefix}/lib/davical/*/*/*/*/*' \
         '%attr(-,%{l_rusr},%{l_rgrp}) %{l_prefix}/var/davical' \
         '%attr(-,%{l_rusr},%{l_rgrp}) %{l_prefix}/var/davical/*'
 
@@ -179,9 +192,15 @@
           echo "     \$ $RPM_INSTALL_PREFIX/bin/openpkg rc postgresql start"
           echo "     \$ $RPM_INSTALL_PREFIX/sbin/davical-setup install"
           echo ""
+%if "%{with_ssl}" == "yes"
           echo "2. By default, DAViCal runs its own SSL/TLS based Apache server"
           echo "   under 127.0.0.1, TCP port 8443. Please change this by editing"
           echo "   the \"Listen 127.0.0.1:8443\" directive in:"
+%else
+          echo "2. By default, DAViCal runs its own Apache server"
+          echo "   under 127.0.0.1, TCP port 8080. Please change this by editing"
+          echo "   the \"Listen 127.0.0.1:8080\" directive in:"
+%endif
           echo "     $RPM_INSTALL_PREFIX/etc/davical/davical-apache.conf"
           echo ""
           echo "3. Now start DAViCal by running the command"