# HG changeset patch
# User Michael Schloh von Bennewitz <michael@schloh.com>
# Date 1316108040 -7200
# Node ID 45eaa38991fdf5a0d1e3815cdb257e5c1ff2d3b0
# Parent  d3f49ec0c5cdfe271bacd21f4276cf7f80d47e7b
Update and correct to new vendor version and backport RPM boilerplate logic.

diff -r d3f49ec0c5cd -r 45eaa38991fd davical/davical.patch
--- a/davical/davical.patch	Thu Sep 15 19:31:49 2011 +0200
+++ b/davical/davical.patch	Thu Sep 15 19:34:00 2011 +0200
@@ -1,6 +1,6 @@
-Index: davical-0.9.9.3/dba/appuser_permissions.txt
---- davical-0.9.9.3/dba/appuser_permissions.txt.orig	2010-04-19 02:32:58.000000000 +0200
-+++ davical-0.9.9.3/dba/appuser_permissions.txt	2010-09-21 17:32:46.000000000 +0200
+Index: davical-0.9.9.5/dba/appuser_permissions.txt
+--- davical-0.9.9.5/dba/appuser_permissions.txt.orig	2010-04-19 02:32:58.000000000 +0200
++++ davical-0.9.9.5/dba/appuser_permissions.txt	2010-09-21 17:32:46.000000000 +0200
 @@ -1,65 +1,69 @@
 -#
 -# This file is used by update-rscds-database to set the correct
@@ -126,10 +126,10 @@
 +     principal_type
 +  TO davical;
  
-Index: davical-0.9.9.3/inc/always.php.in
---- davical-0.9.9.3/inc/always.php.in.orig	2010-09-21 03:40:44.000000000 +0200
-+++ davical-0.9.9.3/inc/always.php.in	2010-09-21 18:20:41.000000000 +0200
-@@ -117,20 +117,8 @@
+Index: davical-0.9.9.5/inc/always.php.in
+--- davical-0.9.9.5/inc/always.php.in.orig	2010-09-21 03:40:44.000000000 +0200
++++ davical-0.9.9.5/inc/always.php.in	2010-09-21 18:20:41.000000000 +0200
+@@ -123,20 +123,8 @@
  * too early.
  */
  ob_start( );
@@ -152,9 +152,9 @@
  }
  else if ( @file_exists('config/config.php') ) {
    include('config/config.php');
-Index: davical-0.9.9.3/dba/views/dav_principal.sql
---- davical-0.9.9.3/dba/views/dav_principal.sql.orig	2010-02-23 11:29:07.000000000 +0100
-+++ davical-0.9.9.3/dba/views/dav_principal.sql	2010-11-22 14:33:59.832463699 +0100
+Index: davical-0.9.9.5/dba/views/dav_principal.sql
+--- davical-0.9.9.5/dba/views/dav_principal.sql.orig	2010-02-23 11:29:07.000000000 +0100
++++ davical-0.9.9.5/dba/views/dav_principal.sql	2010-11-22 14:33:59.832463699 +0100
 @@ -2,7 +2,7 @@
  -- record 1:1 with the principal table
  
diff -r d3f49ec0c5cd -r 45eaa38991fd davical/davical.spec
--- a/davical/davical.spec	Thu Sep 15 19:31:49 2011 +0200
+++ b/davical/davical.spec	Thu Sep 15 19:34:00 2011 +0200
@@ -22,9 +22,9 @@
 ##
 
 #   package version
-%define       V_opkg    0.9.9.3
-%define       V_davical 0.9.9.3
-%define       V_awl     0.45
+%define       V_opkg    0.9.9.5
+%define       V_davical 0.9.9.5
+%define       V_awl     0.47
 
 #   package information
 Name:         davical
@@ -37,7 +37,7 @@
 Group:        Network
 License:      GPL
 Version:      %{V_opkg}
-Release:      20101124
+Release:      20110915
 
 #   package options
 %define       with_ssl  no
@@ -65,8 +65,12 @@
 PreReq:       apache-php::with_pgsql = yes
 PreReq:       apache-php::with_gettext = yes
 PreReq:       apache-php::with_iconv = yes
+PreReq:       yaml, yaml::with_perl = yes
+PreReq:       perl-dbi
 PreReq:       postgresql
 PreReq:       apg
+AutoReq:      no
+AutoReqProv:  no
 
 %description
     The DAViCal CalDAV Server is a repository for calendar, schedule,
@@ -89,11 +93,17 @@
     %setup -q -c
     %setup -q -T -D -a 1
     %patch -p0
+    %{l_shtool} subst \
+        -e 's;../awl/VERSION;../awl-%{V_awl}/VERSION;' \
+        davical-%{V_davical}/scripts/build-always.sh
 
 %build
     cd davical-%{V_davical} && %{l_make} %{l_mflags} htdocs/always.php
 
 %install
+    #   remove build cruft
+    rm -rf $RPM_BUILD_ROOT
+
     #   create installation hierarchy
     %{l_shtool} mkdir -f -p -m 755 \
         $RPM_BUILD_ROOT%{l_prefix}/sbin \
@@ -111,7 +121,6 @@
         awl-%{V_awl}/dba \
         awl-%{V_awl}/inc \
         $RPM_BUILD_ROOT%{l_prefix}/lib/davical/awl/
-    rm -f davical-%{V_davical}/inc/always.php.in
     %{l_shtool} subst %{l_value -s -a} \
         davical-%{V_davical}/htdocs/always.php
     cp -r \
@@ -146,6 +155,10 @@
         %{SOURCE davical-setup.sh} \
         $RPM_BUILD_ROOT%{l_prefix}/sbin/davical-setup
 
+    #   remove intermediate headers and other unused files
+    rm -f $RPM_BUILD_ROOT%{l_prefix}/lib/davical/awl/inc/*.in
+    rm -f $RPM_BUILD_ROOT%{l_prefix}/lib/davical/davical/inc/*.in
+
     #   determine installation files
     %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
         %{l_files_std} \