Author: glen Date: Wed Dec 9 17:12:30 2009 GMT Module: packages Tag: HEAD ---- Log message: - be compatible with new php depsolver
---- Files affected: packages/eventum: eventum.spec (1.308 -> 1.309) ---- Diffs: ================================================================ Index: packages/eventum/eventum.spec diff -u packages/eventum/eventum.spec:1.308 packages/eventum/eventum.spec:1.309 --- packages/eventum/eventum.spec:1.308 Tue Nov 10 12:33:05 2009 +++ packages/eventum/eventum.spec Wed Dec 9 18:12:24 2009 @@ -11,8 +11,8 @@ %bcond_without order # with experimental order patch #define snap 20060921 -%define rev r3984 -%define rel 2.41 +%define rev r4018 +%define rel 2.48 #define _rc RC3 %include /usr/lib/rpm/macros.php @@ -26,9 +26,9 @@ #Source0: http://downloads.mysql.com/snapshots/eventum/%{name}-nightly-%{snap}.tar.gz #Source0: http://eventum.mysql.org/downloads/eventum-2.0.RC3.tar.gz #Source0: http://mysql.easynet.be/Downloads/eventum/%{name}-%{version}.tar.gz -# bzr branch lp:eventum eventum && tar -cjf eventum.tar.bz2 --exclude=.bzr --exclude=.bzrignore eventum +# bzr branch lp:eventum eventum && cd eventum && make dist Source0: %{name}-%{version}-dev-%{rev}.tar.gz -# Source0-md5: 198d379dd62132a8727308ddfba7e7a3 +# Source0-md5: 74cc4307c0641c2fbe7e543e994cfbe0 Source1: %{name}-apache.conf Source2: %{name}-mail-queue.cron Source3: %{name}-mail-download.cron @@ -95,7 +95,15 @@ BuildArch: noarch BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _noautoreq 'pear(init.php)' 'pear(/etc/webapps/.*)' 'pear(%{_appdir}/.*)' 'pear(jpgraph_dir.php)' 'pear(.*Smarty.class.php)' 'pear(Services/JSON.php)' +%define _noautopear 'pear(init.php)' 'pear(/etc/webapps/.*)' 'pear(%{_appdir}/.*)' 'pear(jpgraph_dir.php)' 'pear(.*Smarty.class.php)' 'pear(Services/JSON.php)' + +# exclude optional php dependencies +%define _noautophp 'php(gnupg)' 'php(hash)' 'php(pecl-http)' 'php(json)' 'php(tk)' + +# we don't want php(xxx) being resolved to php-xxx +%define _noautoreqdep '^php(.*)$' + +%define _noautoreq %{_noautophp} %{_noautopear} %define _libdir %{_prefix}/lib/%{name} %define _appdir %{_datadir}/%{name} @@ -782,6 +790,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.309 2009/12/09 17:12:24 glen +- be compatible with new php depsolver + Revision 1.308 2009/11/10 11:33:05 glen - up to r3984 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/eventum/eventum.spec?r1=1.308&r2=1.309&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
