1.1 --- a/davical/davical.spec Tue Nov 29 18:44:37 2011 +0100
1.2 +++ b/davical/davical.spec Thu Dec 01 13:24:24 2011 +0100
1.3 @@ -22,9 +22,9 @@
1.4 ##
1.5
1.6 # package version
1.7 -%define V_opkg 0.9.9.5
1.8 -%define V_davical 0.9.9.5
1.9 -%define V_awl 0.47
1.10 +%define V_opkg 0.9.9.7
1.11 +%define V_davical 0.9.9.7
1.12 +%define V_awl 0.49
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: 20110915
1.21 +Release: 20111130
1.22
1.23 # package options
1.24 %define with_ssl no
1.25 @@ -86,7 +86,7 @@
1.26 prog davical:awl = {
1.27 version = %{V_awl}
1.28 url = http://debian.mcmillan.net.nz/packages/awl/
1.29 - regex = awl_(__VER__)\.tar\.gz
1.30 + regex = awl-(__VER__)\.tar\.gz
1.31 }
1.32
1.33 %prep
1.34 @@ -98,7 +98,11 @@
1.35 davical-%{V_davical}/scripts/build-always.sh
1.36
1.37 %build
1.38 - cd davical-%{V_davical} && %{l_make} %{l_mflags} htdocs/always.php
1.39 + ln -s awl-%{V_awl} awl
1.40 + ( cd davical-%{V_davical}
1.41 + %{l_shtool} subst %{l_value -s -a} inc/always.php.in
1.42 + %{l_make} %{l_mflags} htdocs/always.php
1.43 + ) || exit $?
1.44
1.45 %install
1.46 # remove build cruft
1.47 @@ -135,7 +139,11 @@
1.48 $RPM_BUILD_ROOT%{l_prefix}/etc/davical/
1.49
1.50 # install DAViCal Apache configuration file
1.51 + l_hostname=`%{l_shtool} echo -e %h`
1.52 + l_domainname=`%{l_shtool} echo -e %d | cut -c2-`
1.53 %{l_shtool} install -c -m 644 %{l_value -s -a} \
1.54 + -e "s;@l_hostname@;$l_hostname;g" \
1.55 + -e "s;@l_domainname@;$l_domainname;g" \
1.56 %{SOURCE davical-apache.conf} \
1.57 $RPM_BUILD_ROOT%{l_prefix}/etc/davical/
1.58
1.59 @@ -162,7 +170,12 @@
1.60 # determine installation files
1.61 %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
1.62 %{l_files_std} \
1.63 - '%config %{l_prefix}/etc/davical/*' \
1.64 + '%config %attr(-,%{l_rusr},%{l_rgrp}) %{l_prefix}/etc/davical/*' \
1.65 + '%attr(-,%{l_rusr},%{l_rgrp}) %{l_prefix}/lib/davical/*' \
1.66 + '%attr(-,%{l_rusr},%{l_rgrp}) %{l_prefix}/lib/davical/*/*' \
1.67 + '%attr(-,%{l_rusr},%{l_rgrp}) %{l_prefix}/lib/davical/*/*/*' \
1.68 + '%attr(-,%{l_rusr},%{l_rgrp}) %{l_prefix}/lib/davical/*/*/*/*' \
1.69 + '%attr(-,%{l_rusr},%{l_rgrp}) %{l_prefix}/lib/davical/*/*/*/*/*' \
1.70 '%attr(-,%{l_rusr},%{l_rgrp}) %{l_prefix}/var/davical' \
1.71 '%attr(-,%{l_rusr},%{l_rgrp}) %{l_prefix}/var/davical/*'
1.72
1.73 @@ -179,9 +192,15 @@
1.74 echo " \$ $RPM_INSTALL_PREFIX/bin/openpkg rc postgresql start"
1.75 echo " \$ $RPM_INSTALL_PREFIX/sbin/davical-setup install"
1.76 echo ""
1.77 +%if "%{with_ssl}" == "yes"
1.78 echo "2. By default, DAViCal runs its own SSL/TLS based Apache server"
1.79 echo " under 127.0.0.1, TCP port 8443. Please change this by editing"
1.80 echo " the \"Listen 127.0.0.1:8443\" directive in:"
1.81 +%else
1.82 + echo "2. By default, DAViCal runs its own Apache server"
1.83 + echo " under 127.0.0.1, TCP port 8080. Please change this by editing"
1.84 + echo " the \"Listen 127.0.0.1:8080\" directive in:"
1.85 +%endif
1.86 echo " $RPM_INSTALL_PREFIX/etc/davical/davical-apache.conf"
1.87 echo ""
1.88 echo "3. Now start DAViCal by running the command"
