diff options
| author | Dexter Morgan <dmorgan@mageia.org> | 2012-06-27 08:39:55 +0000 |
|---|---|---|
| committer | Dexter Morgan <dmorgan@mageia.org> | 2012-06-27 08:39:55 +0000 |
| commit | 0de8205ae537dd8e677c4d6690d039de1fbe0a3c (patch) | |
| tree | 783e0c35028f09eddfb104c6648bc7577b728c1b | |
| parent | 789e8a1cee8b9d62413e71eb3f8a79e4462ec588 (diff) | |
| download | rpm-setup-0de8205ae537dd8e677c4d6690d039de1fbe0a3c.tar rpm-setup-0de8205ae537dd8e677c4d6690d039de1fbe0a3c.tar.gz rpm-setup-0de8205ae537dd8e677c4d6690d039de1fbe0a3c.tar.bz2 rpm-setup-0de8205ae537dd8e677c4d6690d039de1fbe0a3c.tar.xz rpm-setup-0de8205ae537dd8e677c4d6690d039de1fbe0a3c.zip | |
Fix generation of provides for osgi and maven
| -rw-r--r-- | NEWS | 1 | ||||
| -rwxr-xr-x | find-provides.in | 10 |
2 files changed, 6 insertions, 5 deletions
@@ -1,3 +1,4 @@ +- Fix generation of provides for osgi and maven - Handle better osgi.prov by only looking at the wanted files ( remove error at rpm building - Handle better maven.prov by only looking at the wanted files ( remove error at rpm building ) - Add support for osgi and maven provide diff --git a/find-provides.in b/find-provides.in index be99d57..b134058 100755 --- a/find-provides.in +++ b/find-provides.in @@ -10,7 +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') +mavenlist=$(echo "$filelist" |egrep '/usr/share/maven-fragments/*') osgilist=$(echo "$filelist" |egrep "^(.*\.jar|((/usr/lib(64)|/usr/share).*/MANIFEST.MF))") # @@ -148,8 +148,8 @@ fi # # --- osgi provides if [ -x @RPMLIBDIR@/osgi.prov ];then - if [ ! -z $osgilist ]; then - echo $osgilist | tr '[:blank:]' '\n' | @RPMLIBDIR@/osgi.prov \ + if [ ! -z "$osgilist" ]; then + echo "$osgilist" | tr '[:blank:]' '\n' | @RPMLIBDIR@/osgi.prov \ && test ${PIPESTATUS[2]} -ne 0 && echo 'error: @RPMLIBDIR@/osgi.prov failed' >&2 && exit 1 fi fi @@ -157,8 +157,8 @@ fi # # --- maven provides if [ -x @RPMLIBDIR@/maven.prov ];then - if [ ! -z $mavenlist ]; then - echo $mavenlist | tr '[:blank:]' '\n' | @RPMLIBDIR@/maven.prov \ + if [ ! -z i"$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 |