[java-sig-commits] [javapackages] Fix rpm macro expansion problem when not on separate line
Stanislav Ochotnicky
sochotni at fedoraproject.org
Tue Jun 28 08:17:18 UTC 2011
commit 4e077d783bb8686eac3086998f68069b2e05795a
Author: Stanislav Ochotnicky <sochotnicky at redhat.com>
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}
#==============================================================================
More information about the java-sig-commits
mailing list