From 045191e449ee5d8ee13370ee8b8626ad87147b58 Mon Sep 17 00:00:00 2001
From: Guillaume Rousse <guillomovitch@mandriva.org>
Date: Sat, 20 Sep 2008 15:14:28 +0000
Subject: don't do php files filtering from inside php.req, but from
 find-requires, as per other language-specific dependencies

---
 find-requires.in | 3 ++-
 php.req          | 4 ----
 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/) {
-- 
cgit v1.2.1