Author: glen Date: Mon Nov 28 11:34:55 2011 GMT
Module: packages Tag: rpm-4_5
---- Log message:
- package alternative php requires collector (it's a bit buggy so not eanbled
default)
---- Files affected:
packages/rpm:
macros.php (1.2 -> 1.3) , rpm.spec (1.837.2.42.2.49.2.108 ->
1.837.2.42.2.49.2.109)
---- Diffs:
================================================================
Index: packages/rpm/macros.php
diff -u packages/rpm/macros.php:1.2 packages/rpm/macros.php:1.3
--- packages/rpm/macros.php:1.2 Mon Nov 28 12:04:43 2011
+++ packages/rpm/macros.php Mon Nov 28 12:34:50 2011
@@ -1,2 +1,3 @@
%define __php_provides /usr/lib/rpm/php.prov
-%define __php_requires env PHP_MIN_VERSION=%{?php_min_version}
/usr/lib/rpm/php.req
+# define 'php_req_new' in ~/.rpmmacros to use php version of req finder
+%define __php_requires env PHP_MIN_VERSION=%{?php_min_version}
/usr/lib/rpm/php.req%{?php_req_new:.php}
================================================================
Index: packages/rpm/rpm.spec
diff -u packages/rpm/rpm.spec:1.837.2.42.2.49.2.108
packages/rpm/rpm.spec:1.837.2.42.2.49.2.109
--- packages/rpm/rpm.spec:1.837.2.42.2.49.2.108 Mon Nov 28 12:05:57 2011
+++ packages/rpm/rpm.spec Mon Nov 28 12:34:50 2011
@@ -58,7 +58,7 @@
Summary(uk.UTF-8): Менеджер пакетів від RPM
Name: rpm
Version: 4.5
-Release: 55
+Release: 56
License: LGPL
Group: Base
Source0: %{name}-%{version}.tar.gz
@@ -86,6 +86,7 @@
Source18: banner.sh
Source19: %{name}-macros.gstreamer
Source20: macros.php
+Source21: %{name}-php-requires.php
Patch1000: %{name}-new-debuginfo.patch
Patch1067: %{name}-disable-features.patch
Patch1070: %{name}-rpmrc-ac.patch
@@ -1049,6 +1050,7 @@
install -p %{SOURCE14} $RPM_BUILD_ROOT%{_rpmlibdir}/user_group.sh
install -p %{SOURCE17} $RPM_BUILD_ROOT%{_rpmlibdir}/java-find-requires
install -p scripts/php.{prov,req} $RPM_BUILD_ROOT%{_rpmlibdir}
+cp -p %{SOURCE21} $RPM_BUILD_ROOT%{_rpmlibdir}/php.req.php
install -p %{SOURCE5} $RPM_BUILD_ROOT%{_rpmlibdir}/hrmib-cache
install -p %{SOURCE18} $RPM_BUILD_ROOT%{_bindir}/banner.sh
cp -a %{SOURCE15} $RPM_BUILD_ROOT/etc/sysconfig/rpm
@@ -1487,6 +1489,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.837.2.42.2.49.2.109 2011/11/28 11:34:50 glen
+- package alternative php requires collector (it's a bit buggy so not eanbled
default)
+
Revision 1.837.2.42.2.49.2.108 2011/11/28 11:05:57 glen
- add macros.php as separate source
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rpm/macros.php?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rpm/rpm.spec?r1=1.837.2.42.2.49.2.108&r2=1.837.2.42.2.49.2.109&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
