[dbus-java] Force utf8 encoding for tests

Omair Majid omajid at fedoraproject.org
Mon Jan 16 18:18:24 UTC 2012


commit 9690a047e3c5aebdb6c072468454c6a8d662267d
Author: Omair Majid <omajid at redhat.com>
Date:   Mon Jan 16 13:12:53 2012 -0500

    Force utf8 encoding for tests

 dbus-java.spec       |    4 ++++
 utf-8-encoding.patch |   13 +++++++++++++
 2 files changed, 17 insertions(+), 0 deletions(-)
---
diff --git a/dbus-java.spec b/dbus-java.spec
index 33e5022..793e4be 100644
--- a/dbus-java.spec
+++ b/dbus-java.spec
@@ -14,6 +14,9 @@ Source1:    %{name}-osgi-MANIFEST.MF
 Patch1:     classpath_fix.patch
 # fedora specific paths
 Patch2:     parallel.patch
+# java-7 compatibility patch
+# https://bugs.freedesktop.org/show_bug.cgi?id=44791
+Patch3:     utf-8-encoding.patch
 
 BuildRequires:  java-devel >= 1:1.6.0
 BuildRequires:  jpackage-utils
@@ -62,6 +65,7 @@ Javadocs for %{name}
 %setup -q
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 sed -i "s|!doctype|!DOCTYPE|g" *.sgml
 sed -i 's|<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN"|<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd"|g' *.sgml
diff --git a/utf-8-encoding.patch b/utf-8-encoding.patch
new file mode 100644
index 0000000..8275861
--- /dev/null
+++ b/utf-8-encoding.patch
@@ -0,0 +1,13 @@
+diff --git a/Makefile b/Makefile
+index 65bff86..1c92e1a 100644
+--- a/Makefile
++++ b/Makefile
+@@ -19,7 +19,7 @@ DOCBOOKTOMAN?=docbook-to-man
+ 
+ # Program parameters
+ CPFLAG?=-classpath
+-JCFLAGS?=-Xlint:all -O -g:none
++JCFLAGS?=-Xlint:all -O -g:none -encoding UTF-8
+ JFLAGS+=-Djava.library.path=$(JAVAUNIXLIBDIR)
+ 
+ # Source/Class locations


More information about the scm-commits mailing list