From 3c90d1dfaa17764be04dbf0371ff587b0e661ef3 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 20 Sep 2013 12:05:16 +0200 Subject: [PATCH] Update to upstream version 3.2.0 --- .gitignore | 1 + 0001-Add-depmap-for-sun.jdk-jconsole.patch | 32 ---------------------- javapackages-tools.spec | 5 +++- sources | 2 +- 4 files changed, 6 insertions(+), 34 deletions(-) delete mode 100644 0001-Add-depmap-for-sun.jdk-jconsole.patch diff --git a/.gitignore b/.gitignore index 1824083..0b0bfb7 100644 --- a/.gitignore +++ b/.gitignore @@ -48,3 +48,4 @@ /javapackages-3.1.0.tar.xz /javapackages-3.1.1.tar.xz /javapackages-3.1.2.tar.xz +/javapackages-3.2.0.tar.xz diff --git a/0001-Add-depmap-for-sun.jdk-jconsole.patch b/0001-Add-depmap-for-sun.jdk-jconsole.patch deleted file mode 100644 index 6cf4fd5..0000000 --- a/0001-Add-depmap-for-sun.jdk-jconsole.patch +++ /dev/null @@ -1,32 +0,0 @@ -From cef0a45f8b14e65e2ef061b1aa3250d00ecf9743 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 | 11 +++++++++++ - 1 file changed, 11 insertions(+) - -diff --git a/etc/javapackages-depmap.xml b/etc/javapackages-depmap.xml -index 72d57a3..16adc7e 100644 ---- a/etc/javapackages-depmap.xml -+++ b/etc/javapackages-depmap.xml -@@ -13,4 +13,15 @@ - ../lib/tools - - -+ -+ -+ sun.jdk -+ jconsole -+ SYSTEM -+ -+ -+ JAVA_HOME -+ ../lib/jconsole -+ -+ - --- -1.8.1.4 - diff --git a/javapackages-tools.spec b/javapackages-tools.spec index 0be5941..0553eb8 100644 --- a/javapackages-tools.spec +++ b/javapackages-tools.spec @@ -1,5 +1,5 @@ Name: javapackages-tools -Version: 3.1.2 +Version: 3.2.0 Release: 1%{?dist} Summary: Macros and scripts for Java packaging support @@ -133,6 +133,9 @@ popd %changelog +* Fri Sep 20 2013 Mikolaj Izdebski - 3.2.0-1 +- Update to upstream version 3.2.0 + * Fri Sep 20 2013 Mikolaj Izdebski - 3.1.2-1 - Update to upstream version 3.1.2 diff --git a/sources b/sources index f60bcc0..8f91e14 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -afd22756968d8a2860bf2fa4f9d1890e javapackages-3.1.2.tar.xz +9893c75995763c8b9dbb9ed9718d6e1c javapackages-3.2.0.tar.xz