[packages/rpm-pld-macros] - fix paths to /usr/lib/rpm in macro files - rel 2

baggins baggins at pld-linux.org
Wed Feb 12 07:36:48 CET 2020


commit d2f9c366f875f313a00ad36aaa32f8449111ab44
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Wed Feb 12 07:34:26 2020 +0100

    - fix paths to /usr/lib/rpm in macro files
    - rel 2

 attr.kernel         | 4 ++--
 attr.php            | 4 ++--
 rpm-pld-macros.spec | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/rpm-pld-macros.spec b/rpm-pld-macros.spec
index 24ceb93..5d23875 100644
--- a/rpm-pld-macros.spec
+++ b/rpm-pld-macros.spec
@@ -6,7 +6,7 @@ Summary:	PLD Linux RPM macros
 Summary(pl.UTF-8):	Makra RPM dla Linuksa PLD
 Name:		rpm-pld-macros
 Version:	%{rpm_macros_rev}
-Release:	1
+Release:	2
 License:	GPL v2+
 Group:		Development/Building
 Source0:	macros.pld
diff --git a/attr.kernel b/attr.kernel
index a4e45f8..1ff88f8 100644
--- a/attr.kernel
+++ b/attr.kernel
@@ -1,3 +1,3 @@
-%__kernel_provides	%{_rpmlibdir}/kmod-deps.sh --provides --modinfo %__modinfo
-#__kernel_requires	%{_rpmlibdir}/kmod-deps.sh --requires --modinfo %__modinfo
+%__kernel_provides	%{_rpmhome}/kmod-deps.sh --provides --modinfo %__modinfo
+#__kernel_requires	%{_rpmhome}/kmod-deps.sh --requires --modinfo %__modinfo
 %__kernel_path		^.*/lib/modules/.*\.ko(\.gz|\.xz)?$
diff --git a/attr.php b/attr.php
index ad897d0..2b739e4 100644
--- a/attr.php
+++ b/attr.php
@@ -1,5 +1,5 @@
-%__php_provides		%{_rpmlibdir}/php.prov
+%__php_provides		%{_rpmhome}/php.prov
 # define 'php_req_new' in ~/.rpmmacros to use php version of req finder
-%__php_requires		env PHP_MIN_VERSION=%{?php_min_version} %{_rpmlibdir}/php.req%{?php_req_new:.php}
+%__php_requires		env PHP_MIN_VERSION=%{?php_min_version} %{_rpmhome}/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/d2f9c366f875f313a00ad36aaa32f8449111ab44



More information about the pld-cvs-commit mailing list