[javapackages-tools/f22] Backport fix for incorrect quotation in java-functions (rhbz#1178560)

Michael Šimáček msimacek at fedoraproject.org
Thu Mar 12 13:25:07 UTC 2015


commit 0fd1d45dcd1229ea83c81b5f8887905673747efa
Author: Michael Simacek <msimacek at redhat.com>
Date:   Thu Mar 12 14:24:15 2015 +0100

    Backport fix for incorrect quotation in java-functions (rhbz#1178560)

 ...ions-Fix-incorrect-quotation-rhbz-1178560.patch | 26 ++++++++++++++++++++++
 javapackages-tools.spec                            |  7 +++++-
 2 files changed, 32 insertions(+), 1 deletion(-)
---
diff --git a/0001-java-functions-Fix-incorrect-quotation-rhbz-1178560.patch b/0001-java-functions-Fix-incorrect-quotation-rhbz-1178560.patch
new file mode 100644
index 0000000..700a804
--- /dev/null
+++ b/0001-java-functions-Fix-incorrect-quotation-rhbz-1178560.patch
@@ -0,0 +1,26 @@
+From 5f288d664de147f4aa4f6685004c73b5e6c36593 Mon Sep 17 00:00:00 2001
+From: Michael Simacek <msimacek at redhat.com>
+Date: Wed, 11 Feb 2015 14:06:21 +0100
+Subject: [PATCH] [java-functions] Fix incorrect quotation (rhbz#1178560)
+
+---
+ java-utils/java-functions | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/java-utils/java-functions b/java-utils/java-functions
+index 8f6e22b..68e5593 100644
+--- a/java-utils/java-functions
++++ b/java-utils/java-functions
+@@ -297,8 +297,7 @@ run()
+     fi
+ 
+     # let's start
+-    exec "${JAVACMD}" ${FLAGS} -classpath "${CLASSPATH}" \
+-	${OPTIONS} "${MAIN_CLASS}" "${@}"
++    eval "exec \"\${JAVACMD}\" ${FLAGS} -classpath \"\${CLASSPATH}\" ${OPTIONS} \"\${MAIN_CLASS}\" \"\${@}\""
+ }
+ 
+ # Set JVM-related directories
+-- 
+2.1.0
+
diff --git a/javapackages-tools.spec b/javapackages-tools.spec
index 996db11..96dd7aa 100644
--- a/javapackages-tools.spec
+++ b/javapackages-tools.spec
@@ -9,7 +9,7 @@
 
 Name:           javapackages-tools
 Version:        4.3.2
-Release:        4%{?dist}
+Release:        5%{?dist}
 
 Summary:        Macros and scripts for Java packaging support
 
@@ -19,6 +19,7 @@ Source0:        https://fedorahosted.org/released/javapackages/javapackages-%{ve
 Patch0:         0001-mvn_artifact-Fix-TypeError-process_raw_request-got-a.patch
 Patch1:         0002-Replace-all-dashes-with-dots-in-versioned-provides-a.patch
 Patch2:         0003-Add-compatibility-with-lua-5.3.0.patch
+Patch3:         0001-java-functions-Fix-incorrect-quotation-rhbz-1178560.patch
 
 BuildArch:      noarch
 
@@ -180,6 +181,7 @@ This package provides non-essential macros and scripts to support Java packaging
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 %if 0%{?with_python3}
@@ -234,6 +236,9 @@ popd
 %doc LICENSE
 
 %changelog
+* Thu Mar 12 2015 Michael Simacek <msimacek at redhat.com> - 4.3.2-5
+- Backport fix for incorrect quotation in java-functions (rhbz#1178560)
+
 * Fri Jan 23 2015 Mikolaj Izdebski <mizdebsk at redhat.com> - 4.3.2-4
 - Add gradle-local subpackage
 - Allow conditional builds with tests skipped


More information about the scm-commits mailing list