From 5ebe2c1040c4be5c17d1de111ae0a056e4dc118d Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Nov 16 2015 14:10:53 +0000 Subject: import rh-java-common-javapackages-tools-4.3.2-1.10.el7 --- diff --git a/SOURCES/0006-java-functions-Fix-incorrect-quotation.patch b/SOURCES/0006-java-functions-Fix-incorrect-quotation.patch new file mode 100644 index 0000000..aa8eaab --- /dev/null +++ b/SOURCES/0006-java-functions-Fix-incorrect-quotation.patch @@ -0,0 +1,26 @@ +From 5f288d664de147f4aa4f6685004c73b5e6c36593 Mon Sep 17 00:00:00 2001 +From: Michael Simacek +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.4.3 + diff --git a/SPECS/javapackages-tools.spec b/SPECS/javapackages-tools.spec index 6cc408f..0a85232 100644 --- a/SPECS/javapackages-tools.spec +++ b/SPECS/javapackages-tools.spec @@ -4,7 +4,7 @@ Name: %{?scl_prefix}%{pkg_name} Version: 4.3.2 -Release: 1.9%{?dist} +Release: 1.10%{?dist} Summary: Macros and scripts for Java packaging support @@ -19,6 +19,7 @@ Patch1: 0002-mvn_artifact-Fix-TypeError-process_raw_request-got-a.patch Patch2: 0003-Fix-invalid-XML.patch Patch3: 0004-maven.req-Force-namespace-for-R-on-subpackage.patch Patch4: 0005-Replace-all-dashes-with-dots-in-versioned-provides-a.patch +Patch5: 0006-java-functions-Fix-incorrect-quotation.patch BuildArch: noarch @@ -127,6 +128,7 @@ This package provides non-essential macros and scripts to support Java packaging %patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 cp %{SOURCE1} configs/configuration.xml cp etc/javapackages-config.json etc/javapackages-config.json.1 @@ -185,6 +187,10 @@ cp etc/javapackages-config.json.1 etc/javapackages-config.json %{?_scl_root}%{python_sitelib}/javapackages* %changelog +* Wed Jul 22 2015 Michal Srb - 4.3.2-1.10 +- Fix incorrect quotation in java-functions +- Resolves: rhbz#1245266 + * Mon Apr 27 2015 Mikolaj Izdebski - 4.3.2-1.9 - Rebuild for final RHSCL 2.0 release