[java-sig-commits] [javapackages] add_maven_depmap: do not generate broken .mfiles when compat packages are involved

[Michal Srb]

commit 1b3202d5bd33d2ae166d4bed4eace7b5323ffa67
Author: Michal Srb <msrb at redhat.com>
Date:   Thu Sep 12 14:31:49 2013 +0200

    add_maven_depmap: do not generate broken .mfiles when compat packages
    are involved

 etc/macros.fjava |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)
---
diff --git a/etc/macros.fjava b/etc/macros.fjava
index 5a82b4f..e1deef2 100644
--- a/etc/macros.fjava
+++ b/etc/macros.fjava
@@ -100,8 +100,13 @@ for ver in $(echo %{-v*} | tr ',' '\\n');do \
        echo ${_jpath/.jar/-$ver.jar} >>${_filelist} \
  fi \
 done \
+# remove unversioned jar and pom from .mfiles \
+_jpath=${_jpath#%{buildroot}} \
+sed -i "s:${_jpath/-%{version}.jar/.jar}::" ${_filelist} \
+sed -i "s:%{_mavenpomdir}/${_pompart/-$ver.pom/.pom}::" ${_filelist} \
 fi \
 sed -i 's:%{buildroot}::' ${_filelist} \
+sed -i '/^$/d' ${_filelist} \
 sort -u -o ${_filelist} ${_filelist} \
 \
 %{nil}