1.1 --- a/davical/davical.spec Tue Aug 28 18:37:35 2012 +0200
1.2 +++ b/davical/davical.spec Tue Aug 28 18:42:10 2012 +0200
1.3 @@ -22,9 +22,9 @@
1.4 ##
1.5
1.6 # package version
1.7 -%define V_opkg 0.9.9.7
1.8 -%define V_davical 0.9.9.7
1.9 -%define V_awl 0.49
1.10 +%define V_opkg 1.1.1
1.11 +%define V_davical 1.1.1
1.12 +%define V_awl 0.53
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: 20111130
1.21 +Release: 20120800
1.22
1.23 # package options
1.24 %define with_ssl no
1.25 @@ -52,12 +52,10 @@
1.26 Patch0: davical.patch
1.27
1.28 # build information
1.29 -Prefix: %{l_prefix}
1.30 -BuildRoot: %{l_buildroot}
1.31 -BuildPreReq: OpenPKG, openpkg >= 20060823
1.32 -PreReq: OpenPKG, openpkg >= 20060823
1.33 +BuildPreReq: OpenPKG, openpkg >= 20100101
1.34 +PreReq: OpenPKG, openpkg >= 20100101
1.35 PreReq: pcre, pcre::with_utf8
1.36 -PreReq: apache
1.37 +PreReq: apache, apg
1.38 %if "%{with_ssl}" == "yes"
1.39 PreReq: apache::with_mod_ssl = yes, x509
1.40 %endif
1.41 @@ -67,15 +65,16 @@
1.42 PreReq: apache-php::with_iconv = yes
1.43 PreReq: yaml, yaml::with_perl = yes
1.44 PreReq: perl-dbi
1.45 +PreReq: perl-dbi::with_pgsql = yes
1.46 PreReq: postgresql
1.47 -PreReq: apg
1.48 -AutoReq: no
1.49 -AutoReqProv: no
1.50
1.51 %description
1.52 The DAViCal CalDAV Server is a repository for calendar, schedule,
1.53 - todo and journal entries which may be accessed with CalDAV capable
1.54 - client software.
1.55 + todo, and journal entries. Its design allows for trivial storage of
1.56 + CalDAV calendars from clients such as Evolution, Sunbird/Lightning,
1.57 + Mulberry, iCal, iPhone, or SOHO Organizer. Calendar data is stored
1.58 + in a central location providing shared calendars, free/busy
1.59 + publication and a basic administration interface.
1.60
1.61 %track
1.62 prog davical:davical = {
1.63 @@ -100,14 +99,13 @@
1.64 %build
1.65 ln -s awl-%{V_awl} awl
1.66 ( cd davical-%{V_davical}
1.67 - %{l_shtool} subst %{l_value -s -a} inc/always.php.in
1.68 + %{l_shtool} subst %{l_value -s -a} \
1.69 + inc/always.php.in \
1.70 + htdocs/always.php
1.71 %{l_make} %{l_mflags} htdocs/always.php
1.72 ) || exit $?
1.73
1.74 %install
1.75 - # remove build cruft
1.76 - rm -rf $RPM_BUILD_ROOT
1.77 -
1.78 # create installation hierarchy
1.79 %{l_shtool} mkdir -f -p -m 755 \
1.80 $RPM_BUILD_ROOT%{l_prefix}/sbin \
1.81 @@ -121,12 +119,13 @@
1.82
1.83 # install program components
1.84 find . -name "*.orig" -print | xargs rm -f
1.85 +# MSvB: Needed?
1.86 +# %{l_shtool} subst %{l_value -s -a} \
1.87 +# davical-%{V_davical}/htdocs/always.php
1.88 cp -r \
1.89 awl-%{V_awl}/dba \
1.90 awl-%{V_awl}/inc \
1.91 $RPM_BUILD_ROOT%{l_prefix}/lib/davical/awl/
1.92 - %{l_shtool} subst %{l_value -s -a} \
1.93 - davical-%{V_davical}/htdocs/always.php
1.94 cp -r \
1.95 davical-%{V_davical}/dba \
1.96 davical-%{V_davical}/inc \
1.97 @@ -147,7 +146,7 @@
1.98 %{SOURCE davical-apache.conf} \
1.99 $RPM_BUILD_ROOT%{l_prefix}/etc/davical/
1.100
1.101 - # install run-command script
1.102 + # install runcommand script
1.103 %if "%{with_ssl}" == "yes"
1.104 with_ssl="-DSSL"
1.105 %else
1.106 @@ -182,7 +181,6 @@
1.107 %files -f files
1.108
1.109 %clean
1.110 - rm -rf $RPM_BUILD_ROOT
1.111
1.112 %post
1.113 if [ $1 -eq 1 ]; then
