From cf7d1ede3bd35cb1ae29915a203f4d243e985e02 Mon Sep 17 00:00:00 2001 From: Stanislav Ochotnicky Date: Mon, 9 Sep 2013 13:35:35 +0200 Subject: [PATCH 01/16] Update to upstream version 3.0.2 - Add separate python-javapackages subpackage - Add separate fedora-review-plugin-java subpackage - Enable part of unit tests --- .gitignore | 3 ++ javapackages-tools.spec | 63 +++++++++++++++++++++++++++++++++++++++-- sources | 2 +- 3 files changed, 65 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 3e2d9aa..667a0fd 100644 --- a/.gitignore +++ b/.gitignore @@ -40,3 +40,6 @@ /javapackages-0.15.0.tar.xz /javapackages-2.0.0.tar.xz /javapackages-2.0.1.tar.xz +/javapackages-3.0.0.tar.xz +/javapackages-3.0.1.tar.xz +/javapackages-3.0.2.tar.xz diff --git a/javapackages-tools.spec b/javapackages-tools.spec index 10737b8..208d613 100644 --- a/javapackages-tools.spec +++ b/javapackages-tools.spec @@ -1,21 +1,29 @@ Name: javapackages-tools -Version: 2.0.1 +Version: 3.0.2 Release: 1%{?dist} Summary: Macros and scripts for Java packaging support License: BSD URL: https://fedorahosted.org/javapackages/ Source0: https://fedorahosted.org/released/javapackages/javapackages-%{version}.tar.xz + +# temporary for rebuild with classifier support +Source1: google-guice-sisu-guice-noaop.xml + BuildArch: noarch BuildRequires: jpackage-utils BuildRequires: asciidoc BuildRequires: xmlto +BuildRequires: python-lxml +BuildRequires: python2-devel +BuildRequires: python-setuptools Requires: coreutils Requires: libxslt Requires: lua Requires: python +Requires: python-javapackages Provides: jpackage-utils = %{version}-%{release} Obsoletes: jpackage-utils < %{version}-%{release} @@ -27,7 +35,7 @@ This package provides macros and scripts to support Java packaging. Summary: Macros and scripts for Maven packaging support Requires: %{name} = %{version}-%{release} Requires: maven -Requires: xmvn +Requires: xmvn >= 1.0.0-0.1 # POM files needed by maven itself Requires: apache-commons-parent Requires: apache-parent @@ -61,6 +69,23 @@ Requires: maven-surefire-provider-testng %description -n maven-local This package provides macros and scripts to support packaging Maven artifacts. +%package -n python-javapackages +Summary: Module for handling various files for Java packaging +Requires: python-lxml + +%description -n python-javapackages +Module for handling, querying and manipulating of various files for Java +packaging in Linux distributions + +%package -n fedora-review-plugin-java +Summary: fedora-review plugin for checking Java packaging guidelines +License: GPLv2+ +Requires: fedora-review + +%description -n fedora-review-plugin-java +%{summary}. + + %prep %setup -q -n javapackages-%{version} @@ -68,19 +93,53 @@ This package provides macros and scripts to support packaging Maven artifacts. %build %configure ./build +pushd python +%{__python} setup.py build +popd %install ./install sed -e 's/.[17]$/&.gz/' -e 's/.py$/&*/' -i files-* +pushd python +%{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT +popd + +cp %{SOURCE1} %{buildroot}%{_mavendepmapfragdir}/ + +%check +pushd python +%{__python} setup.py test +popd + %files -f files-common %doc LICENSE %files -n maven-local -f files-maven +%{_mavendepmapfragdir}/*xml + +%files -n python-javapackages +%doc LICENSE +%{python_sitelib}/javapackages* + +%files -n fedora-review-plugin-java +%{_datadir}/fedora-review/plugins/* %changelog +* Tue Sep 10 2013 Stanislav Ochotnicky 3.0.2-1 +- Update to upstream version 3.0.2 +- Add separate python-javapackages subpackage +- Add separate fedora-review-plugin-java subpackage +- Enable part of unit tests + +* Tue Sep 3 2013 Stanislav Ochotnicky 3.0.0-0.2 +- Fix javadoc directory override + +* Tue Sep 3 2013 Stanislav Ochotnicky 3.0.0-0.1 +- Update to upstream pre-release version 3.0.0 + * 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 diff --git a/sources b/sources index dc334cb..8ec1cad 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c46ed5e20dc9a06f5336ac9420d15a3c javapackages-2.0.1.tar.xz +89a466cee0ad19a6b5ea02fc796f1e33 javapackages-3.0.2.tar.xz From ef7ed15f5c5c47b7accca7a5e22c2998e7eef618 Mon Sep 17 00:00:00 2001 From: Stanislav Ochotnicky Date: Tue, 10 Sep 2013 14:27:26 +0200 Subject: [PATCH 02/16] Add forgotten depmap --- google-guice-sisu-guice-noaop.xml | 50 +++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 google-guice-sisu-guice-noaop.xml diff --git a/google-guice-sisu-guice-noaop.xml b/google-guice-sisu-guice-noaop.xml new file mode 100644 index 0000000..c884b3b --- /dev/null +++ b/google-guice-sisu-guice-noaop.xml @@ -0,0 +1,50 @@ + + + 1.5 + + + com.google.inject + guice + 3.1.3 + no_aop + + + JPP/guice + google-guice + 3.1.3 + + + + + org.sonatype.sisu + sisu-guice + no_aop + 3.1.3 + + + JPP/guice + google-guice + 3.1.3 + + + + aopalliance + aopalliance + + + cglib + cglib + + + com.google.guava + guava + + + javax.inject + javax.inject + + + org.slf4j + slf4j-api + + From f6051e97826ed19c05712607f72228c8a5682fc7 Mon Sep 17 00:00:00 2001 From: Stanislav Ochotnicky Date: Tue, 10 Sep 2013 16:44:04 +0200 Subject: [PATCH 03/16] Make sure we do not provide google guice mapping --- google-guice-sisu-guice-noaop.xml | 1 + javapackages-tools.spec | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/google-guice-sisu-guice-noaop.xml b/google-guice-sisu-guice-noaop.xml index c884b3b..bf417a6 100644 --- a/google-guice-sisu-guice-noaop.xml +++ b/google-guice-sisu-guice-noaop.xml @@ -1,6 +1,7 @@ 1.5 + com.google.inject diff --git a/javapackages-tools.spec b/javapackages-tools.spec index 208d613..243dcbe 100644 --- a/javapackages-tools.spec +++ b/javapackages-tools.spec @@ -1,6 +1,6 @@ Name: javapackages-tools Version: 3.0.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Macros and scripts for Java packaging support License: BSD @@ -128,6 +128,9 @@ popd %changelog +* Tue Sep 10 2013 Stanislav Ochotnicky - 3.0.2-2 +- Make sure we do not provide google guice mapping + * Tue Sep 10 2013 Stanislav Ochotnicky 3.0.2-1 - Update to upstream version 3.0.2 - Add separate python-javapackages subpackage From 94434ee41baa6ebedb4ab0c4ee1fcc725ca063e3 Mon Sep 17 00:00:00 2001 From: Stanislav Ochotnicky Date: Tue, 10 Sep 2013 17:20:26 +0200 Subject: [PATCH 04/16] Fix a typo in temporary depmap --- google-guice-sisu-guice-noaop.xml | 5 +++-- javapackages-tools.spec | 5 ++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/google-guice-sisu-guice-noaop.xml b/google-guice-sisu-guice-noaop.xml index bf417a6..1a19b8f 100644 --- a/google-guice-sisu-guice-noaop.xml +++ b/google-guice-sisu-guice-noaop.xml @@ -1,7 +1,8 @@ - + + 1.5 - + com.google.inject diff --git a/javapackages-tools.spec b/javapackages-tools.spec index 243dcbe..c5f1f3a 100644 --- a/javapackages-tools.spec +++ b/javapackages-tools.spec @@ -1,6 +1,6 @@ Name: javapackages-tools Version: 3.0.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Macros and scripts for Java packaging support License: BSD @@ -128,6 +128,9 @@ popd %changelog +* Tue Sep 10 2013 Stanislav Ochotnicky - 3.0.2-3 +- Fix a typo in temporary depmap + * Tue Sep 10 2013 Stanislav Ochotnicky - 3.0.2-2 - Make sure we do not provide google guice mapping From 695fc6bab5818ba4e3d9b7cabaa5fa1dbcb79653 Mon Sep 17 00:00:00 2001 From: Stanislav Ochotnicky Date: Wed, 11 Sep 2013 09:38:20 +0200 Subject: [PATCH 05/16] Update to upstream version 3.0.3 --- .gitignore | 1 + google-guice-sisu-guice-noaop.xml | 2 -- javapackages-tools.spec | 7 +++++-- sources | 2 +- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 667a0fd..8c47402 100644 --- a/.gitignore +++ b/.gitignore @@ -43,3 +43,4 @@ /javapackages-3.0.0.tar.xz /javapackages-3.0.1.tar.xz /javapackages-3.0.2.tar.xz +/javapackages-3.0.3.tar.xz diff --git a/google-guice-sisu-guice-noaop.xml b/google-guice-sisu-guice-noaop.xml index 1a19b8f..a53409a 100644 --- a/google-guice-sisu-guice-noaop.xml +++ b/google-guice-sisu-guice-noaop.xml @@ -13,7 +13,6 @@ JPP/guice google-guice - 3.1.3 @@ -26,7 +25,6 @@ JPP/guice google-guice - 3.1.3 diff --git a/javapackages-tools.spec b/javapackages-tools.spec index c5f1f3a..d323c36 100644 --- a/javapackages-tools.spec +++ b/javapackages-tools.spec @@ -1,6 +1,6 @@ Name: javapackages-tools -Version: 3.0.2 -Release: 3%{?dist} +Version: 3.0.3 +Release: 1%{?dist} Summary: Macros and scripts for Java packaging support License: BSD @@ -128,6 +128,9 @@ popd %changelog +* Wed Sep 11 2013 Stanislav Ochotnicky - 3.0.3-1 +- Update to upstream version 3.0.3 + * Tue Sep 10 2013 Stanislav Ochotnicky - 3.0.2-3 - Fix a typo in temporary depmap diff --git a/sources b/sources index 8ec1cad..fe044c9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -89a466cee0ad19a6b5ea02fc796f1e33 javapackages-3.0.2.tar.xz +db0ac4aaec70d0a632bd3b206c211009 javapackages-3.0.3.tar.xz From 69a88598c2ebc66a3d1ff67f87d0e6213a88176f Mon Sep 17 00:00:00 2001 From: Stanislav Ochotnicky Date: Mon, 16 Sep 2013 10:09:39 +0200 Subject: [PATCH 06/16] Update to upstream version 3.0.4 --- .gitignore | 1 + javapackages-tools.spec | 11 +++++++++-- sources | 2 +- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 8c47402..dabbf90 100644 --- a/.gitignore +++ b/.gitignore @@ -44,3 +44,4 @@ /javapackages-3.0.1.tar.xz /javapackages-3.0.2.tar.xz /javapackages-3.0.3.tar.xz +/javapackages-3.0.4.tar.xz diff --git a/javapackages-tools.spec b/javapackages-tools.spec index d323c36..db1b0a6 100644 --- a/javapackages-tools.spec +++ b/javapackages-tools.spec @@ -1,5 +1,5 @@ Name: javapackages-tools -Version: 3.0.3 +Version: 3.0.4 Release: 1%{?dist} Summary: Macros and scripts for Java packaging support @@ -111,13 +111,17 @@ cp %{SOURCE1} %{buildroot}%{_mavendepmapfragdir}/ pushd python %{__python} setup.py test popd +pushd test +%{__python} -m unittest discover -p '*_test.py' +popd + %files -f files-common %doc LICENSE %files -n maven-local -f files-maven -%{_mavendepmapfragdir}/*xml +%{_mavendepmapfragdir}/google-guice-sisu-guice-noaop.xml %files -n python-javapackages %doc LICENSE @@ -128,6 +132,9 @@ popd %changelog +* Fri Sep 13 2013 Stanislav Ochotnicky - 3.0.4-1 +- Update to upstream version 3.0.4 + * Wed Sep 11 2013 Stanislav Ochotnicky - 3.0.3-1 - Update to upstream version 3.0.3 diff --git a/sources b/sources index fe044c9..b0bfa48 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -db0ac4aaec70d0a632bd3b206c211009 javapackages-3.0.3.tar.xz +36cf1f04da156cb98d35fbf68361f62b javapackages-3.0.4.tar.xz From 9603cb015c09a0b5acbdd4442825c338d75ff0f5 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 16 Sep 2013 11:11:37 +0200 Subject: [PATCH 07/16] Add depmap for sun.jdk:jconsole --- 0001-Add-depmap-for-sun.jdk-jconsole.patch | 32 ++++++++++++++++++++++ javapackages-tools.spec | 8 +++++- 2 files changed, 39 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..6cf4fd5 --- /dev/null +++ b/0001-Add-depmap-for-sun.jdk-jconsole.patch @@ -0,0 +1,32 @@ +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 db1b0a6..c58ad65 100644 --- a/javapackages-tools.spec +++ b/javapackages-tools.spec @@ -1,6 +1,6 @@ Name: javapackages-tools Version: 3.0.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Macros and scripts for Java packaging support License: BSD @@ -10,6 +10,8 @@ Source0: https://fedorahosted.org/released/javapackages/javapackages-%{ve # temporary for rebuild with classifier support Source1: google-guice-sisu-guice-noaop.xml +Patch0001: 0001-Add-depmap-for-sun.jdk-jconsole.patch + BuildArch: noarch BuildRequires: jpackage-utils @@ -89,6 +91,7 @@ Requires: fedora-review %prep %setup -q -n javapackages-%{version} +%patch0001 -p1 %build %configure @@ -132,6 +135,9 @@ popd %changelog +* Mon Sep 16 2013 Mikolaj Izdebski - 3.0.4-2 +- Add depmap for sun.jdk:jconsole + * Fri Sep 13 2013 Stanislav Ochotnicky - 3.0.4-1 - Update to upstream version 3.0.4 From 69e63eb3e0b180aee3ba2fa87093ffb1c8117e6b Mon Sep 17 00:00:00 2001 From: Stanislav Ochotnicky Date: Thu, 19 Sep 2013 11:31:22 +0200 Subject: [PATCH 08/16] Update to upstream version 3.1.0 --- .gitignore | 1 + javapackages-tools.spec | 8 ++++++-- sources | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index dabbf90..236768d 100644 --- a/.gitignore +++ b/.gitignore @@ -45,3 +45,4 @@ /javapackages-3.0.2.tar.xz /javapackages-3.0.3.tar.xz /javapackages-3.0.4.tar.xz +/javapackages-3.1.0.tar.xz diff --git a/javapackages-tools.spec b/javapackages-tools.spec index c58ad65..3cc8f79 100644 --- a/javapackages-tools.spec +++ b/javapackages-tools.spec @@ -1,6 +1,6 @@ Name: javapackages-tools -Version: 3.0.4 -Release: 2%{?dist} +Version: 3.1.0 +Release: 1%{?dist} Summary: Macros and scripts for Java packaging support License: BSD @@ -20,6 +20,7 @@ BuildRequires: xmlto BuildRequires: python-lxml BuildRequires: python2-devel BuildRequires: python-setuptools +BuildRequires: python-formencode Requires: coreutils Requires: libxslt @@ -135,6 +136,9 @@ popd %changelog +* Thu Sep 19 2013 Stanislav Ochotnicky - 3.1.0-1 +- Update to upstream version 3.1.0 + * Mon Sep 16 2013 Mikolaj Izdebski - 3.0.4-2 - Add depmap for sun.jdk:jconsole diff --git a/sources b/sources index b0bfa48..b6da316 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -36cf1f04da156cb98d35fbf68361f62b javapackages-3.0.4.tar.xz +64f4b46f5e85866bb7ebae7b1a6e3deb javapackages-3.1.0.tar.xz From 2eb825e859a015f2ee91d9ec6eff2c2ac9c0afdf Mon Sep 17 00:00:00 2001 From: Stanislav Ochotnicky Date: Thu, 19 Sep 2013 11:48:31 +0200 Subject: [PATCH 09/16] Remove deprecated patch --- javapackages-tools.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/javapackages-tools.spec b/javapackages-tools.spec index 3cc8f79..0d2748c 100644 --- a/javapackages-tools.spec +++ b/javapackages-tools.spec @@ -10,8 +10,6 @@ Source0: https://fedorahosted.org/released/javapackages/javapackages-%{ve # temporary for rebuild with classifier support Source1: google-guice-sisu-guice-noaop.xml -Patch0001: 0001-Add-depmap-for-sun.jdk-jconsole.patch - BuildArch: noarch BuildRequires: jpackage-utils @@ -92,7 +90,6 @@ Requires: fedora-review %prep %setup -q -n javapackages-%{version} -%patch0001 -p1 %build %configure From cf998c1d5ec635c1e4d82c3d0a82b6633a78f339 Mon Sep 17 00:00:00 2001 From: Stanislav Ochotnicky Date: Thu, 19 Sep 2013 16:28:48 +0200 Subject: [PATCH 10/16] Update to upstream version 3.1.1 --- .gitignore | 1 + javapackages-tools.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 236768d..aa8e26b 100644 --- a/.gitignore +++ b/.gitignore @@ -46,3 +46,4 @@ /javapackages-3.0.3.tar.xz /javapackages-3.0.4.tar.xz /javapackages-3.1.0.tar.xz +/javapackages-3.1.1.tar.xz diff --git a/javapackages-tools.spec b/javapackages-tools.spec index 0d2748c..4013992 100644 --- a/javapackages-tools.spec +++ b/javapackages-tools.spec @@ -1,5 +1,5 @@ Name: javapackages-tools -Version: 3.1.0 +Version: 3.1.1 Release: 1%{?dist} Summary: Macros and scripts for Java packaging support @@ -133,6 +133,9 @@ popd %changelog +* Thu Sep 19 2013 Stanislav Ochotnicky - 3.1.1-1 +- Update to upstream version 3.1.1 + * Thu Sep 19 2013 Stanislav Ochotnicky - 3.1.0-1 - Update to upstream version 3.1.0 diff --git a/sources b/sources index b6da316..902f3af 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -64f4b46f5e85866bb7ebae7b1a6e3deb javapackages-3.1.0.tar.xz +c170f1afbddcba59db6efdde53a8ed22 javapackages-3.1.1.tar.xz From a53fe03f587c0ded4b7fe2541ddee65a6820211f Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 20 Sep 2013 10:02:15 +0200 Subject: [PATCH 11/16] Update to upstream version 3.1.2 --- .gitignore | 1 + javapackages-tools.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index aa8e26b..1824083 100644 --- a/.gitignore +++ b/.gitignore @@ -47,3 +47,4 @@ /javapackages-3.0.4.tar.xz /javapackages-3.1.0.tar.xz /javapackages-3.1.1.tar.xz +/javapackages-3.1.2.tar.xz diff --git a/javapackages-tools.spec b/javapackages-tools.spec index 4013992..0be5941 100644 --- a/javapackages-tools.spec +++ b/javapackages-tools.spec @@ -1,5 +1,5 @@ Name: javapackages-tools -Version: 3.1.1 +Version: 3.1.2 Release: 1%{?dist} Summary: Macros and scripts for Java packaging support @@ -133,6 +133,9 @@ popd %changelog +* Fri Sep 20 2013 Mikolaj Izdebski - 3.1.2-1 +- Update to upstream version 3.1.2 + * Thu Sep 19 2013 Stanislav Ochotnicky - 3.1.1-1 - Update to upstream version 3.1.1 diff --git a/sources b/sources index 902f3af..f60bcc0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c170f1afbddcba59db6efdde53a8ed22 javapackages-3.1.1.tar.xz +afd22756968d8a2860bf2fa4f9d1890e javapackages-3.1.2.tar.xz From 3c90d1dfaa17764be04dbf0371ff587b0e661ef3 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 20 Sep 2013 12:05:16 +0200 Subject: [PATCH 12/16] 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 From 65b58a8c3a832eddc9679f435cc64af2942d7bf4 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 20 Sep 2013 12:49:18 +0200 Subject: [PATCH 13/16] Update to upstream version 3.2.1 --- .gitignore | 1 + javapackages-tools.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 0b0bfb7..843822a 100644 --- a/.gitignore +++ b/.gitignore @@ -49,3 +49,4 @@ /javapackages-3.1.1.tar.xz /javapackages-3.1.2.tar.xz /javapackages-3.2.0.tar.xz +/javapackages-3.2.1.tar.xz diff --git a/javapackages-tools.spec b/javapackages-tools.spec index 0553eb8..417bbbd 100644 --- a/javapackages-tools.spec +++ b/javapackages-tools.spec @@ -1,5 +1,5 @@ Name: javapackages-tools -Version: 3.2.0 +Version: 3.2.1 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.1-1 +- Update to upstream version 3.2.1 + * Fri Sep 20 2013 Mikolaj Izdebski - 3.2.0-1 - Update to upstream version 3.2.0 diff --git a/sources b/sources index 8f91e14..035147a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9893c75995763c8b9dbb9ed9718d6e1c javapackages-3.2.0.tar.xz +7a9828ec194b61fed3bc78615dd79f01 javapackages-3.2.1.tar.xz From 8b25c64f4d307977d0f62425d6dd565de593fd40 Mon Sep 17 00:00:00 2001 From: Michal Srb Date: Fri, 20 Sep 2013 14:03:33 +0200 Subject: [PATCH 14/16] Update to upstream version 3.2.2 --- .gitignore | 1 + javapackages-tools.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 843822a..627cfee 100644 --- a/.gitignore +++ b/.gitignore @@ -50,3 +50,4 @@ /javapackages-3.1.2.tar.xz /javapackages-3.2.0.tar.xz /javapackages-3.2.1.tar.xz +/javapackages-3.2.2.tar.xz diff --git a/javapackages-tools.spec b/javapackages-tools.spec index 417bbbd..20bff65 100644 --- a/javapackages-tools.spec +++ b/javapackages-tools.spec @@ -1,5 +1,5 @@ Name: javapackages-tools -Version: 3.2.1 +Version: 3.2.2 Release: 1%{?dist} Summary: Macros and scripts for Java packaging support @@ -133,6 +133,9 @@ popd %changelog +* Fri Sep 20 2013 Michal Srb - 3.2.2-1 +- Update to upstream version 3.2.2 + * Fri Sep 20 2013 Mikolaj Izdebski - 3.2.1-1 - Update to upstream version 3.2.1 diff --git a/sources b/sources index 035147a..10a83a8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7a9828ec194b61fed3bc78615dd79f01 javapackages-3.2.1.tar.xz +f8040afde9cba00dc0f291068caaa9cb javapackages-3.2.2.tar.xz From 3bb5dab022320f1b4513d039a54249c96d3e6c2c Mon Sep 17 00:00:00 2001 From: Stanislav Ochotnicky Date: Tue, 24 Sep 2013 17:44:02 +0200 Subject: [PATCH 15/16] Update to upstream version 3.2.3 --- .gitignore | 1 + javapackages-tools.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 627cfee..49efc83 100644 --- a/.gitignore +++ b/.gitignore @@ -51,3 +51,4 @@ /javapackages-3.2.0.tar.xz /javapackages-3.2.1.tar.xz /javapackages-3.2.2.tar.xz +/javapackages-3.2.3.tar.xz diff --git a/javapackages-tools.spec b/javapackages-tools.spec index 20bff65..4a6d34e 100644 --- a/javapackages-tools.spec +++ b/javapackages-tools.spec @@ -1,5 +1,5 @@ Name: javapackages-tools -Version: 3.2.2 +Version: 3.2.3 Release: 1%{?dist} Summary: Macros and scripts for Java packaging support @@ -133,6 +133,9 @@ popd %changelog +* Tue Sep 24 2013 Stanislav Ochotnicky - 3.2.3-1 +- Update to upstream version 3.2.3 + * Fri Sep 20 2013 Michal Srb - 3.2.2-1 - Update to upstream version 3.2.2 diff --git a/sources b/sources index 10a83a8..5716b4b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f8040afde9cba00dc0f291068caaa9cb javapackages-3.2.2.tar.xz +f6663391c49a26c87979ccd449df37ee javapackages-3.2.3.tar.xz From 95a15c4af89ca8f953a786f5e8ec8dee79fb9c6f Mon Sep 17 00:00:00 2001 From: Stanislav Ochotnicky Date: Tue, 24 Sep 2013 18:23:04 +0200 Subject: [PATCH 16/16] Update to upstream version 3.2.4 --- .gitignore | 1 + javapackages-tools.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 49efc83..e07d02a 100644 --- a/.gitignore +++ b/.gitignore @@ -52,3 +52,4 @@ /javapackages-3.2.1.tar.xz /javapackages-3.2.2.tar.xz /javapackages-3.2.3.tar.xz +/javapackages-3.2.4.tar.xz diff --git a/javapackages-tools.spec b/javapackages-tools.spec index 4a6d34e..050d8f8 100644 --- a/javapackages-tools.spec +++ b/javapackages-tools.spec @@ -1,5 +1,5 @@ Name: javapackages-tools -Version: 3.2.3 +Version: 3.2.4 Release: 1%{?dist} Summary: Macros and scripts for Java packaging support @@ -133,6 +133,9 @@ popd %changelog +* Tue Sep 24 2013 Stanislav Ochotnicky - 3.2.4-1 +- Update to upstream version 3.2.4 + * Tue Sep 24 2013 Stanislav Ochotnicky - 3.2.3-1 - Update to upstream version 3.2.3 diff --git a/sources b/sources index 5716b4b..25cc136 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f6663391c49a26c87979ccd449df37ee javapackages-3.2.3.tar.xz +b80566ad2f224ca39e7f0d408ec284c6 javapackages-3.2.4.tar.xz