diff options
| author | Brian P. Hinz <bphinz@users.sf.net> | 2014-12-06 22:00:59 -0500 |
|---|---|---|
| committer | Brian P. Hinz <bphinz@users.sf.net> | 2014-12-09 16:56:18 -0500 |
| commit | 0d20bb0288f566a2ed832ab7aa66fd9620bdf85f (patch) | |
| tree | 8f1fbbe7d2c8219d8e6909f6c81a98b9037ee3f0 | |
| parent | 37ebdeca078fbfa7e43185ff5b4bdb9da629b08a (diff) | |
| download | tigervnc-0d20bb0288f566a2ed832ab7aa66fd9620bdf85f.tar.gz tigervnc-0d20bb0288f566a2ed832ab7aa66fd9620bdf85f.zip | |
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)
| -rw-r--r-- | contrib/packages/rpm/el5/SPECS/tigervnc.spec | 3 | ||||
| -rw-r--r-- | contrib/packages/rpm/el6/SPECS/tigervnc.spec | 4 | ||||
| -rw-r--r-- | contrib/packages/rpm/sle11/SPECS/tigervnc.spec | 3 |
3 files changed, 7 insertions, 3 deletions
diff --git a/contrib/packages/rpm/el5/SPECS/tigervnc.spec b/contrib/packages/rpm/el5/SPECS/tigervnc.spec index 1b88670d..6da5915b 100644 --- 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 da8ce73f..36679799 100644 --- 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 f98e8fb6..84e8574a 100644 --- 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} \ |