[guacamole-server] Revert "There is no VNC support (libvncserver) in EPEL 7 ppc/ppc64"

[Simone Caronni]

commit c198c50c4e5dceaf7212683b5e3ce5eb262d9a80
Author: Simone Caronni <negativo17 at gmail.com>
Date:   Tue Jun 3 15:48:46 2014 +0200

    Revert "There is no VNC support (libvncserver) in EPEL 7 ppc/ppc64"
    
    This reverts commit ba8787a1576c9fa1a2750bb1ed1109f50aae2a38.

 guacamole-server.spec |   40 ++++------------------------------------
 1 files changed, 4 insertions(+), 36 deletions(-)
---
diff --git a/guacamole-server.spec b/guacamole-server.spec
index 7362db2..5ae6fa3 100644
--- a/guacamole-server.spec
+++ b/guacamole-server.spec
@@ -3,7 +3,7 @@
 
 Name:           guacamole-server
 Version:        0.9.1
-Release:        2%{?dist}
+Release:        1%{?dist}
 Summary:        Server-side native components that form the Guacamole proxy
 
 License:        MPLv1.1 or GPLv2+
@@ -25,30 +25,13 @@ BuildRequires:  pkgconfig(libpulse)
 BuildRequires:  pkgconfig(libssh2)
 BuildRequires:  pkgconfig(libssl)
 BuildRequires:  pkgconfig(libtelnet)
-BuildRequires:  pkgconfig(pango)
-BuildRequires:  pkgconfig(vorbis)
-
 %if 0%{?rhel} == 6
 BuildRequires:  libvncserver-devel
-%global with_vnc 1
-%endif
-
-%if 0%{?fedora}
-BuildRequires: pkgconfig(libvncserver)
-%global with_vnc 1
-%endif
-
-# No libvncserver in EPEL 7 ppc/ppc64
-%if 0%{?rhel} >= 7
-
-%ifnarch ppc ppc64
-BuildRequires: pkgconfig(libvncserver)
-%global with_vnc 1
 %else
-%global with_vnc 0
-%endif
-
+BuildRequires:  pkgconfig(libvncserver)
 %endif
+BuildRequires:  pkgconfig(pango)
+BuildRequires:  pkgconfig(vorbis)
 
 %description
 Guacamole is an HTML5 remote desktop gateway.
@@ -97,8 +80,6 @@ Summary:        SSH support for guacd
 libguac-client-ssh is a protocol support plugin for the Guacamole proxy (guacd)
 which provides support for SSH, the secure shell.
 
-%if %{with_vnc}
-
 %package -n libguac-client-vnc
 Requires:       libguac%{?_isa} = %{version}-%{release}
 Summary:        VNC support for guacd
@@ -108,8 +89,6 @@ libguac-client-vnc is a protocol support plugin for the Guacamole proxy (guacd)
 which provides support for VNC via the libvncclient library (part of
 libvncserver).
 
-%endif
-
 %package -n libguac-client-telnet
 Requires:       libguac%{?_isa} = %{version}-%{release}
 Summary:        Telnet support for guacd
@@ -227,14 +206,10 @@ fi
 
 %postun -n libguac-client-ssh -p /sbin/ldconfig
 
-%if %{with_vnc}
-
 %post -n libguac-client-vnc -p /sbin/ldconfig
 
 %postun -n libguac-client-vnc -p /sbin/ldconfig
 
-%endif
-
 %post -n libguac-client-telnet -p /sbin/ldconfig
 
 %postun -n libguac-client-telnet -p /sbin/ldconfig
@@ -260,14 +235,10 @@ fi
 %{_libdir}/libguac-client-ssh.so
 %{_libdir}/libguac-client-ssh.so.*
 
-%if %{with_vnc}
-
 %files -n libguac-client-vnc
 %{_libdir}/libguac-client-vnc.so
 %{_libdir}/libguac-client-vnc.so.*
 
-%endif
-
 %files -n libguac-client-telnet
 %{_libdir}/libguac-client-telnet.so
 %{_libdir}/libguac-client-telnet.so.*
@@ -284,9 +255,6 @@ fi
 %attr(750,%{username},%{username}) %{_sharedstatedir}/guacd
 
 %changelog
-* Mon May 26 2014 Simone Caronni <negativo17 at gmail.com> - 0.9.1-2
-- There is no VNC support (libvncserver) in EPEL 7 ppc/ppc64.
-
 * Mon May 26 2014 Simone Caronni <negativo17 at gmail.com> - 0.9.1-1
 - Update to 0.9.1.
 - Removed upstreamed patch.