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 e3656d4459b100e5206e0ac2b73bc52aeea96921..a653fbd8eb7bd9691eac8833e59327a166a9eca0 100644 (file)
--- 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 66daf8f65d5e6be28cb97ae97a49fd22dfef47df..5e8bc59907921a57a1f20444f5e45a4015ac13f0 100644 (file)
--- 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 e601d71705bfbc9e3c8ca8267137ec7aca4e4de2..ce2f5421b49bf49e0dc399ce5662babbc1042fb4 100644 (file)
--- 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