diff -r 3d058537a9dd -r 2dd48c9debd6 davical/davical.spec
--- a/davical/davical.spec	Tue Aug 28 18:37:35 2012 +0200
+++ b/davical/davical.spec	Tue Aug 28 18:42:10 2012 +0200
@@ -22,9 +22,9 @@
 ##
 
 #   package version
-%define       V_opkg    0.9.9.7
-%define       V_davical 0.9.9.7
-%define       V_awl     0.49
+%define       V_opkg    1.1.1
+%define       V_davical 1.1.1
+%define       V_awl     0.53
 
 #   package information
 Name:         davical
@@ -37,7 +37,7 @@
 Group:        Network
 License:      GPL
 Version:      %{V_opkg}
-Release:      20111130
+Release:      20120800
 
 #   package options
 %define       with_ssl  no
@@ -52,12 +52,10 @@
 Patch0:       davical.patch
 
 #   build information
-Prefix:       %{l_prefix}
-BuildRoot:    %{l_buildroot}
-BuildPreReq:  OpenPKG, openpkg >= 20060823
-PreReq:       OpenPKG, openpkg >= 20060823
+BuildPreReq:  OpenPKG, openpkg >= 20100101
+PreReq:       OpenPKG, openpkg >= 20100101
 PreReq:       pcre, pcre::with_utf8
-PreReq:       apache
+PreReq:       apache, apg
 %if "%{with_ssl}" == "yes"
 PreReq:       apache::with_mod_ssl = yes, x509
 %endif
@@ -67,15 +65,16 @@
 PreReq:       apache-php::with_iconv = yes
 PreReq:       yaml, yaml::with_perl = yes
 PreReq:       perl-dbi
+PreReq:       perl-dbi::with_pgsql = yes
 PreReq:       postgresql
-PreReq:       apg
-AutoReq:      no
-AutoReqProv:  no
 
 %description
     The DAViCal CalDAV Server is a repository for calendar, schedule,
-    todo and journal entries which may be accessed with CalDAV capable
-    client software.
+    todo, and journal entries. Its design allows for trivial storage of
+    CalDAV calendars from clients such as Evolution, Sunbird/Lightning,
+    Mulberry, iCal, iPhone, or SOHO Organizer. Calendar data is stored
+    in a central location providing shared calendars, free/busy
+    publication and a basic administration interface.
 
 %track
     prog davical:davical = {
@@ -100,14 +99,13 @@
 %build
     ln -s awl-%{V_awl} awl
     ( cd davical-%{V_davical}
-      %{l_shtool} subst %{l_value -s -a} inc/always.php.in
+      %{l_shtool} subst %{l_value -s -a} \
+          inc/always.php.in \
+          htdocs/always.php
       %{l_make} %{l_mflags} htdocs/always.php
     ) || exit $?
 
 %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 \
@@ -121,12 +119,13 @@
 
     #   install program components
     find . -name "*.orig" -print | xargs rm -f
+# MSvB: Needed?
+#    %{l_shtool} subst %{l_value -s -a} \
+#        davical-%{V_davical}/htdocs/always.php
     cp -r \
         awl-%{V_awl}/dba \
         awl-%{V_awl}/inc \
         $RPM_BUILD_ROOT%{l_prefix}/lib/davical/awl/
-    %{l_shtool} subst %{l_value -s -a} \
-        davical-%{V_davical}/htdocs/always.php
     cp -r \
         davical-%{V_davical}/dba \
         davical-%{V_davical}/inc \
@@ -147,7 +146,7 @@
         %{SOURCE davical-apache.conf} \
         $RPM_BUILD_ROOT%{l_prefix}/etc/davical/
 
-    #   install run-command script
+    #   install runcommand script
 %if "%{with_ssl}" == "yes"
     with_ssl="-DSSL"
 %else
@@ -182,7 +181,6 @@
 %files -f files
 
 %clean
-    rm -rf $RPM_BUILD_ROOT
 
 %post
     if [ $1 -eq 1 ]; then