[jpackage-utils/f17] Backport addition of default arguments to add_maven_depmap

[Stanislav Ochotnicky]

commit 638b823245988fede4e81a4a66f7394e89263380
Author: Stanislav Ochotnicky <sochotnicky at redhat.com>
Date:   Thu Apr 19 12:41:26 2012 +0200

    Backport addition of default arguments to add_maven_depmap

 ...d-default-parameters-for-add_maven_depmap.patch |   63 ++++++++++++++++++++
 jpackage-utils.spec                                |    7 ++-
 2 files changed, 69 insertions(+), 1 deletions(-)
---
diff --git a/0002-Add-default-parameters-for-add_maven_depmap.patch b/0002-Add-default-parameters-for-add_maven_depmap.patch
new file mode 100644
index 0000000..399b91c
--- /dev/null
+++ b/0002-Add-default-parameters-for-add_maven_depmap.patch
@@ -0,0 +1,63 @@
+From 772ea1cc2d5a57e5da080950bbfbb7ad65922492 Mon Sep 17 00:00:00 2001
+From: Stanislav Ochotnicky <sochotnicky at redhat.com>
+Date: Tue, 29 Nov 2011 15:02:17 +0100
+Subject: [PATCH] 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}
+ 
+ #==============================================================================
+ 
+ 
++
+-- 
+1.7.7.6
+
diff --git a/jpackage-utils.spec b/jpackage-utils.spec
index 01d2f04..6388b1e 100644
--- a/jpackage-utils.spec
+++ b/jpackage-utils.spec
@@ -38,7 +38,7 @@
 
 Name:           jpackage-utils
 Version:        1.7.5
-Release:        17%{?dist}
+Release:        18%{?dist}
 Epoch:          0
 Summary:        JPackage utilities
 License:        BSD
@@ -54,6 +54,7 @@ Patch2:         %{name}-prefer-jre.patch
 Patch3:         %{name}-set-classpath.patch
 Patch4:         %{name}-jnidir.patch
 Patch5:         0001-Generate-maven-provides-from-fragments-instead-of-po.patch
+Patch6:         0002-Add-default-parameters-for-add_maven_depmap.patch
 Group:          Utilities
 
 Requires:       coreutils
@@ -82,6 +83,7 @@ cp -p %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE8} .
 tar xf javapackages-%{fj_version}.tar.xz
 cd javapackages-%{fj_version}
 %patch5 -p1
+%patch6 -p1
 
 %build
 echo "JPackage release %{distver} (%{distribution}) for %{buildarch}" \
@@ -242,6 +244,9 @@ EOF
 
 
 %changelog
+* Thu Apr 19 2012 Stanislav Ochotnicky <sochotnicky at redhat.com> - 0:1.7.5-18
+- Backport addition of default arguments to add_maven_depmap
+
 * Thu Mar 29 2012 Stanislav Ochotnicky <sochotnicky at redhat.com> - 0:1.7.5-17
 - Backport patch for generating depmaps from fragments