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

- rel 2

diff --git a/attr.kernel b/attr.kernel
index a4e45f8ab0f9a7af94a5819b6eba40ef6e6058bc..1ff88f868bc73862c7caf1d65bc328bfa7aa973c 100644 (file)
--- 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 ad897d0b4f5880a7549ce76b65791b570ffa3946..2b739e42b0ae7940efeb121c5d6b28fe253dda36 100644 (file)
--- 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$

diff --git a/rpm-pld-macros.spec b/rpm-pld-macros.spec
index 24ceb93f948c02dc3a991f2a531994f36e253aad..5d23875c929275939eed348ea46e9d2d0d81995b 100644 (file)
--- 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