[javapackages-tools] Fix pom_editor missing space between xmlns declarations
Michael Šimáček
msimacek at fedoraproject.org
Tue Oct 21 08:37:49 UTC 2014
commit 2ae8a120aad7b6ac81eeaab7f6507e70da2a66eb
Author: Michael Simacek <msimacek at redhat.com>
Date: Tue Oct 21 10:27:08 2014 +0200
Fix pom_editor missing space between xmlns declarations
...Fix-missing-space-between-xmlns-declarati.patch | 27 ++++++++++++++++++++
javapackages-tools.spec | 7 ++++-
2 files changed, 33 insertions(+), 1 deletions(-)
---
diff --git a/0001-pom_editor-Fix-missing-space-between-xmlns-declarati.patch b/0001-pom_editor-Fix-missing-space-between-xmlns-declarati.patch
new file mode 100644
index 0000000..dd409c6
--- /dev/null
+++ b/0001-pom_editor-Fix-missing-space-between-xmlns-declarati.patch
@@ -0,0 +1,27 @@
+From d35af95c5cba1b898a9b183076d1a88c534415b9 Mon Sep 17 00:00:00 2001
+From: Michael Simacek <msimacek at redhat.com>
+Date: Tue, 21 Oct 2014 10:23:08 +0200
+Subject: [PATCH] [pom_editor] Fix missing space between xmlns declarations
+
+---
+ java-utils/pom_editor.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/java-utils/pom_editor.py b/java-utils/pom_editor.py
+index ca8fe45..ce487e0 100644
+--- a/java-utils/pom_editor.py
++++ b/java-utils/pom_editor.py
+@@ -350,8 +350,8 @@ class Pom(XmlFile):
+ NSMAP = {'pom': 'http://maven.apache.org/POM/4.0.0',
+ 'xsi': 'http://www.w3.org/2001/XMLSchema-instance'}
+ NS = '{' + NSMAP['pom'] + '}'
+- XMLNS = ('xmlns="http://maven.apache.org/POM/4.0.0"'
+- 'xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"'
++ XMLNS = ('xmlns="http://maven.apache.org/POM/4.0.0" '
++ 'xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" '
+ 'xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 '
+ 'http://maven.apache.org/xsd/maven-4.0.0.xsd"')
+ DEPENDENCY_NODE = 'pom:dependency'
+--
+1.9.3
+
diff --git a/javapackages-tools.spec b/javapackages-tools.spec
index d95b541..5a5e59d 100644
--- a/javapackages-tools.spec
+++ b/javapackages-tools.spec
@@ -7,7 +7,7 @@
Name: javapackages-tools
Version: 4.2.0
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Macros and scripts for Java packaging support
@@ -16,6 +16,7 @@ URL: https://git.fedorahosted.org/git/javapackages.git
Source0: https://fedorahosted.org/released/javapackages/javapackages-%{version}.tar.xz
Patch0: 0001-mvn_artifact-Append-dependencies-to-metadata-if-we-h.patch
Patch1: 0001-metadata-Read-OSGi-Requires-from-manifest-only-if-os.patch
+Patch2: 0001-pom_editor-Fix-missing-space-between-xmlns-declarati.patch
BuildArch: noarch
@@ -169,6 +170,7 @@ This package provides non-essential macros and scripts to support Java packaging
%patch0 -p1
%patch1 -p1
+%patch2 -p1
%if 0%{?with_python3}
find . -name '*.py' | xargs sed -i '1s|^#!.*python|#!%{__python3}|'
@@ -234,6 +236,9 @@ popd
%doc LICENSE
%changelog
+* Tue Oct 21 2014 Michael Simacek <msimacek at redhat.com> - 4.2.0-4
+- Fix pom_editor missing space between xmlns declarations
+
* Wed Sep 24 2014 Michal Srb <msrb at redhat.com> - 4.2.0-3
- Do not generate OSGi R on eclipse-platform
More information about the scm-commits
mailing list