Fix for rpm-based packages when self-signed cert is used to sign java applet

RPM build failed when the self-signed cert was used because the macro did not
expand correctly.

(cherry picked from commit 7dfa06ecc9066989d9f257fdca8e59188e1c72d4)

diff --git a/contrib/packages/rpm/el5/SPECS/tigervnc.spec b/contrib/packages/rpm/el5/SPECS/tigervnc.spec
index 1b88670d16c6cebda152aa5d6cba60bef5b62693..6da5915b14e11ee8d609ab37a17b05ce7d9ab4cc 100644 (file)
--- a/contrib/packages/rpm/el5/SPECS/tigervnc.spec
+++ b/contrib/packages/rpm/el5/SPECS/tigervnc.spec
@@ -1,5 +1,6 @@
 %define _default_patch_fuzz 2
 %define mesa_version 7.7.1
+%{!?_self_signed: %define _self_signed 1}
 
 Name: tigervnc
 Version: @VERSION@
@@ -1110,7 +1111,7 @@ popd
 # Build Java applet
 pushd java
 %{cmake28} \
-%if 0%{!?_self_signed:1}
+%if !%{_self_signed}
        -DJAVA_KEYSTORE=%{_keystore} \
        -DJAVA_KEYSTORE_TYPE=%{_keystore_type} \
        -DJAVA_KEY_ALIAS=%{_key_alias} \

diff --git a/contrib/packages/rpm/el6/SPECS/tigervnc.spec b/contrib/packages/rpm/el6/SPECS/tigervnc.spec
index da8ce73fc8ef1beb29ed8266d61272c4c43dabde..3667979982f2a647711d96b730ca64406db5dd95 100644 (file)
--- a/contrib/packages/rpm/el6/SPECS/tigervnc.spec
+++ b/contrib/packages/rpm/el6/SPECS/tigervnc.spec
@@ -1,3 +1,5 @@
+%{!?_self_signed: %define _self_signed 1}
+
 Name: tigervnc
 Version: @VERSION@
 Release: 18%{?snap:.%{snap}}%{?dist}
@@ -217,7 +219,7 @@ popd
 # Build Java applet
 pushd java
 %{cmake28} \
-%if 0%{!?self_signed:1}
+%if !%{_self_signed}
        -DJAVA_KEYSTORE=%{_keystore} \
        -DJAVA_KEYSTORE_TYPE=%{_keystore_type} \
        -DJAVA_KEY_ALIAS=%{_key_alias} \

diff --git a/contrib/packages/rpm/sle11/SPECS/tigervnc.spec b/contrib/packages/rpm/sle11/SPECS/tigervnc.spec
index f98e8fb61aaa0f6804e3af1a02d22a9bf5a45785..84e8574a14f198a00326fec8a0ee9de7c91d159b 100644 (file)
--- a/contrib/packages/rpm/sle11/SPECS/tigervnc.spec
+++ b/contrib/packages/rpm/sle11/SPECS/tigervnc.spec
@@ -15,6 +15,7 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 %define         debug_package %{nil}
+%{!?_self_signed: %define _self_signed 1}
 
 
 Name:           tigervnc
@@ -316,7 +317,7 @@ popd
 # Build java client
 pushd java
 cmake -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \
-%if 0%{!?_self_signed:1}
+%if !%{_self_signed}
   -DJAVA_KEYSTORE=%{_keystore} \
   -DJAVA_KEYSTORE_TYPE=%{_keystore_type} \
   -DJAVA_KEY_ALIAS=%{_key_alias} \