rpm/javapackages-tools
SHA256
1
0
Fork 0
forked from pool/javapackages-tools
Code Pull Requests Activity

Accepting request 359129 from home:TheBlackCat:branches:Java:packages

Browse Source 
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.
84211c0ee7

OBS-URL: https://build.opensuse.org/request/show/359129
OBS-URL: https://build.opensuse.org/package/show/Java:packages/javapackages-tools?expand=0&rev=30
This commit is contained in:
Tomáš Chvátal 2016-02-13 08:52:00 +00:00 committed by Git OBS Bridge
parent f350fb4129
commit ceef81b960
3 changed files with 35 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
create_valid_xml_comments.patch Normal file
View File

@ -0,0 +1,22 @@
From 84211c0ee761e93ee507f5d37e9fc80ec377e89d Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@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.")

10
javapackages-tools.changes
View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Fri Feb 12 15:21:42 UTC 2016 - toddrme2178@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 - tchvatal@suse.com

3
javapackages-tools.spec
View File

@ -30,6 +30,8 @@ Patch0: suse-use-libdir.patch
#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
@ -126,6 +128,7 @@ This package provides non-essential macros and scripts to support Java packaging
%setup -q -n javapackages-%{version}
%patch0 -p1
%patch1 -p1
%patch2 -p1
%build
%configure --rpmconfigdir=%{_sysconfdir}/rpm/