Author: glen Date: Mon Sep 19 17:18:39 2005 GMT Module: SPECS Tag: AC-branch ---- Log message: - new PEAR build macros added to macros.php
---- Files affected: SPECS: rpm.spec (1.555.2.118 -> 1.555.2.119) ---- Diffs: ================================================================ Index: SPECS/rpm.spec diff -u SPECS/rpm.spec:1.555.2.118 SPECS/rpm.spec:1.555.2.119 --- SPECS/rpm.spec:1.555.2.118 Thu Sep 15 19:34:44 2005 +++ SPECS/rpm.spec Mon Sep 19 19:18:34 2005 @@ -32,7 +32,7 @@ Name: rpm %define sover 4.4 Version: 4.4.2 -Release: 10 +Release: 10.2 License: GPL Group: Base Source0: ftp://jbj.org/pub/rpm-4.4.x/%{name}-%{version}.tar.gz @@ -56,6 +56,7 @@ Source32: pldnotify.awk # http://svn.pld-linux.org/banner.sh/ Source33: banner.sh +Source34: php-pear-build-macros Patch0: %{name}-pl.po.patch Patch1: %{name}-rpmrc.patch Patch2: %{name}-arch.patch @@ -532,11 +533,16 @@ Summary(pl): Dodatkowe narzędzia do sprawdzania zależności skryptów php w rpm Group: Applications/File Requires: %{name} = %{version}-%{release} +Requires: php-pear-PEAR >= 1:1.4.0-0.b1.3 +Requires: php-zlib %description php-pearprov Additional utilities for checking php pear provides/requires in rpm packages. +This package provides rpm macros and dependencies to help building PEAR +packages. + %description php-pearprov -l pl Dodatkowe narzędzia do sprawdzenia zależności skryptów php pear w pakietach rpm. @@ -612,8 +618,7 @@ echo '%%define __perl_provides %%{__perl} /usr/lib/rpm/perl.prov' > macros.perl echo '%%define __perl_requires %%{__perl} /usr/lib/rpm/perl.req' >> macros.perl echo '# obsoleted file' > macros.python -echo '%%define __php_provides /usr/lib/rpm/php.prov' > macros.php -echo '%%define __php_requires /usr/lib/rpm/php.req' >> macros.php +install %{SOURCE34} macros.php echo '%%define __mono_provides /usr/lib/rpm/mono-find-provides' > macros.mono echo '%%define __mono_requires /usr/lib/rpm/mono-find-requires' >> macros.mono install %{SOURCE5} scripts/find-lang.sh @@ -1114,6 +1119,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.555.2.119 2005/09/19 17:18:34 glen +- new PEAR build macros added to macros.php + Revision 1.555.2.118 2005/09/15 17:34:44 glen - macros rev 1.239 (fixed %banner macro); rel 10 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/rpm.spec?r1=1.555.2.118&r2=1.555.2.119&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
