From e328bd388ae665833dbcb430d0bb71a6f24d7f94 Mon Sep 17 00:00:00 2001 From: "Brian P. Hinz" Date: Wed, 5 Nov 2014 22:47:04 -0500 Subject: [PATCH] Parameterize jar file signing for rpm-based distros * Allow build time selection of self-signed or keystore signing --- contrib/packages/rpm/el5/SPECS/tigervnc.spec | 11 ++++++++++- contrib/packages/rpm/el6/SPECS/tigervnc.spec | 11 ++++++++++- contrib/packages/rpm/sle11/SPECS/tigervnc.spec | 11 ++++++++++- 3 files changed, 30 insertions(+), 3 deletions(-) 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 -- 2.39.5