1.1 --- a/davical/davical.spec Thu Sep 15 19:31:49 2011 +0200
1.2 +++ b/davical/davical.spec Thu Sep 15 19:34:00 2011 +0200
1.3 @@ -22,9 +22,9 @@
1.4 ##
1.5
1.6 # package version
1.7 -%define V_opkg 0.9.9.3
1.8 -%define V_davical 0.9.9.3
1.9 -%define V_awl 0.45
1.10 +%define V_opkg 0.9.9.5
1.11 +%define V_davical 0.9.9.5
1.12 +%define V_awl 0.47
1.13
1.14 # package information
1.15 Name: davical
1.16 @@ -37,7 +37,7 @@
1.17 Group: Network
1.18 License: GPL
1.19 Version: %{V_opkg}
1.20 -Release: 20101124
1.21 +Release: 20110915
1.22
1.23 # package options
1.24 %define with_ssl no
1.25 @@ -65,8 +65,12 @@
1.26 PreReq: apache-php::with_pgsql = yes
1.27 PreReq: apache-php::with_gettext = yes
1.28 PreReq: apache-php::with_iconv = yes
1.29 +PreReq: yaml, yaml::with_perl = yes
1.30 +PreReq: perl-dbi
1.31 PreReq: postgresql
1.32 PreReq: apg
1.33 +AutoReq: no
1.34 +AutoReqProv: no
1.35
1.36 %description
1.37 The DAViCal CalDAV Server is a repository for calendar, schedule,
1.38 @@ -89,11 +93,17 @@
1.39 %setup -q -c
1.40 %setup -q -T -D -a 1
1.41 %patch -p0
1.42 + %{l_shtool} subst \
1.43 + -e 's;../awl/VERSION;../awl-%{V_awl}/VERSION;' \
1.44 + davical-%{V_davical}/scripts/build-always.sh
1.45
1.46 %build
1.47 cd davical-%{V_davical} && %{l_make} %{l_mflags} htdocs/always.php
1.48
1.49 %install
1.50 + # remove build cruft
1.51 + rm -rf $RPM_BUILD_ROOT
1.52 +
1.53 # create installation hierarchy
1.54 %{l_shtool} mkdir -f -p -m 755 \
1.55 $RPM_BUILD_ROOT%{l_prefix}/sbin \
1.56 @@ -111,7 +121,6 @@
1.57 awl-%{V_awl}/dba \
1.58 awl-%{V_awl}/inc \
1.59 $RPM_BUILD_ROOT%{l_prefix}/lib/davical/awl/
1.60 - rm -f davical-%{V_davical}/inc/always.php.in
1.61 %{l_shtool} subst %{l_value -s -a} \
1.62 davical-%{V_davical}/htdocs/always.php
1.63 cp -r \
1.64 @@ -146,6 +155,10 @@
1.65 %{SOURCE davical-setup.sh} \
1.66 $RPM_BUILD_ROOT%{l_prefix}/sbin/davical-setup
1.67
1.68 + # remove intermediate headers and other unused files
1.69 + rm -f $RPM_BUILD_ROOT%{l_prefix}/lib/davical/awl/inc/*.in
1.70 + rm -f $RPM_BUILD_ROOT%{l_prefix}/lib/davical/davical/inc/*.in
1.71 +
1.72 # determine installation files
1.73 %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
1.74 %{l_files_std} \
