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 e3656d4..a653fbd 100644
--- a/contrib/packages/rpm/el5/SPECS/tigervnc.spec
+++ b/contrib/packages/rpm/el5/SPECS/tigervnc.spec
@@ -1127,7 +1127,16 @@
# 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 66daf8f..5e8bc59 100644
--- a/contrib/packages/rpm/el6/SPECS/tigervnc.spec
+++ b/contrib/packages/rpm/el6/SPECS/tigervnc.spec
@@ -218,7 +218,16 @@
# 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 e601d71..ce2f542 100644
--- a/contrib/packages/rpm/sle11/SPECS/tigervnc.spec
+++ b/contrib/packages/rpm/sle11/SPECS/tigervnc.spec
@@ -323,7 +323,16 @@
# 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