packages: dokuwiki/dokuwiki.spec - new dep preparation

[glen]

Author: glen                         Date: Mon Jan  4 16:13:48 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- new dep preparation

---- Files affected:
packages/dokuwiki:
   dokuwiki.spec (1.66 -> 1.67) 

---- Diffs:

================================================================
Index: packages/dokuwiki/dokuwiki.spec
diff -u packages/dokuwiki/dokuwiki.spec:1.66 packages/dokuwiki/dokuwiki.spec:1.67
--- packages/dokuwiki/dokuwiki.spec:1.66	Mon Dec  7 20:14:01 2009
+++ packages/dokuwiki/dokuwiki.spec	Mon Jan  4 17:13:43 2010
@@ -1,12 +1,13 @@
 # $Revision$, $Date$
 %define		subver	2009-12-02
 %define		ver	%(echo %{subver} | tr -d -)
+%define		php_min_version 5.1.2
 %include	/usr/lib/rpm/macros.php
 Summary:	PHP-based Wiki webapplication
 Summary(pl.UTF-8):	Aplikacja WWW Wiki oparta na PHP
 Name:		dokuwiki
 Version:	%{ver}
-Release:	0.10
+Release:	0.15
 License:	GPL v2
 Group:		Applications/WWW
 Source0:	http://www.splitbrain.org/_media/projects/dokuwiki/%{name}-rc%{subver}.tgz
@@ -42,8 +43,8 @@
 URL:		http://www.dokuwiki.org/dokuwiki
 BuildRequires:	rpm-php-pearprov >= 4.4.2-11
 BuildRequires:	rpmbuild(macros) >= 1.520
-Requires:	geshi >= 1.0.7.19
-Requires:	php-common >= 4:5.1.2
+Requires:	php-common >= 4:%{php_min_version}
+Requires:	php-geshi >= 1.0.7.19
 Requires:	php-simplepie >= 1.0.1
 Requires:	php-xml
 Requires:	webapps
@@ -64,7 +65,15 @@
 %define		find_lang 	%{_usrlibrpm}/dokuwiki-find-lang.sh %{buildroot}
 
 # bad depsolver
-%define		_noautoreq	'pear(/usr/share/php/geshi.php)'
+%define		_noautopear	'pear(/usr/share/php/geshi.php)'
+
+# exclude optional php dependencies
+%define		_noautophp	'php(bzip2)' php(zip) php(date) php(ftp) php(hash) php(ldap) php(mbstring) php(mysql) php(pgsql) php(tokenizer)
+
+# we don't want php(xxx) being resolved to php-xxx
+%define		_noautoreqdep	'^php(.*)'
+
+%define		_noautoreq	%{_noautophp} %{_noautopear}
 
 %description
 DokuWiki is a standards compliant, simple to use Wiki, mainly aimed at
@@ -343,6 +352,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.67  2010/01/04 16:13:43  glen
+- new dep preparation
+
 Revision 1.66  2009/12/07 19:14:01  glen
 - no md5 for files in cvs
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/dokuwiki/dokuwiki.spec?r1=1.66&r2=1.67&f=u