[java-sig-commits] [javapackages/0.2.x] Add default parameters for add_maven_depmap
Stanislav Ochotnicky
sochotni at fedoraproject.org
Tue Nov 29 14:08:05 UTC 2011
commit 772ea1cc2d5a57e5da080950bbfbb7ad65922492
Author: Stanislav Ochotnicky <sochotnicky at redhat.com>
Date: Tue Nov 29 15:02:17 2011 +0100
Add default parameters for add_maven_depmap
Now when it is called without arguments it behaves as if it was calle as:
%add_maven_depmap JPP-%{name}.pom %{name}.jar
macros.fjava | 28 ++++++++++++++++++++--------
1 files changed, 20 insertions(+), 8 deletions(-)
---
diff --git a/macros.fjava b/macros.fjava
index 0c14779..9d52d92 100644
--- a/macros.fjava
+++ b/macros.fjava
@@ -42,24 +42,36 @@
#
%add_maven_depmap(f:a:) \
+# default values \
+%if %# == 0 \
+ _pompart="JPP-%{name}.pom" \
+ _jarpart="%{name}.jar" \
+%else \
+ _pompart="%1" \
+ _jarpart="%2" \
+%endif \
install -dm 755 $RPM_BUILD_ROOT/%{_mavendepmapfragdir}\
-_jpath="jar_missing_in_jar_paths" \
-if [ -f %{buildroot}/%{_javadir}/%2 ]; then \
- _jpath="%{buildroot}/%{_javadir}/%2" \
-elif [ -f %{buildroot}/%{_javajnidir}/%2 ]; then \
- _jpath="%{buildroot}/%{_javajnidir}/%2" \
-elif [ -f %{buildroot}/%{_jnidir}/%2 ]; then \
- _jpath="%{buildroot}/%{_jnidir}/%2" \
+_jpath="$_jarpart" \
+if [ -f %{buildroot}/%{_javadir}/$_jarpart ]; then \
+ _jpath="%{buildroot}/%{_javadir}/$_jarpart" \
+elif [ -f %{buildroot}/%{_javajnidir}/$_jarpart ]; then \
+ _jpath="%{buildroot}/%{_javajnidir}/$_jarpart" \
+elif [ -f %{buildroot}/%{_jnidir}/$_jarpart ]; then \
+ _jpath="%{buildroot}/%{_jnidir}/$_jarpart" \
fi \
python -m %{_datadir}/java-utils/maven_depmap %{-a} \\\
%{buildroot}%{_mavendepmapfragdir}/%{name}%{-f*:-%{-f*}} \\\
- %{buildroot}%{_mavenpomdir}/%1 \\\
+ %{buildroot}%{_mavenpomdir}/$_pompart \\\
%if %# == 2 \
"${_jpath}" \\\
%endif \
+%if %# == 0 \
+ "${_jpath}" \\\
+%endif \
\
%{nil}
#==============================================================================
+
More information about the java-sig-commits
mailing list