commit 50f647af45c5a6604907237d4aad1fe4b4d62573
Author: Jan Rękorajski <[email protected]>
Date: Sat Jan 4 23:23:29 2020 +0900
- add magic and paths as used by rpm.org dependency generators (noop on
rpm5)
attr.kernel | 1 +
attr.php | 1 -
attr.ruby | 2 ++
rpm-build-macros.spec | 2 +-
4 files changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/rpm-build-macros.spec b/rpm-build-macros.spec
index 738f3b3..60d1078 100644
--- a/rpm-build-macros.spec
+++ b/rpm-build-macros.spec
@@ -58,7 +58,7 @@ Conflicts: coreutils < 6.9
Conflicts: gettext-devel < 0.11
# tmpdir/_tmppath macros problems; optcppflags missing
Conflicts: rpm < 4.4.9-72
-# macros.d/ruby
+# macros.d/*
Conflicts: rpm-build < 5.4.15-52
# php-config --sysconfdir
Conflicts: php-devel < 4:5.2.0-3
diff --git a/attr.kernel b/attr.kernel
index 38a1637..2660d2a 100644
--- a/attr.kernel
+++ b/attr.kernel
@@ -1,2 +1,3 @@
%__kernel_provides %{_rpmconfigdir}/kmod-deps.sh --provides --modinfo
%__modinfo
#__kernel_requires %{_rpmconfigdir}/kmod-deps.sh --requires --modinfo
%__modinfo
+%__kernel_path ^.*/lib/modules/.*\.ko(\.gz|\.xz)?$
diff --git a/attr.php b/attr.php
index 42eb130..4f430e5 100644
--- a/attr.php
+++ b/attr.php
@@ -3,4 +3,3 @@
%__php_requires env PHP_MIN_VERSION=%{?php_min_version}
%{_rpmconfigdir}/php.req%{?php_req_new:.php}
%__php_magic ^PHP script.*
%__php_path \\.php$
-%__php_flags magic_and_path
diff --git a/attr.ruby b/attr.ruby
index 8e035bd..f43d2ff 100644
--- a/attr.ruby
+++ b/attr.ruby
@@ -1,2 +1,4 @@
%__ruby_provides %{_rpmhome}/rubygems.rb --provides
%__ruby_requires %{_rpmhome}/rubygems.rb --requires
+%__ruby_magic ^[rR]uby script text.*
+%__ruby_path
^/usr/(share|lib|lib64|libx32)/(ruby|gems/specifications)/.*
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/rpm-build-macros.git/commitdiff/50f647af45c5a6604907237d4aad1fe4b4d62573
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
