diff options
| author | Dexter Morgan <dmorgan@mageia.org> | 2011-12-31 09:19:41 +0000 |
|---|---|---|
| committer | Dexter Morgan <dmorgan@mageia.org> | 2011-12-31 09:19:41 +0000 |
| commit | 6e05b67ebbc11a4bfcda51568863326ec59f0d17 (patch) | |
| tree | 77f61a6d719c22cdb5ed883af4db5559ed3678b5 | |
| parent | 7b265a3453b5a6d3bceaff684d9ba97ec92226f6 (diff) | |
| download | rpm-setup-6e05b67ebbc11a4bfcda51568863326ec59f0d17.tar rpm-setup-6e05b67ebbc11a4bfcda51568863326ec59f0d17.tar.gz rpm-setup-6e05b67ebbc11a4bfcda51568863326ec59f0d17.tar.bz2 rpm-setup-6e05b67ebbc11a4bfcda51568863326ec59f0d17.tar.xz rpm-setup-6e05b67ebbc11a4bfcda51568863326ec59f0d17.zip | |
Better handle maven.prov
| -rw-r--r-- | NEWS | 2 | ||||
| -rwxr-xr-x | find-provides.in | 7 |
2 files changed, 6 insertions, 3 deletions
@@ -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 |