[x11vnc/el5/master: 5/6] - Update to last version 0.9.12 with hope it fix BZ#646694 and by request BZ#666612 - Change java re

[Pavel Alexeev]

commit 5aa02eff73c293c557b21df64e1b6a5190ed7613
Merge: 72403c5 89bf692
Author: Pavel Alexeev (aka Pahan-Hubbitus) <pahan at hubbitus.info>
Date:   Tue Jan 18 16:46:49 2011 +0300

    - Update to last version 0.9.12 with hope it fix BZ#646694 and by request BZ#666612
    - Change java related exclusion to El6 too.

 .gitignore  |    2 +-
 sources     |    2 +-
 x11vnc.spec |   20 +++++++++++++-------
 3 files changed, 15 insertions(+), 9 deletions(-)
---
diff --cc .gitignore
index 933ff82,a450233..a80e29e
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,2 +1,1 @@@
--x11vnc-0.9.8.tar.gz
+ /x11vnc-0.9.12.tar.gz
diff --cc x11vnc.spec
index 2b35701,88903d2..eed0a40
--- a/x11vnc.spec
+++ b/x11vnc.spec
@@@ -1,8 -1,8 +1,8 @@@
  Summary:		VNC server for the current X11 session
  Summary(ru):	VNC-сервер для текущей сессии X11
  Name:		x11vnc
- Version:		0.9.8
- Release:		16%{?dist}
+ Version:		0.9.12
 -Release:		15%{?dist}
++Release:		17%{?dist}
  License:		GPLv2
  Group:		User Interface/X
  URL:			http://www.karlrunge.com/x11vnc/
@@@ -12,6 -12,8 +12,8 @@@ BuildRequires:	libjpeg-devel, zlib-deve
  BuildRequires:	xorg-x11-proto-devel, libXext-devel, libXtst-devel
  BuildRequires:	libXfixes-devel, libvncserver-devel
  
 -BuildRequires:	java-1.6.0-openjdk-devel
++
+ 
  # In Fedora 12 /usr/include/X11/extensions/XInput.h in libXi-devel but in
  # previous versions in xorg-x11-proto-devel /usr/include/X11/extensions/shmproto.h
  # placed in libXext-devel in F12 and in xorg-x11-proto-devel early.
@@@ -49,8 -51,6 +51,8 @@@ versatile and productive while still ea
  в гибкий и производительный инструмент, который, однако, остается
  просто в использовании.
  
 +# Required java not available on EL-5.ppc
- %if ! ( %{_arch}==ppc && 5 == 0%{?rhel} )
++%if ! ( (%{_arch}==ppc && 5 == 0%{?rhel}) || (%{_arch}==ppc64 && 6 == 0%{?rhel}) )
  %package		javaviewers
  Version:		%{version}
  Summary:		VNC clients (browser java applets)
@@@ -76,7 -74,6 +78,7 @@@ Java-клиенты для исполь
  
  Должно по идее работать с любым современным браузером, где есть
  поддержка Java
- %endif # EL-5.ppc
++%endif # EL.ppc
  
  %prep
  %setup -q
@@@ -102,7 -99,6 +104,7 @@@ find -name '*.jar' -exec rm {} \
  %build
  %configure --with-system-libvncserver --without-tightvnc-filetransfer
  
- %if ! ( %{_arch}==ppc && 5 == 0%{?rhel} )
++%if ! ( (%{_arch}==ppc && 5 == 0%{?rhel}) || (%{_arch}==ppc64 && 6 == 0%{?rhel}) )
  # First rebuild jars, what have been removed in %%prep.
  pushd classes/ssl/src
  %{__make} %{?_smp_mflags}
@@@ -123,7 -115,6 +125,7 @@@ sed -ri 's/(DUST_)?SUBDIRS = x11vnc cla
  %{__rm} -rf %{buildroot}
  %{__make} install DESTDIR="%{buildroot}"
  
- %if ! ( %{_arch}==ppc && 5 == 0%{?rhel} )
++%if ! ( (%{_arch}==ppc && 5 == 0%{?rhel}) || (%{_arch}==ppc64 && 6 == 0%{?rhel}) )
  # And Java viewers
  pushd classes/ssl
  %{__make} install DESTDIR="%{buildroot}"
@@@ -144,21 -134,15 +146,25 @@@ pop
  %{_bindir}/x11vnc
  %{_datadir}/applications/x11vnc.desktop
  
- %if ! ( %{_arch}==ppc && 5 == 0%{?rhel} )
++%if ! ( (%{_arch}==ppc && 5 == 0%{?rhel}) || (%{_arch}==ppc64 && 6 == 0%{?rhel}) )
  %files javaviewers
  %defattr(-,root,root,-)
  %doc classes/ssl/README classes/ssl/src/tight/README.tight classes/ssl/src/ultra/README.ultra
  %{_datadir}/%{name}
  %exclude %{_datadir}/%{name}/classes/ssl/README
 +%endif
  
  %changelog
 -* Sun Jan 2 2011 Pavel Alexeev <Pahan at Hubbitus.info> - 0.9.12-15
++* Tue Jan 18 2011 Pavel Alexeev <Pahan at Hubbitus.info> - 0.9.12-17
+ - Update to last version 0.9.12 with hope it fix BZ#646694 and by request BZ#666612
++- Change java related exclusion to El6 too.
++
 +* Sun Nov 1 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.9.8-16
 +- Noarch subpackage became only on Fedora
 +	( https://fedorahosted.org/fedora-infrastructure/ticket/1772#comment:4 )
 +- Also -javaviewers subpackage compleatly disabled on PPC arch on EL-5 because
 +	there no java-devel >= 1:1.6.0 and java-1.6.0-openjdk-devel.
 +	( https://fedorahosted.org/fedora-infrastructure/ticket/1772#comment:4 )
  
  * Tue Oct 6 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.9.8-14
  - Make -javaviewers subpackage noarch.