Author: pawelz                       Date: Wed Sep 22 13:00:32 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- seems to work

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

---- Diffs:

================================================================
Index: packages/davical/davical.spec
diff -u packages/davical/davical.spec:1.4 packages/davical/davical.spec:1.5
--- packages/davical/davical.spec:1.4   Tue Sep 21 18:06:36 2010
+++ packages/davical/davical.spec       Wed Sep 22 15:00:26 2010
@@ -6,13 +6,14 @@
 Summary(pl.UTF-8):     Serwer CalDAV
 Name:          davical
 Version:       0.9.9.2
-Release:       0.1
+Release:       0.3
 License:       GPL v2
 Group:         Applications
 Source0:       
http://downloads.sourceforge.net/project/rscds/davical/0.9.9.2/%{name}-%{version}.tar.gz
 # Source0-md5: c35047bab51ca86729cba94f81988db8
 Source1:       %{name}.conf
 Source2:       %{name}-lighttpd.conf
+Patch0:                %{name}-php_data_dir.patch
 BuildRequires: php-awl
 BuildRequires: php-pear-PhpDocumentor
 Requires:      php-awl
@@ -36,7 +37,10 @@
 %prep
 %setup -q
 
+%patch0 -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
@@ -51,6 +55,7 @@
 
 cp -a config/example-config.php $RPM_BUILD_ROOT%{_webapps}/%{name}/config.php
 cp -a config/example-administration.yml 
$RPM_BUILD_ROOT%{_webapps}/%{name}/administration.yml
+cp -a inc $RPM_BUILD_ROOT%{_appdir}
 cp -a htdocs $RPM_BUILD_ROOT%{_appdir}
 cp -a dba $RPM_BUILD_ROOT%{_appdir}
 
@@ -92,8 +97,9 @@
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) 
%{_webapps}/%{name}/httpd.conf
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) 
%{_webapps}/%{name}/lighttpd.conf
 %dir %{_appdir}
-%{_appdir}/htdocs
 %{_appdir}/dba
+%{_appdir}/htdocs
+%{_appdir}/inc
 
 %define date   %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -101,6 +107,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.5  2010/09/22 13:00:26  pawelz
+- seems to work
+
 Revision 1.4  2010/09/21 16:06:36  pawelz
 - adapterized
 
================================================================

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

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to