From: Brian P. Hinz <bphinz@users.sf.net>
Date: Thu, 6 Nov 2014 02:00:31 +0000 (-0500)
Subject: Set default file encoding to prevent java compiler warnings
X-Git-Tag: v1.3.90~12^2~1
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=fc29e42af4559527383cc1770fcde0a49a1dafb5;p=tigervnc.git

Set default file encoding to prevent java compiler warnings

* The keymap files have UTF-8 characters embedded in comments.
  javac complains about this unless the default encoding is set.
---

diff --git a/contrib/packages/rpm/el5/SPECS/tigervnc.spec b/contrib/packages/rpm/el5/SPECS/tigervnc.spec
index b2ff9178..e3656d44 100644
--- a/contrib/packages/rpm/el5/SPECS/tigervnc.spec
+++ b/contrib/packages/rpm/el5/SPECS/tigervnc.spec
@@ -1128,7 +1128,7 @@ popd
 # Build Java applet
 pushd java
 %{cmake28} .
-LANG=C make
+JAVA_TOOL_OPTIONS="-Dfile.encoding=UTF8" make
 popd
 
 %install
diff --git a/contrib/packages/rpm/el6/SPECS/tigervnc.spec b/contrib/packages/rpm/el6/SPECS/tigervnc.spec
index 034467a3..66daf8f6 100644
--- a/contrib/packages/rpm/el6/SPECS/tigervnc.spec
+++ b/contrib/packages/rpm/el6/SPECS/tigervnc.spec
@@ -219,7 +219,7 @@ popd
 # Build Java applet
 pushd java
 %{cmake28} .
-make
+JAVA_TOOL_OPTIONS="-Dfile.encoding=UTF8" make
 popd
 
 %install
diff --git a/contrib/packages/rpm/sle11/SPECS/tigervnc.spec b/contrib/packages/rpm/sle11/SPECS/tigervnc.spec
index ddf93101..e601d717 100644
--- a/contrib/packages/rpm/sle11/SPECS/tigervnc.spec
+++ b/contrib/packages/rpm/sle11/SPECS/tigervnc.spec
@@ -324,7 +324,7 @@ popd
 # Build java client
 pushd java
 cmake -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix}
-make %{?_smp_mflags}
+JAVA_TOOL_OPTIONS="-Dfile.encoding=UTF8" make %{?_smp_mflags}
 popd
 
 %install