commit b92a880e7dec43d044147e7a504c8fd14757b6fb
Author: Jan Rękorajski <[email protected]>
Date: Sun Jun 16 10:59:03 2024 +0200
- 2.033, re-enable php pear dependency generators
attr.php | 4 ++--
rpm-pld-macros.spec | 6 +++++-
2 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/rpm-pld-macros.spec b/rpm-pld-macros.spec
index e82240b..138c6e9 100644
--- a/rpm-pld-macros.spec
+++ b/rpm-pld-macros.spec
@@ -1,4 +1,4 @@
-%define rpm_macros_rev 2.032
+%define rpm_macros_rev 2.033
%define find_lang_rev 1.42
# split into individual X_prov_ver if there is a reason to desync
%define prov_ver 4.15
@@ -153,8 +153,12 @@ RPM.
Summary: Additional utilities for checking PHP PEAR provides/requires in
RPM packages
Summary(pl.UTF-8): Dodatkowe narzędzia do sprawdzania zależności skryptów
php w RPM
Group: Applications/File
+# The scripts are in perl
+Requires: perl-base
Requires: %{name}-build = %{version}-%{release}
Requires: sed >= 4.0
+# Alternate req script in PHP
+Suggests: /usr/bin/php
Suggests: php-pear-PHP_CompatInfo
Provides: rpm-php-pearprov = %{prov_ver}
Obsoletes: rpm-php-pearprov
diff --git a/attr.php b/attr.php
index a59d7f6..4f430e5 100644
--- a/attr.php
+++ b/attr.php
@@ -1,5 +1,5 @@
-#__php_provides %{_rpmconfigdir}/php.prov
+%__php_provides %{_rpmconfigdir}/php.prov
# define 'php_req_new' in ~/.rpmmacros to use php version of req finder
-#__php_requires env PHP_MIN_VERSION=%{?php_min_version}
%{_rpmconfigdir}/php.req%{?php_req_new:.php}
+%__php_requires env PHP_MIN_VERSION=%{?php_min_version}
%{_rpmconfigdir}/php.req%{?php_req_new:.php}
%__php_magic ^PHP script.*
%__php_path \\.php$
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/rpm-pld-macros.git/commitdiff/b92a880e7dec43d044147e7a504c8fd14757b6fb
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
