From: Brian P. Hinz <bphinz@users.sf.net>
Date: Thu, 6 Nov 2014 03:47:04 +0000 (-0500)
Subject: Parameterize jar file signing for rpm-based distros
X-Git-Tag: v1.3.90~12^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=refs%2Fpull%2F62%2Fhead;p=tigervnc.git

Parameterize jar file signing for rpm-based distros

* Allow build time selection of self-signed or keystore signing
---

diff --git a/contrib/packages/rpm/el5/SPECS/tigervnc.spec b/contrib/packages/rpm/el5/SPECS/tigervnc.spec
index e3656d44..a653fbd8 100644
--- a/contrib/packages/rpm/el5/SPECS/tigervnc.spec
+++ b/contrib/packages/rpm/el5/SPECS/tigervnc.spec
@@ -1127,7 +1127,16 @@ popd
 
 # Build Java applet
 pushd java
-%{cmake28} .
+%{cmake28} \
+%if 0%{!?_self_signed:1}
+	-DJAVA_KEYSTORE=%{_keystore} \
+	-DJAVA_KEYSTORE_TYPE=%{_keystore_type} \
+	-DJAVA_KEY_ALIAS=%{_key_alias} \
+	-DJAVA_STOREPASS=":env STOREPASS" \
+	-DJAVA_KEYPASS=":env KEYPASS" \
+	-DJAVA_TSA_URL=https://timestamp.geotrust.com/tsa .
+%endif
+
 JAVA_TOOL_OPTIONS="-Dfile.encoding=UTF8" make
 popd
 
diff --git a/contrib/packages/rpm/el6/SPECS/tigervnc.spec b/contrib/packages/rpm/el6/SPECS/tigervnc.spec
index 66daf8f6..5e8bc599 100644
--- a/contrib/packages/rpm/el6/SPECS/tigervnc.spec
+++ b/contrib/packages/rpm/el6/SPECS/tigervnc.spec
@@ -218,7 +218,16 @@ popd
 
 # Build Java applet
 pushd java
-%{cmake28} .
+%{cmake28} \
+%if 0%{!?self_signed:1}
+	-DJAVA_KEYSTORE=%{_keystore} \
+	-DJAVA_KEYSTORE_TYPE=%{_keystore_type} \
+	-DJAVA_KEY_ALIAS=%{_key_alias} \
+	-DJAVA_STOREPASS=":env STOREPASS" \
+	-DJAVA_KEYPASS=":env KEYPASS" \
+	-DJAVA_TSA_URL=https://timestamp.geotrust.com/tsa .
+%endif
+
 JAVA_TOOL_OPTIONS="-Dfile.encoding=UTF8" make
 popd
 
diff --git a/contrib/packages/rpm/sle11/SPECS/tigervnc.spec b/contrib/packages/rpm/sle11/SPECS/tigervnc.spec
index e601d717..ce2f5421 100644
--- a/contrib/packages/rpm/sle11/SPECS/tigervnc.spec
+++ b/contrib/packages/rpm/sle11/SPECS/tigervnc.spec
@@ -323,7 +323,16 @@ popd
 
 # Build java client
 pushd java
-cmake -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix}
+cmake -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \
+%if 0%{!?_self_signed:1}
+  -DJAVA_KEYSTORE=%{_keystore} \
+  -DJAVA_KEYSTORE_TYPE=%{_keystore_type} \
+  -DJAVA_KEY_ALIAS=%{_key_alias} \
+  -DJAVA_STOREPASS=":env STOREPASS" \
+  -DJAVA_KEYPASS=":env KEYPASS" \
+  -DJAVA_TSA_URL=https://timestamp.geotrust.com/tsa
+%endif
+
 JAVA_TOOL_OPTIONS="-Dfile.encoding=UTF8" make %{?_smp_mflags}
 popd