Browse Source
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 7dfa06ecc9)
tags/v1.4.0
Brian P. Hinz
9 years ago
3 changed files with 7 additions and 3 deletions
+ 2
- 1
contrib/packages/rpm/el5/SPECS/tigervnc.spec
View File
| @@ -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} \ | |||
+ 3
- 1
contrib/packages/rpm/el6/SPECS/tigervnc.spec
View File
| @@ -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} \ | |||
+ 2
- 1
contrib/packages/rpm/sle11/SPECS/tigervnc.spec
View File
| @@ -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} \ | |||
Loading…