commit f224c382269520ceb519016f170b34789d883fab
Author: Jan Rękorajski <bagg...@pld-linux.org>
Date: Mon Jan 6 21:11:51 2020 +0900
- don't use rpm5 macros
attr.java | 2 +-
attr.ruby | 4 ++--
macros.kernel | 2 --
macros.ruby | 2 +-
4 files changed, 4 insertions(+), 6 deletions(-)
---
diff --git a/attr.java b/attr.java
index a3d1191..604b47c 100644
--- a/attr.java
+++ b/attr.java
@@ -1,3 +1,3 @@
-%__java_requires env RPM_BUILD_ROOT=%{buildroot}
MIN_CLASSDATAVERSION=%{?java_min_classdataversion}
%{_rpmhome}/java-find-requires
+%__java_requires env RPM_BUILD_ROOT=%{buildroot}
MIN_CLASSDATAVERSION=%{?java_min_classdataversion}
%{_rpmconfigdir}/java-find-requires
%__java_magic ^Java .*
%__java_path \\.(jar|class)$
diff --git a/attr.ruby b/attr.ruby
index f43d2ff..7aff0c2 100644
--- a/attr.ruby
+++ b/attr.ruby
@@ -1,4 +1,4 @@
-%__ruby_provides %{_rpmhome}/rubygems.rb --provides
-%__ruby_requires %{_rpmhome}/rubygems.rb --requires
+%__ruby_provides %{_rpmconfigdir}/rubygems.rb --provides
+%__ruby_requires %{_rpmconfigdir}/rubygems.rb --requires
%__ruby_magic ^[rR]uby script text.*
%__ruby_path
^/usr/(share|lib|lib64|libx32)/(ruby|gems/specifications)/.*
diff --git a/macros.kernel b/macros.kernel
index 84d96b0..12f2f4c 100644
--- a/macros.kernel
+++ b/macros.kernel
@@ -1,7 +1,5 @@
# vim:ts=4 sw=4 noet ft=spec
# Kernel specific macro definitions.
-# To make use of these macros insert the following line into your spec file:
-# %{load:%{_usrlibrpm}/macros.d/kernel}
%__modinfo /sbin/modinfo
diff --git a/macros.ruby b/macros.ruby
index e0d309a..becda24 100644
--- a/macros.ruby
+++ b/macros.ruby
@@ -30,7 +30,7 @@
%ruby_ver_requires_eq %{nil}
%ruby_mod_ver_requires_eq %{nil}
-%__gem_helper %{_usrlibrpm}/gem_helper.rb
+%__gem_helper %{_rpmconfigdir}/gem_helper.rb
%gem_build(f:j:) \
%__gem_helper build \\\
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/rpm-build-macros.git/commitdiff/0c4a87cbfb5cfc4b9a707f657b25f01e04db0843
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
