From 718411175f47e9ad203fe4dbd606fd74bdd07356 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 16 Sep 2013 11:22:18 +0200 Subject: [PATCH] Add depmap for sun.jdk:jconsole - Resolves: rhbz#1008363 --- 0001-Add-depmap-for-sun.jdk-jconsole.patch | 33 ++++++++++++++++++++++ javapackages-tools.spec | 9 +++++- 2 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 0001-Add-depmap-for-sun.jdk-jconsole.patch diff --git a/0001-Add-depmap-for-sun.jdk-jconsole.patch b/0001-Add-depmap-for-sun.jdk-jconsole.patch new file mode 100644 index 0000000..1a01f6c --- /dev/null +++ b/0001-Add-depmap-for-sun.jdk-jconsole.patch @@ -0,0 +1,33 @@ +From 9085aa9272cd16b30095e4dd32cb76c84f82362e Mon Sep 17 00:00:00 2001 +From: Mikolaj Izdebski +Date: Mon, 16 Sep 2013 11:10:12 +0200 +Subject: [PATCH] Add depmap for sun.jdk:jconsole + +--- + etc/javapackages-depmap.xml | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +diff --git a/etc/javapackages-depmap.xml b/etc/javapackages-depmap.xml +index 86b85c4..06e668c 100644 +--- a/etc/javapackages-depmap.xml ++++ b/etc/javapackages-depmap.xml +@@ -14,4 +14,16 @@ + SYSTEM + + ++ ++ ++ sun.jdk ++ jconsole ++ SYSTEM ++ ++ ++ JAVA_HOME ++ ../lib/jconsole ++ SYSTEM ++ ++ + +-- +1.8.1.4 + diff --git a/javapackages-tools.spec b/javapackages-tools.spec index 10737b8..f68e96f 100644 --- a/javapackages-tools.spec +++ b/javapackages-tools.spec @@ -1,6 +1,6 @@ Name: javapackages-tools Version: 2.0.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Macros and scripts for Java packaging support License: BSD @@ -8,6 +8,8 @@ URL: https://fedorahosted.org/javapackages/ Source0: https://fedorahosted.org/released/javapackages/javapackages-%{version}.tar.xz BuildArch: noarch +Patch0001: 0001-Add-depmap-for-sun.jdk-jconsole.patch + BuildRequires: jpackage-utils BuildRequires: asciidoc BuildRequires: xmlto @@ -64,6 +66,7 @@ This package provides macros and scripts to support packaging Maven artifacts. %prep %setup -q -n javapackages-%{version} +%patch0001 -p1 %build %configure @@ -81,6 +84,10 @@ sed -e 's/.[17]$/&.gz/' -e 's/.py$/&*/' -i files-* %changelog +* Mon Sep 16 2013 Mikolaj Izdebski - 2.0.1-2 +- Add depmap for sun.jdk:jconsole +- Resolves: rhbz#1008363 + * Fri Jul 26 2013 Mikolaj Izdebski - 2.0.1-1 - Update to upstream version 2.0.1 - Fix creation of artifact aliases, resolves: rhbz#988462