Hello community, here is the log from the commit of package javapackages-tools for openSUSE:Factory checked in at 2016-02-17 10:33:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/javapackages-tools (Old) and /work/SRC/openSUSE:Factory/.javapackages-tools.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "javapackages-tools" Changes: -------- --- /work/SRC/openSUSE:Factory/javapackages-tools/javapackages-tools.changes 2015-04-02 16:00:53.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.javapackages-tools.new/javapackages-tools.changes 2016-02-17 12:13:11.000000000 +0100 @@ -1,0 +2,17 @@ +Fri Feb 12 15:21:42 UTC 2016 - toddrme2...@gmail.com + +- Add create_valid_xml_comments.patch + python-lxml 3.5.0 introduces validation for xml comments, and + one of the comments created in this package were not valid. + This patch fixes the problem. It backported from upstream and + should be in the next release. + https://github.com/mizdebsk/javapackages/commit/84211c0ee761e93ee507f5d37e9fc80ec377e89d + +------------------------------------------------------------------- +Mon Feb 8 20:23:42 UTC 2016 - tchva...@suse.com + +- Version update to 4.6.0: + * various bugfixes for maven tooling + * introduction to gradle-local package for gradle packaging + +------------------------------------------------------------------- Old: ---- javapackages-4.4.0.tar.xz New: ---- create_valid_xml_comments.patch javapackages-4.6.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ javapackages-tools.spec ++++++ --- /var/tmp/diff_new_pack.hEdzIY/_old 2016-02-17 12:13:11.000000000 +0100 +++ /var/tmp/diff_new_pack.hEdzIY/_new 2016-02-17 12:13:11.000000000 +0100 @@ -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 @@ -30,6 +30,8 @@ #PATCH-FIX-SUSE: We put macros to /etc/rpm directly so make it reflected by # the install script Patch1: suse-macros-install-location.patch +#PATCH-FIX-Upstream: create_valid_xml_comments.patch -- make comments that pass python-lxml validation - https://github.com/mizdebsk/javapackages/commit/84211c0ee761e93ee507f5d37e9fc80ec377e89d +Patch2: create_valid_xml_comments.patch BuildRequires: asciidoc BuildRequires: dia BuildRequires: fdupes @@ -77,6 +79,16 @@ %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 @@ -116,6 +128,7 @@ %setup -q -n javapackages-%{version} %patch0 -p1 %patch1 -p1 +%patch2 -p1 %build %configure --rpmconfigdir=%{_sysconfdir}/rpm/ @@ -144,6 +157,10 @@ %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 ++++++ create_valid_xml_comments.patch ++++++ >From 84211c0ee761e93ee507f5d37e9fc80ec377e89d Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski <mizde...@redhat.com> Date: Thu, 3 Dec 2015 06:58:58 +0100 Subject: [PATCH] Fix TravisCI test failure --- java-utils/pom_editor.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-utils/pom_editor.py b/java-utils/pom_editor.py index eac7ab1..364a443 100644 --- a/java-utils/pom_editor.py +++ b/java-utils/pom_editor.py @@ -580,7 +580,7 @@ def pom_remove_parent(pom=None): """[POM location]""" try: pom.replace_xml(pom.xpath_query_element("/pom:project/pom:parent"), - etree.Comment(" parent POM reference removed by maintainer --> ")) + etree.Comment(" parent POM reference removed by maintainer ")) except PomQueryNoMatch: raise PomQueryNoMatch("POM doesn't specify parent.") ++++++ javapackages-4.4.0.tar.xz -> javapackages-4.6.0.tar.xz ++++++ ++++ 10837 lines of diff (skipped) ++++++ suse-macros-install-location.patch ++++++ --- /var/tmp/diff_new_pack.hEdzIY/_old 2016-02-17 12:13:12.000000000 +0100 +++ /var/tmp/diff_new_pack.hEdzIY/_new 2016-02-17 12:13:12.000000000 +0100 @@ -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 @@ 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"