[java-sig-commits] [javapackages/0.2.x] Fix rpm macro expansion problem when not on separate line

[Stanislav Ochotnicky]

commit 4bd4aff1f5cf10a1849d25c45a594a0faacf1a4f
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com&gt;
Date:   Thu Jun 23 14:19:19 2011 +0200

    Fix rpm macro expansion problem when not on separate line
    
    We add one empty line at the end so we can use "\\\" in both if-branches

 macros.fjava |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/macros.fjava b/macros.fjava
index d96db13..433c542 100644
--- a/macros.fjava
+++ b/macros.fjava
@@ -43,9 +43,13 @@
 
 %add_maven_depmap(f:a:) \
 install -dm 755 $RPM_BUILD_ROOT/%{_mavendepmapfragdir}\
-python -m %{_datadir}/java-utils/maven_depmap \\\
+python -m %{_datadir}/java-utils/maven_depmap %{-a} \\\
           %{buildroot}%{_mavendepmapfragdir}/%{name}%{-f*:-%{-f*}} \\\
-          %{buildroot}%{_mavenpomdir}/%1 %if %# == 2 %{buildroot}/%{_javadir}/%2 %{-a}
%endif \
+          %{buildroot}%{_mavenpomdir}/%1 \\\
+%if %# == 2 \
+	%{buildroot}/%{_javadir}/%2 \\\
+%endif \
+\
 %{nil}
 
 #==============================================================================