aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Rousse <guillomovitch@mandriva.org>2008-09-20 15:14:28 +0000
committerGuillaume Rousse <guillomovitch@mandriva.org>2008-09-20 15:14:28 +0000
commit045191e449ee5d8ee13370ee8b8626ad87147b58 (patch)
tree1277da4c050fd1cbc0b7fdc5d05fcf14996b71ef
parent426b36859ef470762c7b04bc415b2755138740ca (diff)
downloadrpm-setup-045191e449ee5d8ee13370ee8b8626ad87147b58.tar
rpm-setup-045191e449ee5d8ee13370ee8b8626ad87147b58.tar.gz
rpm-setup-045191e449ee5d8ee13370ee8b8626ad87147b58.tar.bz2
rpm-setup-045191e449ee5d8ee13370ee8b8626ad87147b58.tar.xz
rpm-setup-045191e449ee5d8ee13370ee8b8626ad87147b58.zip
don't do php files filtering from inside php.req, but from find-requires, as per other language-specific dependencies
-rwxr-xr-xfind-requires.in3
-rwxr-xr-xphp.req4
2 files changed, 2 insertions, 5 deletions
diff --git a/find-requires.in b/find-requires.in
index a073ed1..8bd0002 100755
--- a/find-requires.in
+++ b/find-requires.in
@@ -46,6 +46,7 @@ liblist=`echo "$filelist" | egrep -v "/usr/lib(64)?/gcj/" | xargs -r file | \
grep ":.*shared object" | cut -d : -f1`
ocamllist=`echo "$filelist" | xargs -r file | \
grep ":.*Objective caml interface file" | cut -d : -f1`
+phplist=`echo "$filelist" | grep -v /usr/doc | grep -v /usr/share/doc | egrep "\.php$"`
interplist=
perllist=
@@ -194,7 +195,7 @@ fi
#
# --- Php modules.
[ -x @RPMVENDORDIR@/php.req ] && \
- echo $filelist | tr '[:blank:]' \\n | @RPMVENDORDIR@/php.req | sort -u
+ echo $phplist | tr '[:blank:]' \\n | @RPMVENDORDIR@/php.req | sort -u
#
# --- Pkgconfig deps
diff --git a/php.req b/php.req
index af58ac1..c8209aa 100755
--- a/php.req
+++ b/php.req
@@ -20,10 +20,6 @@ foreach (@ARGV ? $ARGV : <> ) {
chomp;
$f = $_;
push @files, $f;
- # skip non-php files
- next unless ($f =~ /\.php$/);
- # skip doc files
- next if ($f =~ /^\/usr\/share\/doc/);
open(F, "< $f") or die;
if ($f =~ /$pear/) {