more packaging fixes

davical/davical-apache.conf

@@ -79,13 +79,14 @@ php_admin_flag    register_globals        on
 php_admin_flag    register_argc_argv      off
 
 #   configure DAViCal
-php_value         include_path            @l_prefix@/lib/davical/davical/inc:@l_prefix@/lib/davical/awl/inc
-php_value         error_reporting         "E_ALL & ~E_NOTICE"
+php_value         include_path            @l_prefix@/lib/davical/davical/inc:@l_prefix@/lib/davical/davical/htdocs:@l_prefix@/lib/davical/awl/inc
+php_value         error_reporting         "E_ALL&~E_NOTICE"
+php_value         display_errors          "1"
 php_value         default_charset         "utf-8"
 RewriteEngine     on
 RewriteRule       ^/caldav/(.*)$          /caldav.php/$1 [PT]
-DocumentRoot      @l_prefix@/lib/davical/davical/htdocs
 DirectoryIndex    index.php
+DocumentRoot      @l_prefix@/lib/davical/davical/htdocs
 <Directory        @l_prefix@/lib/davical/davical/htdocs>
     <IfDefine SSL>
         SSLOptions +StdEnvVars

davical/davical.patch

@@ -1,6 +1,6 @@
 Index: davical-0.9.9.4/dba/appuser_permissions.txt
 --- davical-0.9.9.4/dba/appuser_permissions.txt.orig	2010-04-19 02:32:58.000000000 +0200
-+++ davical-0.9.9.4/dba/appuser_permissions.txt	2011-01-08 19:36:07.000000000 +0100
++++ davical-0.9.9.4/dba/appuser_permissions.txt	2011-01-08 20:31:06.000000000 +0100
 @@ -1,65 +1,69 @@
 -#
 -# This file is used by update-rscds-database to set the correct
@@ -128,7 +128,7 @@ Index: davical-0.9.9.4/dba/appuser_permissions.txt
  
 Index: davical-0.9.9.4/dba/views/dav_principal.sql
 --- davical-0.9.9.4/dba/views/dav_principal.sql.orig	2010-02-23 11:29:07.000000000 +0100
-+++ davical-0.9.9.4/dba/views/dav_principal.sql	2011-01-08 19:36:31.000000000 +0100
++++ davical-0.9.9.4/dba/views/dav_principal.sql	2011-01-08 20:31:06.000000000 +0100
 @@ -2,7 +2,6 @@
  -- record 1:1 with the principal table
  
@@ -139,8 +139,16 @@ Index: davical-0.9.9.4/dba/views/dav_principal.sql
           username, password, fullname, email,
 Index: davical-0.9.9.4/inc/always.php.in
 --- davical-0.9.9.4/inc/always.php.in.orig	2010-12-24 09:52:35.000000000 +0100
-+++ davical-0.9.9.4/inc/always.php.in	2011-01-08 19:36:07.000000000 +0100
-@@ -119,20 +119,8 @@
++++ davical-0.9.9.4/inc/always.php.in	2011-01-08 20:31:18.000000000 +0100
+@@ -55,6 +55,7 @@
+ $c->images      = $c->base_url . '/images';
+ 
+ // Add a default for newly created users
++date_default_timezone_set("UTC");
+ $c->template_usr = array( 'active' => true,
+                           'locale' => 'en_GB',
+                           'date_format_type' => 'E',
+@@ -119,20 +120,8 @@
  * too early.
  */
  ob_start( );

davical/davical.spec

@@ -24,7 +24,7 @@
 #   package version
 %define       V_opkg    0.9.9.4
 %define       V_davical 0.9.9.4
-%define       V_awl     0.37
+%define       V_awl     0.46
 
 #   package information
 Name:         davical
@@ -44,7 +44,7 @@ Release:      20110108
 
 #   list of sources
 Source0:      http://debian.mcmillan.net.nz/packages/davical/davical-%{V_davical}.tar.gz
-Source1:      http://debian.mcmillan.net.nz/packages/awl/awl_%{V_awl}.tar.gz
+Source1:      http://debian.mcmillan.net.nz/packages/awl/awl-%{V_awl}.tar.gz
 Source2:      davical-config.php
 Source3:      davical-apache.conf
 Source4:      davical-setup.sh
@@ -78,7 +78,7 @@ PreReq:       postgresql
     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
@@ -150,7 +150,12 @@ PreReq:       postgresql
     #   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/*'