[x11vnc] Use universial spec for Fedora and EPEL.

[Pavel Alexeev]

commit ea62834ab3fc4e921ba009696811c39387c61bc8
Author: Pavel Alexeev (aka Pahan-Hubbitus) <pahan at hubbitus.info>
Date:   Tue Jan 18 16:44:28 2011 +0300

    Use universial spec for Fedora and EPEL.

 x11vnc.spec |   34 ++++++++++++++++++++++++++++------
 1 files changed, 28 insertions(+), 6 deletions(-)
---
diff --git a/x11vnc.spec b/x11vnc.spec
index 88903d2..eed0a40 100644
--- a/x11vnc.spec
+++ b/x11vnc.spec
@@ -2,7 +2,7 @@ Summary:		VNC server for the current X11 session
 Summary(ru):	VNC-сервер для текущей сессии X11
 Name:		x11vnc
 Version:		0.9.12
-Release:		15%{?dist}
+Release:		17%{?dist}
 License:		GPLv2
 Group:		User Interface/X
 URL:			http://www.karlrunge.com/x11vnc/
@@ -12,7 +12,7 @@ BuildRequires:	libjpeg-devel, zlib-devel, openssl-devel
 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
@@ -51,6 +51,8 @@ versatile and productive while still easy to use program.
 в гибкий и производительный инструмент, который, однако, остается
 просто в использовании.
 
+# Required java not available on EL-5.ppc
+%if ! ( (%{_arch}==ppc && 5 == 0%{?rhel}) || (%{_arch}==ppc64 && 6 == 0%{?rhel}) )
 %package		javaviewers
 Version:		%{version}
 Summary:		VNC clients (browser java applets)
@@ -58,11 +60,13 @@ Summary(ru):	VNC-клиенты в виде java-аплетов для брау
 Requires:		%{name} = %{version}-%{release}
 License:		GPLv2+
 Group:		User Interface/X
-BuildArch:	noarch
-BuildRequires:	java-devel >= 1:1.6.0
+# EL-5 does not support noarch subpackages ( https://fedorahosted.org/fedora-infrastructure/ticket/1772#comment:4 )
+%if 0%{?fedora} > 9 || 0%{?rhel} > 5
+BuildArch: noarch
+%endif
+BuildRequires:	java-devel >= 1:1.6.0 java-1.6.0-openjdk-devel
 BuildRequires:	jpackage-utils
 
-
 %description	javaviewers
 The package contains the corresponding java clients for %{name}. They
 can be used with any java-enabled browser and provide an easy access to
@@ -74,6 +78,7 @@ Java-клиенты для использования совместно с %{na
 
 Должно по идее работать с любым современным браузером, где есть
 поддержка Java
+%endif # EL.ppc
 
 %prep
 %setup -q
@@ -99,6 +104,7 @@ find -name '*.jar' -exec rm {} \;
 %build
 %configure --with-system-libvncserver --without-tightvnc-filetransfer
 
+%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}
@@ -108,6 +114,10 @@ pushd classes/ssl/src
 	%{__ln_s} ssl/src/$jarfile ../../;
 	done
 popd
+%else
+%{__rm} -rf classes
+sed -ri 's/(DUST_)?SUBDIRS = x11vnc classes/\1SUBDIRS = x11vnc/' Makefile
+%endif
 
 %{__make} %{?_smp_mflags}
 
@@ -115,6 +125,7 @@ popd
 %{__rm} -rf %{buildroot}
 %{__make} install DESTDIR="%{buildroot}"
 
+%if ! ( (%{_arch}==ppc && 5 == 0%{?rhel}) || (%{_arch}==ppc64 && 6 == 0%{?rhel}) )
 # And Java viewers
 pushd classes/ssl
 %{__make} install DESTDIR="%{buildroot}"
@@ -123,6 +134,7 @@ popd
 # Rename README file to avoid name bump
 %{__mv} classes/ssl/src/tight/README classes/ssl/src/tight/README.tight
 %{__mv} classes/ssl/src/ultra/README classes/ssl/src/ultra/README.ultra
+%endif
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -134,15 +146,25 @@ popd
 %{_bindir}/x11vnc
 %{_datadir}/applications/x11vnc.desktop
 
+%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.