packages: davical/davical.spec, davical/davical-php_data_dir.patch - up to ...

[zbyniu]

Author: zbyniu                       Date: Thu Oct  6 15:54:54 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 0.9.9.6

---- Files affected:
packages/davical:
   davical.spec (1.8 -> 1.9) , davical-php_data_dir.patch (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: packages/davical/davical.spec
diff -u packages/davical/davical.spec:1.8 packages/davical/davical.spec:1.9
--- packages/davical/davical.spec:1.8	Wed Apr 27 17:37:13 2011
+++ packages/davical/davical.spec	Thu Oct  6 17:54:49 2011
@@ -5,18 +5,19 @@
 Summary:	CalDAV Server
 Summary(pl.UTF-8):	Serwer CalDAV
 Name:		davical
-Version:	0.9.9.4
+Version:	0.9.9.6
 Release:	0.5
 License:	GPL v2
 Group:		Applications
 Source0:	http://debian.mcmillan.net.nz/packages/davical/%{name}-%{version}.tar.gz
-# Source0-md5:	8d43279a124ee0e207fc2c071e8df882
+# Source0-md5:	bf1189064e43a061c3eaaebf4416fd8b
 Source1:	%{name}.conf
 Source2:	%{name}-lighttpd.conf
 URL:		http://davical.org/
 Patch0:		%{name}-php_data_dir.patch
 Patch1:		%{name}-conf_path.patch
-BuildRequires:	php-awl >= 0.46
+BuildRequires:	gettext-devel
+BuildRequires:	php-awl >= 0.48
 BuildRequires:	php-pear-PhpDocumentor
 Requires:	perl(DBD::Pg)
 Requires:	perl(YAML)
@@ -122,6 +123,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.9  2011/10/06 15:54:49  zbyniu
+- up to 0.9.9.6
+
 Revision 1.8  2011/04/27 15:37:13  zbyniu
 - up to 0.9.9.4; new URL and source
 

================================================================
Index: packages/davical/davical-php_data_dir.patch
diff -u packages/davical/davical-php_data_dir.patch:1.3 packages/davical/davical-php_data_dir.patch:1.4
--- packages/davical/davical-php_data_dir.patch:1.3	Wed Sep 22 17:07:50 2010
+++ packages/davical/davical-php_data_dir.patch	Thu Oct  6 17:54:49 2011
@@ -1,12 +1,13 @@
 --- davical-0.9.9.2/inc/always.php.in.orig	2010-09-22 15:19:34.000000000 +0200
 +++ davical-0.9.9.2/inc/always.php.in	2010-09-22 15:19:48.000000000 +0200
-@@ -70,21 +70,8 @@
+@@ -70,22 +70,8 @@
  
  // Utilities
  if ( ! @include_once('AWLUtilities.php') ) {
 -  $try_paths = array(
 -        '../../awl/inc'
--      , '/usr/share/awl/inc'
+-      , '/usr/share/awl/inc'        // Where it ends up on Debian
+-      , '/usr/share/php/awl/inc'    // Fedora's standard for PHP libraries
 -      , '/usr/local/share/awl/inc'
 -  );
 -  foreach( $try_paths AS $awl_include_path ) {
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/davical/davical.spec?r1=1.8&r2=1.9&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/davical/davical-php_data_dir.patch?r1=1.3&r2=1.4&f=u