OpenPKG Specs / changeset

     1.1 --- a/davical/davical.patch	Thu Sep 15 19:31:49 2011 +0200
     1.2 +++ b/davical/davical.patch	Thu Sep 15 19:34:00 2011 +0200
     1.3 @@ -1,6 +1,6 @@
     1.4 -Index: davical-0.9.9.3/dba/appuser_permissions.txt
     1.5 ---- davical-0.9.9.3/dba/appuser_permissions.txt.orig	2010-04-19 02:32:58.000000000 +0200
     1.6 -+++ davical-0.9.9.3/dba/appuser_permissions.txt	2010-09-21 17:32:46.000000000 +0200
     1.7 +Index: davical-0.9.9.5/dba/appuser_permissions.txt
     1.8 +--- davical-0.9.9.5/dba/appuser_permissions.txt.orig	2010-04-19 02:32:58.000000000 +0200
     1.9 ++++ davical-0.9.9.5/dba/appuser_permissions.txt	2010-09-21 17:32:46.000000000 +0200
    1.10  @@ -1,65 +1,69 @@
    1.11  -#
    1.12  -# This file is used by update-rscds-database to set the correct
    1.13 @@ -126,10 +126,10 @@
    1.14  +     principal_type
    1.15  +  TO davical;
    1.16   
    1.17 -Index: davical-0.9.9.3/inc/always.php.in
    1.18 ---- davical-0.9.9.3/inc/always.php.in.orig	2010-09-21 03:40:44.000000000 +0200
    1.19 -+++ davical-0.9.9.3/inc/always.php.in	2010-09-21 18:20:41.000000000 +0200
    1.20 -@@ -117,20 +117,8 @@
    1.21 +Index: davical-0.9.9.5/inc/always.php.in
    1.22 +--- davical-0.9.9.5/inc/always.php.in.orig	2010-09-21 03:40:44.000000000 +0200
    1.23 ++++ davical-0.9.9.5/inc/always.php.in	2010-09-21 18:20:41.000000000 +0200
    1.24 +@@ -123,20 +123,8 @@
    1.25   * too early.
    1.26   */
    1.27   ob_start( );
    1.28 @@ -152,9 +152,9 @@
    1.29   }
    1.30   else if ( @file_exists('config/config.php') ) {
    1.31     include('config/config.php');
    1.32 -Index: davical-0.9.9.3/dba/views/dav_principal.sql
    1.33 ---- davical-0.9.9.3/dba/views/dav_principal.sql.orig	2010-02-23 11:29:07.000000000 +0100
    1.34 -+++ davical-0.9.9.3/dba/views/dav_principal.sql	2010-11-22 14:33:59.832463699 +0100
    1.35 +Index: davical-0.9.9.5/dba/views/dav_principal.sql
    1.36 +--- davical-0.9.9.5/dba/views/dav_principal.sql.orig	2010-02-23 11:29:07.000000000 +0100
    1.37 ++++ davical-0.9.9.5/dba/views/dav_principal.sql	2010-11-22 14:33:59.832463699 +0100
    1.38  @@ -2,7 +2,7 @@
    1.39   -- record 1:1 with the principal table
    1.40   

     2.1 --- a/davical/davical.spec	Thu Sep 15 19:31:49 2011 +0200
     2.2 +++ b/davical/davical.spec	Thu Sep 15 19:34:00 2011 +0200
     2.3 @@ -22,9 +22,9 @@
     2.4  ##
     2.5  
     2.6  #   package version
     2.7 -%define       V_opkg    0.9.9.3
     2.8 -%define       V_davical 0.9.9.3
     2.9 -%define       V_awl     0.45
    2.10 +%define       V_opkg    0.9.9.5
    2.11 +%define       V_davical 0.9.9.5
    2.12 +%define       V_awl     0.47
    2.13  
    2.14  #   package information
    2.15  Name:         davical
    2.16 @@ -37,7 +37,7 @@
    2.17  Group:        Network
    2.18  License:      GPL
    2.19  Version:      %{V_opkg}
    2.20 -Release:      20101124
    2.21 +Release:      20110915
    2.22  
    2.23  #   package options
    2.24  %define       with_ssl  no
    2.25 @@ -65,8 +65,12 @@
    2.26  PreReq:       apache-php::with_pgsql = yes
    2.27  PreReq:       apache-php::with_gettext = yes
    2.28  PreReq:       apache-php::with_iconv = yes
    2.29 +PreReq:       yaml, yaml::with_perl = yes
    2.30 +PreReq:       perl-dbi
    2.31  PreReq:       postgresql
    2.32  PreReq:       apg
    2.33 +AutoReq:      no
    2.34 +AutoReqProv:  no
    2.35  
    2.36  %description
    2.37      The DAViCal CalDAV Server is a repository for calendar, schedule,
    2.38 @@ -89,11 +93,17 @@
    2.39      %setup -q -c
    2.40      %setup -q -T -D -a 1
    2.41      %patch -p0
    2.42 +    %{l_shtool} subst \
    2.43 +        -e 's;../awl/VERSION;../awl-%{V_awl}/VERSION;' \
    2.44 +        davical-%{V_davical}/scripts/build-always.sh
    2.45  
    2.46  %build
    2.47      cd davical-%{V_davical} && %{l_make} %{l_mflags} htdocs/always.php
    2.48  
    2.49  %install
    2.50 +    #   remove build cruft
    2.51 +    rm -rf $RPM_BUILD_ROOT
    2.52 +
    2.53      #   create installation hierarchy
    2.54      %{l_shtool} mkdir -f -p -m 755 \
    2.55          $RPM_BUILD_ROOT%{l_prefix}/sbin \
    2.56 @@ -111,7 +121,6 @@
    2.57          awl-%{V_awl}/dba \
    2.58          awl-%{V_awl}/inc \
    2.59          $RPM_BUILD_ROOT%{l_prefix}/lib/davical/awl/
    2.60 -    rm -f davical-%{V_davical}/inc/always.php.in
    2.61      %{l_shtool} subst %{l_value -s -a} \
    2.62          davical-%{V_davical}/htdocs/always.php
    2.63      cp -r \
    2.64 @@ -146,6 +155,10 @@
    2.65          %{SOURCE davical-setup.sh} \
    2.66          $RPM_BUILD_ROOT%{l_prefix}/sbin/davical-setup
    2.67  
    2.68 +    #   remove intermediate headers and other unused files
    2.69 +    rm -f $RPM_BUILD_ROOT%{l_prefix}/lib/davical/awl/inc/*.in
    2.70 +    rm -f $RPM_BUILD_ROOT%{l_prefix}/lib/davical/davical/inc/*.in
    2.71 +
    2.72      #   determine installation files
    2.73      %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
    2.74          %{l_files_std} \