Merge pull request #88 from bphinz/buildfixes
Fixes for rpm-based distro builds
diff --git a/contrib/packages/rpm/el5/SPECS/tigervnc.spec b/contrib/packages/rpm/el5/SPECS/tigervnc.spec
index 1b88670..6da5915 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 @@
# 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 da8ce73..d16a416 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}
@@ -25,6 +27,9 @@
BuildRequires: desktop-file-utils, java-devel, jpackage-utils
BuildRequires: libjpeg-turbo-devel, gnutls-devel, pam-devel
BuildRequires: cmake28
+%ifnarch s390 s390x
+BuildRequires: xorg-x11-server-devel
+%endif
BuildRequires: openmotif-devel
Requires: openmotif, openmotif22
@@ -189,14 +194,14 @@
autoreconf -fiv
%configure \
--disable-xorg --disable-xnest --disable-xvfb --disable-dmx \
- --disable-xwin --disable-xephyr --disable-kdrive --with-pic \
- --disable-static --disable-xinerama \
+ --disable-xwin --disable-xephyr --disable-kdrive --disable-wayland \
+ --with-pic --disable-static --disable-xinerama \
--with-default-font-path="catalogue:%{_sysconfdir}/X11/fontpath.d,built-ins" \
- --with-serverconfig-path=/usr/%{_libdir}/xorg \
+ --with-serverconfig-path=%{_libdir}/xorg \
--with-fontrootdir=%{_datadir}/X11/fonts \
--with-xkb-output=%{_localstatedir}/lib/xkb \
--enable-install-libxf86config \
- --enable-glx --disable-dri --enable-dri2 \
+ --enable-glx --enable-glx-tls --disable-dri --enable-dri2 --disable-dri3 \
--disable-config-dbus \
--disable-config-hal \
--disable-config-udev \
@@ -217,7 +222,7 @@
# 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 f98e8fb..84e8574 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 @@
# 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} \