aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile.am2
-rw-r--r--NEWS1
-rwxr-xr-xfind-requires.in4
-rw-r--r--multiarch.attr3
-rw-r--r--multiarch.req6
5 files changed, 12 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am
index f95b1ee..9abc5aa 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -35,6 +35,7 @@ pkg_scripts = \
git-repository--apply-patch \
http.req \
kmod.prov \
+ multiarch.req \
perlapi.prov \
perlapi.req \
perl_base.req \
@@ -52,6 +53,7 @@ pkg_scripts_in = $(pkg_gscripts:=.in)
pkg_attr_defs = \
devel.attr \
+ multiarch.attr \
perlapi_base.attr \
perlapi.attr \
perl_base.attr
diff --git a/NEWS b/NEWS
index e8eb6e9..2ac3acb 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,5 @@
- convert devel(foo) deps to internal generator
+- convert multiarch deps to internal generator
- convert "perlapi" deps to internal generator
- convert perl-base deps to internal generator
- convert PHP deps to internal generator
diff --git a/find-requires.in b/find-requires.in
index d86786e..b15c42c 100755
--- a/find-requires.in
+++ b/find-requires.in
@@ -43,8 +43,4 @@ filelist=`sed "s/[]['\"*?{}]/\\\\\&/g"`
[ -x /usr/lib/rpm/rpmdeps -a -n "$filelist" ] && \
echo $filelist | tr '[:blank:]' \\n | /usr/lib/rpm/rpmdeps --requires
-#
-# --- multiarch-utils
-echo $filelist | tr '[:blank:]' '\n' | grep -q '/multiarch-.*-linux/' && echo multiarch-utils
-
exit 0
diff --git a/multiarch.attr b/multiarch.attr
new file mode 100644
index 0000000..1b04343
--- /dev/null
+++ b/multiarch.attr
@@ -0,0 +1,3 @@
+# multiarch-utils
+%__multiarch_requires %{_rpmconfigdir}/mageia/multiarch.req
+%__multiarch_path /multiarch-.*-linux/
diff --git a/multiarch.req b/multiarch.req
new file mode 100644
index 0000000..19a6f64
--- /dev/null
+++ b/multiarch.req
@@ -0,0 +1,6 @@
+#!/bin/sh
+# --- multiarch-utils
+while read instfile ; do
+ echo $instfile | grep -q '/multiarch-.*-linux/' && echo multiarch-utils
+done
+