From 6e05b67ebbc11a4bfcda51568863326ec59f0d17 Mon Sep 17 00:00:00 2001
From: Dexter Morgan <dmorgan@mageia.org>
Date: Sat, 31 Dec 2011 09:19:41 +0000
Subject: Better handle maven.prov

---
 NEWS             | 2 +-
 find-provides.in | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/NEWS b/NEWS
index eda3ade..f0d755f 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-Version 1.148 - 27 Dec 2011, by D.Morgan
+- Handle better maven.prov by only looking at the wanted files ( remove error at rpm building )
 - Add support for osgi and maven provide
 - Use upstream desktop-file.prov as we had exactly the same file
 
diff --git a/find-provides.in b/find-provides.in
index 0ef9b15..a52a234 100755
--- a/find-provides.in
+++ b/find-provides.in
@@ -10,6 +10,7 @@ solist=$(echo "$filelist" | egrep -v "^/lib/ld\.so|/usr/lib(64)?/gcj/" | egrep '
 pythonlist=
 tcllist=
 rubygemlist=$(echo "$filelist"| egrep "\.gemspec$")                                                                                                         
+mavenlist=$(echo "$filelist" |egrep '/usr/share/maven-poms/.*\.pom')
 
 #
 # --- Alpha does not mark 64bit dependencies
@@ -153,8 +154,10 @@ fi
 #
 # --- maven provides
 if [ -x @RPMLIBDIR@/maven.prov ];then
-  echo $filelist | tr '[:blank:]' '\n' | @RPMLIBDIR@/maven.prov \
-    && test ${PIPESTATUS[2]} -ne 0 && echo 'error: @RPMLIBDIR@/maven.prov failed' >&2 && exit 1
+  if [ ! -z $mavenlist ]; then
+    echo $mavenlist | tr '[:blank:]' '\n' | @RPMLIBDIR@/maven.prov \
+        && test ${PIPESTATUS[2]} -ne 0 && echo 'error: @RPMLIBDIR@/maven.prov failed' >&2 && exit 1
+  fi
 fi
 
 exit 0
-- 
cgit v1.2.1