- add magic and paths as used by rpm.org dependency generators (noop on rpm5)

diff --git a/attr.kernel b/attr.kernel
index 38a163721340537ba86182554075c4b0508a5685..2660d2aa34bab08d41c9cdfab5a208cc06c41041 100644 (file)
--- 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 42eb130ec6e86e4e76f103f894385435bf3a90e6..4f430e5548e77c6867618aa778ae72cd3d6eb6cb 100644 (file)
--- 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 8e035bdf3643812990947d62698039527e4acd4f..f43d2ff5115f962b6ad51dfce9e337c099c69723 100644 (file)
--- 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)/.*

diff --git a/rpm-build-macros.spec b/rpm-build-macros.spec
index 738f3b3ed10ffaa194c5bcbdc1e95f0523501ee5..60d1078afdc8dfb68d5d9b972b6dcaeaa245c477 100644 (file)
--- 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