packages: davical/davical.spec - awl_version.patch added; cleanups; rel 0.7

[zbyniu]

Author: zbyniu                       Date: Wed Jan 18 23:18:25 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- awl_version.patch added; cleanups; rel 0.7

---- Files affected:
packages/davical:
   davical.spec (1.13 -> 1.14) 

---- Diffs:

================================================================
Index: packages/davical/davical.spec
diff -u packages/davical/davical.spec:1.13 packages/davical/davical.spec:1.14
--- packages/davical/davical.spec:1.13	Wed Jan 18 23:32:35 2012
+++ packages/davical/davical.spec	Thu Jan 19 00:18:20 2012
@@ -6,7 +6,7 @@
 Summary(pl.UTF-8):	Serwer CalDAV
 Name:		davical
 Version:	1.0.2
-Release:	0.6
+Release:	0.7
 License:	GPL v2
 Group:		Applications
 Source0:	http://debian.mcmillan.net.nz/packages/davical/%{name}-%{version}.tar.gz
@@ -16,6 +16,7 @@
 URL:		http://davical.org/
 Patch0:		%{name}-php_data_dir.patch
 Patch1:		%{name}-conf_path.patch
+Patch2:		awl_version.patch
 BuildRequires:	gettext-devel
 BuildRequires:	php-awl >= 0.49
 BuildRequires:	php-pear-PhpDocumentor
@@ -44,14 +45,16 @@
 
 %prep
 %setup -q
-
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 sed -i 's#^AWL_LOCATION="\.\./awl"$#AWL_LOCATION=%{php_data_dir}/awl#' scripts/po/rebuild-translations.sh
 sed -i /^================================================================/q COPYING
 
 %build
+# we can force awl_version if required
+# AWL_VERSION="0.50" scripts/build-always.sh < inc/always.php.in > htdocs/always.php
 scripts/build-always.sh < inc/always.php.in > htdocs/always.php
 phpdoc -c docs/api/phpdoc.ini
 scripts/po/rebuild-translations.sh
@@ -68,6 +71,7 @@
 cp -a dba $RPM_BUILD_ROOT%{_appdir}
 
 rm -rf $RPM_BUILD_ROOT%{_appdir}/dba/windows
+rm -f $RPM_BUILD_ROOT%{_appdir}/inc/always.php.in*
 
 install %{SOURCE1} $RPM_BUILD_ROOT%{_webapps}/%{name}/httpd.conf
 install %{SOURCE1} $RPM_BUILD_ROOT%{_webapps}/%{name}/apache.conf
@@ -99,7 +103,7 @@
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc COPYING ChangeLog CREDITS README TODO scripts
+%doc COPYING ChangeLog CREDITS README TODO scripts/*.php
 %dir %attr(750,root,http) %{_sysconfdir}/webapps/%{name}
 %attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_webapps}/%{name}/config.php
 %attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_webapps}/%{name}/administration.yml
@@ -123,6 +127,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.14  2012/01/18 23:18:20  zbyniu
+- awl_version.patch added; cleanups; rel 0.7
+
 Revision 1.13  2012/01/18 22:32:35  zbyniu
 - up to 1.0.2
 
================================================================

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