packages: davical/davical.spec - added patch1 - no need to substitute @PHP_...

[pawelz]

Author: pawelz                       Date: Wed Sep 22 13:45:12 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- added patch1
- no need to substitute @PHP_DATA_DIR@ (due to changes in patch0)
- R: php-pcre, php-pdo-pgsql

---- Files affected:
packages/davical:
   davical.spec (1.5 -> 1.6) 

---- Diffs:

================================================================
Index: packages/davical/davical.spec
diff -u packages/davical/davical.spec:1.5 packages/davical/davical.spec:1.6
--- packages/davical/davical.spec:1.5	Wed Sep 22 15:00:26 2010
+++ packages/davical/davical.spec	Wed Sep 22 15:45:07 2010
@@ -6,7 +6,7 @@
 Summary(pl.UTF-8):	Serwer CalDAV
 Name:		davical
 Version:	0.9.9.2
-Release:	0.3
+Release:	0.5
 License:	GPL v2
 Group:		Applications
 Source0:	http://downloads.sourceforge.net/project/rscds/davical/0.9.9.2/%{name}-%{version}.tar.gz
@@ -14,9 +14,12 @@
 Source1:	%{name}.conf
 Source2:	%{name}-lighttpd.conf
 Patch0:		%{name}-php_data_dir.patch
+Patch1:		%{name}-conf_path.patch
 BuildRequires:	php-awl
 BuildRequires:	php-pear-PhpDocumentor
 Requires:	php-awl
+Requires:	php-pcre
+Requires:	php-pdo-pgsql
 Requires:	php-session
 Requires:	webapps
 Requires:	webserver(access)
@@ -38,9 +41,9 @@
 %setup -q
 
 %patch0 -p1
+%patch1 -p1
 
 sed -i 's#^AWL_LOCATION="\.\./awl"$#AWL_LOCATION=%{php_data_dir}/awl#' scripts/po/rebuild-translations.sh
-sed -i 's#@PHP_DATA_DIR@#%{php_data_dir}#' inc/always.php.in
 sed -i /^================================================================/q COPYING
 
 %build
@@ -107,6 +110,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.6  2010/09/22 13:45:07  pawelz
+- added patch1
+- no need to substitute @PHP_DATA_DIR@ (due to changes in patch0)
+- R: php-pcre, php-pdo-pgsql
+
 Revision 1.5  2010/09/22 13:00:26  pawelz
 - seems to work
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/davical/davical.spec?r1=1.5&r2=1.6&f=u