diff --git a/javapackages-4.4.0.tar.xz b/javapackages-4.4.0.tar.xz deleted file mode 100644 index 7c08b4d..0000000 --- a/javapackages-4.4.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3e6afc39570619b72532aabd0cb84feb892920f977444d67eb2e34755c74e1b9 -size 184360 diff --git a/javapackages-4.6.0.tar.xz b/javapackages-4.6.0.tar.xz new file mode 100644 index 0000000..05a1c13 --- /dev/null +++ b/javapackages-4.6.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:62d447460d394fe7409c8f6a2e8b6448887b04668d6867586c7a0d282f3c13d8 +size 179680 diff --git a/javapackages-tools.changes b/javapackages-tools.changes index 5f81907..4737a33 100644 --- a/javapackages-tools.changes +++ b/javapackages-tools.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Feb 8 20:23:42 UTC 2016 - tchvatal@suse.com + +- Version update to 4.6.0: + * various bugfixes for maven tooling + * introduction to gradle-local package for gradle packaging + ------------------------------------------------------------------- Wed Apr 1 08:40:57 UTC 2015 - tchvatal@suse.com diff --git a/javapackages-tools.spec b/javapackages-tools.spec index 7a0d005..38160b2 100644 --- a/javapackages-tools.spec +++ b/javapackages-tools.spec @@ -1,7 +1,7 @@ # # spec file for package javapackages-tools # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: javapackages-tools -Version: 4.4.0 +Version: 4.6.0 Release: 0 Summary: Macros and scripts for Java packaging support License: BSD-3-Clause @@ -77,6 +77,16 @@ Requires: javapackages-local = %{version} %description -n maven-local This package provides macros and scripts to support packaging Maven artifacts. +%package -n gradle-local +Summary: Local mode for Gradle +Group: Development/Languages/Java +Requires: %{name} = %{version} +Requires: javapackages-local = %{version} + +%description -n gradle-local +This package implements local mode for Gradle, which allows artifact +resolution using XMvn resolver. + %package -n ivy-local Summary: Local mode for Apache Ivy Group: Development/Languages/Java @@ -144,6 +154,10 @@ rm -rf %{buildroot}%{_datadir}/fedora-review/ %files -n maven-local -f files-maven %defattr(-,root,root,-) +%files -n gradle-local -f files-gradle +%defattr(-,root,root) +%dir %{_datadir}/gradle-local + %files -n ivy-local -f files-ivy %defattr(-,root,root,-) %dir %{_sysconfdir}/ant.d diff --git a/suse-macros-install-location.patch b/suse-macros-install-location.patch index 32fff33..bc0ca3c 100644 --- a/suse-macros-install-location.patch +++ b/suse-macros-install-location.patch @@ -1,10 +1,10 @@ -Index: javapackages-4.4.0/install +Index: javapackages-4.6.0/install =================================================================== ---- javapackages-4.4.0.orig/install -+++ javapackages-4.4.0/install -@@ -126,8 +126,8 @@ inst_exec java-utils/java-wrapper "${jav - inst_data java-utils/maven_depmap.py "${javadir}-utils" +--- javapackages-4.6.0.orig/install ++++ javapackages-4.6.0/install +@@ -127,8 +127,8 @@ inst_data java-utils/maven_depmap.py "${ inst_data java-utils/pom_editor.py "${javadir}-utils" + inst_data java-utils/request-artifact.py "${javadir}-utils" -inst_data target/macros.jpackage "${rpmconfigdir}/macros.d" -inst_data target/macros.fjava "${rpmconfigdir}/macros.d" @@ -13,12 +13,3 @@ Index: javapackages-4.4.0/install inst_data target/build-classpath.1 "${mandir}/man1" inst_data target/build-jar-repository.1 "${mandir}/man1" -@@ -174,7 +174,7 @@ link "${m2home}/configuration-rpmbuild-r - inst_config etc/javapackages-config.json "${javaconfdir}" - - exec >files-local --inst_data target/macros.xmvn "${rpmconfigdir}/macros.d" -+inst_data target/macros.xmvn "${rpmconfigdir}" - - inst_data java-utils/mvn_alias.py "${javadir}-utils" - inst_data java-utils/mvn_artifact.py "${javadir}-utils"