template-specs: dokuwiki-plugin.spec, php-package.spec - update

[glen]

Author: glen                         Date: Thu Jun  3 09:18:48 2010 GMT
Module: template-specs                Tag: HEAD
---- Log message:
- update

---- Files affected:
template-specs:
   dokuwiki-plugin.spec (1.10 -> 1.11) , php-package.spec (1.5 -> 1.6) 

---- Diffs:

================================================================
Index: template-specs/dokuwiki-plugin.spec
diff -u template-specs/dokuwiki-plugin.spec:1.10 template-specs/dokuwiki-plugin.spec:1.11
--- template-specs/dokuwiki-plugin.spec:1.10	Tue Mar 23 12:58:28 2010
+++ template-specs/dokuwiki-plugin.spec	Thu Jun  3 11:18:43 2010
@@ -35,6 +35,7 @@
 
 version=$(cat VERSION)
 version=$(awk '/date/{print $2}' plugin.info.txt)
+version=$(awk -F"'" '/date/{print $4}' syntax.php)
 if [ "$(echo "$version" | tr -d -)" != %{version} ]; then
 	: %%{version} mismatch
 	exit 1
@@ -75,6 +76,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.11  2010/06/03 09:18:43  glen
+- update
+
 Revision 1.10  2010/03/23 11:58:28  glen
 - git checkout samples
 

================================================================
Index: template-specs/php-package.spec
diff -u template-specs/php-package.spec:1.5 template-specs/php-package.spec:1.6
--- template-specs/php-package.spec:1.5	Wed Mar 10 21:04:25 2010
+++ template-specs/php-package.spec	Thu Jun  3 11:18:43 2010
@@ -1,7 +1,5 @@
 # $Revision$, $Date$
-%if %{with phpdeps}
-%include	/usr/lib/rpm/macros.php
-%endif
+%{?with_phpdeps:%include	/usr/lib/rpm/macros.php}
 # new php based depsolver will look into this macro, however it works in static
 # manner too.
 %define		php_min_version 5.0.0
@@ -20,6 +18,8 @@
 BuildRequires:	rpm-php-pearprov >= 4.4.2-11
 %endif
 BuildRequires:	rpmbuild(macros) >= 1.461
+# for %%undos macro
+BuildRequires:	rpmbuild(macros) >= 1.553
 Requires:	php-common >= 4:%{php_min_version}
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -30,10 +30,10 @@
 %define		_phpdocdir		%{_docdir}/phpdoc
 
 # bad depsolver
-%define		_noautopear	pear(class.template.php) pear(/etc/webapps/template/config.php)
+%define		_noautopear	pear
 
 # exclude optional php dependencies
-%define		_noautophp	php-bzip2 php-bcmath php-zip php-date php-ftp php-hash php-ldap php-mbstring php-mysql php-pgsql php-tokenizer
+%define		_noautophp	php-curl
 
 # put it together for rpmbuild
 %define		_noautoreq	%{?_noautophp} %{?_noautopear}
@@ -74,6 +74,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_appdir}
+install -d $RPM_BUILD_ROOT%{php_data_dir}
 
 install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 cp -a examples/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
@@ -94,7 +95,7 @@
 
 %files phpdoc
 %defattr(644,root,root,755)
-%{_phpdocdir}/%{name}
+%{_phpdocdir}/%{pkgname}
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -102,6 +103,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.6  2010/06/03 09:18:43  glen
+- update
+
 Revision 1.5  2010/03/10 20:04:25  glen
 - pkgname unify
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/template-specs/dokuwiki-plugin.spec?r1=1.10&r2=1.11&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/template-specs/php-package.spec?r1=1.5&r2=1.6&f=u