OpenPKG Specs / changeset

     1.1 --- a/davical/davical-apache.conf	Tue Aug 28 18:37:35 2012 +0200
     1.2 +++ b/davical/davical-apache.conf	Tue Aug 28 18:42:10 2012 +0200
     1.3 @@ -81,11 +81,12 @@
     1.4  #   configure DAViCal
     1.5  php_value         include_path            @l_prefix@/lib/davical/davical/inc:@l_prefix@/lib/davical/davical/htdocs:@l_prefix@/lib/davical/awl/inc
     1.6  php_value         error_reporting         "E_ALL&~E_NOTICE"
     1.7 +php_value         display_errors          "1"
     1.8  php_value         default_charset         "utf-8"
     1.9  RewriteEngine     on
    1.10  RewriteRule       ^/caldav/(.*)$          /caldav.php/$1 [PT]
    1.11 +DirectoryIndex    index.php
    1.12  DocumentRoot      @l_prefix@/lib/davical/davical/htdocs
    1.13 -DirectoryIndex    index.php
    1.14  <Directory        @l_prefix@/lib/davical/davical/htdocs>
    1.15      <IfDefine SSL>
    1.16          SSLOptions +StdEnvVars

     2.1 --- a/davical/davical.patch	Tue Aug 28 18:37:35 2012 +0200
     2.2 +++ b/davical/davical.patch	Tue Aug 28 18:42:10 2012 +0200
     2.3 @@ -1,6 +1,6 @@
     2.4 -Index: davical-0.9.9.7/dba/appuser_permissions.txt
     2.5 ---- davical-0.9.9.7/dba/appuser_permissions.txt.orig	2011-10-06 11:14:54.000000000 +0200
     2.6 -+++ davical-0.9.9.7/dba/appuser_permissions.txt	2011-10-25 09:45:26.000000000 +0200
     2.7 +Index: davical-1.1.1/dba/appuser_permissions.txt
     2.8 +--- davical-1.1.1/dba/appuser_permissions.txt.orig	2011-10-06 11:14:54.000000000 +0200
     2.9 ++++ davical-1.1.1/dba/appuser_permissions.txt	2011-10-25 09:45:26.000000000 +0200
    2.10  @@ -1,66 +1,69 @@
    2.11  -#
    2.12  -# This file is used by update-rscds-database to set the correct
    2.13 @@ -129,9 +129,9 @@
    2.14  +     principal_type
    2.15  +  TO davical;
    2.16   
    2.17 -Index: davical-0.9.9.7/dba/views/dav_principal.sql
    2.18 ---- davical-0.9.9.7/dba/views/dav_principal.sql.orig	2010-02-23 11:29:07.000000000 +0100
    2.19 -+++ davical-0.9.9.7/dba/views/dav_principal.sql	2011-10-25 09:38:48.000000000 +0200
    2.20 +Index: davical-1.1.1/dba/views/dav_principal.sql
    2.21 +--- davical-1.1.1/dba/views/dav_principal.sql.orig	2010-02-23 11:29:07.000000000 +0100
    2.22 ++++ davical-1.1.1/dba/views/dav_principal.sql	2011-10-25 09:38:48.000000000 +0200
    2.23  @@ -2,7 +2,6 @@
    2.24   -- record 1:1 with the principal table
    2.25   
    2.26 @@ -140,9 +140,9 @@
    2.27   CREATE OR REPLACE VIEW dav_principal AS
    2.28     SELECT user_no, usr.active AS user_active, joined AS created, updated AS modified,
    2.29            username, password, fullname, email,
    2.30 -Index: davical-0.9.9.7/inc/always.php.in
    2.31 ---- davical-0.9.9.7/inc/always.php.in.orig	2011-09-25 11:04:29.000000000 +0200
    2.32 -+++ davical-0.9.9.7/inc/always.php.in	2011-10-25 09:38:48.000000000 +0200
    2.33 +Index: davical-1.1.1/inc/always.php.in
    2.34 +--- davical-1.1.1/inc/always.php.in.orig	2011-09-25 11:04:29.000000000 +0200
    2.35 ++++ davical-1.1.1/inc/always.php.in	2011-10-25 09:38:48.000000000 +0200
    2.36  @@ -58,6 +58,7 @@
    2.37   $c->images      = $c->base_url . '/images';
    2.38   

     3.1 --- a/davical/davical.spec	Tue Aug 28 18:37:35 2012 +0200
     3.2 +++ b/davical/davical.spec	Tue Aug 28 18:42:10 2012 +0200
     3.3 @@ -22,9 +22,9 @@
     3.4  ##
     3.5  
     3.6  #   package version
     3.7 -%define       V_opkg    0.9.9.7
     3.8 -%define       V_davical 0.9.9.7
     3.9 -%define       V_awl     0.49
    3.10 +%define       V_opkg    1.1.1
    3.11 +%define       V_davical 1.1.1
    3.12 +%define       V_awl     0.53
    3.13  
    3.14  #   package information
    3.15  Name:         davical
    3.16 @@ -37,7 +37,7 @@
    3.17  Group:        Network
    3.18  License:      GPL
    3.19  Version:      %{V_opkg}
    3.20 -Release:      20111130
    3.21 +Release:      20120800
    3.22  
    3.23  #   package options
    3.24  %define       with_ssl  no
    3.25 @@ -52,12 +52,10 @@
    3.26  Patch0:       davical.patch
    3.27  
    3.28  #   build information
    3.29 -Prefix:       %{l_prefix}
    3.30 -BuildRoot:    %{l_buildroot}
    3.31 -BuildPreReq:  OpenPKG, openpkg >= 20060823
    3.32 -PreReq:       OpenPKG, openpkg >= 20060823
    3.33 +BuildPreReq:  OpenPKG, openpkg >= 20100101
    3.34 +PreReq:       OpenPKG, openpkg >= 20100101
    3.35  PreReq:       pcre, pcre::with_utf8
    3.36 -PreReq:       apache
    3.37 +PreReq:       apache, apg
    3.38  %if "%{with_ssl}" == "yes"
    3.39  PreReq:       apache::with_mod_ssl = yes, x509
    3.40  %endif
    3.41 @@ -67,15 +65,16 @@
    3.42  PreReq:       apache-php::with_iconv = yes
    3.43  PreReq:       yaml, yaml::with_perl = yes
    3.44  PreReq:       perl-dbi
    3.45 +PreReq:       perl-dbi::with_pgsql = yes
    3.46  PreReq:       postgresql
    3.47 -PreReq:       apg
    3.48 -AutoReq:      no
    3.49 -AutoReqProv:  no
    3.50  
    3.51  %description
    3.52      The DAViCal CalDAV Server is a repository for calendar, schedule,
    3.53 -    todo and journal entries which may be accessed with CalDAV capable
    3.54 -    client software.
    3.55 +    todo, and journal entries. Its design allows for trivial storage of
    3.56 +    CalDAV calendars from clients such as Evolution, Sunbird/Lightning,
    3.57 +    Mulberry, iCal, iPhone, or SOHO Organizer. Calendar data is stored
    3.58 +    in a central location providing shared calendars, free/busy
    3.59 +    publication and a basic administration interface.
    3.60  
    3.61  %track
    3.62      prog davical:davical = {
    3.63 @@ -100,14 +99,13 @@
    3.64  %build
    3.65      ln -s awl-%{V_awl} awl
    3.66      ( cd davical-%{V_davical}
    3.67 -      %{l_shtool} subst %{l_value -s -a} inc/always.php.in
    3.68 +      %{l_shtool} subst %{l_value -s -a} \
    3.69 +          inc/always.php.in \
    3.70 +          htdocs/always.php
    3.71        %{l_make} %{l_mflags} htdocs/always.php
    3.72      ) || exit $?
    3.73  
    3.74  %install
    3.75 -    #   remove build cruft
    3.76 -    rm -rf $RPM_BUILD_ROOT
    3.77 -
    3.78      #   create installation hierarchy
    3.79      %{l_shtool} mkdir -f -p -m 755 \
    3.80          $RPM_BUILD_ROOT%{l_prefix}/sbin \
    3.81 @@ -121,12 +119,13 @@
    3.82  
    3.83      #   install program components
    3.84      find . -name "*.orig" -print | xargs rm -f
    3.85 +# MSvB: Needed?
    3.86 +#    %{l_shtool} subst %{l_value -s -a} \
    3.87 +#        davical-%{V_davical}/htdocs/always.php
    3.88      cp -r \
    3.89          awl-%{V_awl}/dba \
    3.90          awl-%{V_awl}/inc \
    3.91          $RPM_BUILD_ROOT%{l_prefix}/lib/davical/awl/
    3.92 -    %{l_shtool} subst %{l_value -s -a} \
    3.93 -        davical-%{V_davical}/htdocs/always.php
    3.94      cp -r \
    3.95          davical-%{V_davical}/dba \
    3.96          davical-%{V_davical}/inc \
    3.97 @@ -147,7 +146,7 @@
    3.98          %{SOURCE davical-apache.conf} \
    3.99          $RPM_BUILD_ROOT%{l_prefix}/etc/davical/
   3.100  
   3.101 -    #   install run-command script
   3.102 +    #   install runcommand script
   3.103  %if "%{with_ssl}" == "yes"
   3.104      with_ssl="-DSSL"
   3.105  %else
   3.106 @@ -182,7 +181,6 @@
   3.107  %files -f files
   3.108  
   3.109  %clean
   3.110 -    rm -rf $RPM_BUILD_ROOT
   3.111  
   3.112  %post
   3.113      if [ $1 -eq 1 ]; then