aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Thauvin <nanardon@mandriva.org>2006-05-31 20:22:39 +0000
committerOlivier Thauvin <nanardon@mandriva.org>2006-05-31 20:22:39 +0000
commit42a7a87cd19bc53a7002b115d211d01f64214110 (patch)
tree402de509244aa1a72812c2ff249daa96b8ad6b5f
parent4f7bc6d0f56b2be9eb2069e146ea1552e575f422 (diff)
downloadrpm-setup-42a7a87cd19bc53a7002b115d211d01f64214110.tar
rpm-setup-42a7a87cd19bc53a7002b115d211d01f64214110.tar.gz
rpm-setup-42a7a87cd19bc53a7002b115d211d01f64214110.tar.bz2
rpm-setup-42a7a87cd19bc53a7002b115d211d01f64214110.tar.xz
rpm-setup-42a7a87cd19bc53a7002b115d211d01f64214110.zip
- enable pkgconfig & libtool provides
-rwxr-xr-xfind-provides.in11
-rwxr-xr-xfind-requires.in15
2 files changed, 24 insertions, 2 deletions
diff --git a/find-provides.in b/find-provides.in
index 8f32dad..3f93304 100755
--- a/find-provides.in
+++ b/find-provides.in
@@ -63,7 +63,16 @@ done | sort -u
[ -x @RPMVENDORDIR@/php.prov ] &&
echo "$filelist" | tr '[:blank:]' \\n | @RPMVENDORDIR@/php.prov | sort -u
-
+#
+# --- Pkgconfig deps
+[ -x @RPMLIBDIR@/pkgconfigdeps.sh ] &&
+ echo "$filelist" | tr '[:blank:]' \\n | @RPMLIBDIR@/pkgconfigdeps.sh -P | sort -u
+
+#
+# --- libtooldep deps
+[ -x @RPMLIBDIR@/libtooldeps.sh ] &&
+ echo "$filelist" | tr '[:blank:]' \\n | @RPMLIBDIR@/libtooldeps.sh -P | sort -u
+
#
# --- .so files.
for i in `echo $filelist | tr '[:blank:]' "\n" | egrep '(/usr(/X11R6)?)?/lib(|64)(/gcc(-lib)?/.+)?/[^/]+\.so$'`; do
diff --git a/find-requires.in b/find-requires.in
index c03eba5..79abe2c 100755
--- a/find-requires.in
+++ b/find-requires.in
@@ -191,7 +191,20 @@ fi
# --- Php modules.
[ -x @RPMVENDORDIR@/php.req ] && \
echo $filelist | tr '[:blank:]' \\n | @RPMVENDORDIR@/php.req | sort -u
-
+
+if [ -n "$REQRPM446" ]; then
+#
+# --- Pkgconfig deps
+[ -x @RPMLIBDIR@/pkgconfigdeps.sh ] &&
+ echo "$filelist" | tr '[:blank:]' \\n | @RPMLIBDIR@/pkgconfigdeps.sh -R | sort -u
+
+#
+# --- libtooldep deps
+[ -x @RPMLIBDIR@/libtooldeps.sh ] &&
+ echo "$filelist" | tr '[:blank:]' \\n | @RPMLIBDIR@/libtooldeps.sh -R | sort -u
+
+fi
+
#
# --- .so files.
for i in `echo $filelist | tr '[:blank:]' "\n" | egrep "(/usr(/X11R6)?)?/lib(|64)/[^/]+\.so$"`; do