rpms/koules/EL-6 koules.spec,1.10,1.11

[Lubomir Rintel]

Author: lkundrak

Update of /cvs/pkgs/rpms/koules/EL-6
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv18743/EL-6

Modified Files:
	koules.spec 
Log Message:
* Fri Jul 9 2010 Lubomir Rintel <lkundrak at v3.sk> 1.4-9
- Do not build svgalib flavour on RHEL-6



Index: koules.spec
===================================================================
RCS file: /cvs/pkgs/rpms/koules/EL-6/koules.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- koules.spec	25 Jul 2009 04:44:43 -0000	1.10
+++ koules.spec	8 Jul 2010 23:20:56 -0000	1.11
@@ -1,6 +1,17 @@
+# Only x86 Fedora ships svgalib
+%ifarch %{ix86} x86_64
+%if 0%{rhel} < 6
+%bcond_without svgalib
+%else
+%bcond_with svgalib
+%endif
+%else
+%bcond_with svgalib
+%endif
+
 Name:           koules
 Version:        1.4
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Action game with multiplayer, network and sound support
 
 Group:          Amusements/Games
@@ -15,13 +26,13 @@ BuildRequires:  libX11-devel
 BuildRequires:  libXext-devel
 BuildRequires:  xmkmf
 BuildRequires:  desktop-file-utils
-%ifarch %{ix86} x86_64
+%if %with svgalib
 BuildRequires:  svgalib-devel
 %endif
 
 Requires:       %{name}-sound = %{version}
 Requires:       %{name}-x11 = %{version}
-%ifarch %{ix86} x86_64
+%if %with svgalib
 Requires:       %{name}-svgalib = %{version}
 %endif
 
@@ -53,7 +64,7 @@ and, of course, network support.  Koules
 of Koules was developed from scratch by Jan Hubicka in July 1995.
 
 
-%ifarch %{ix86} x86_64
+%if %with svgalib
 %package svgalib
 Summary:        SVGAlib based variant of a multiplayer action game
 Group:          Amusements/Games
@@ -70,6 +81,9 @@ as a network server.  Use koules-x11 pac
 Summary:        X Window system variant of a multiplayer action game
 Group:          Amusements/Games
 Requires:       xorg-x11-fonts-misc
+%if %without svgalib
+Obsoletes:      %{name}-svgalib < %{version}-%{release}
+%endif
 
 %description x11
 This package contains variant of a classic Linux arcade game with X Window
@@ -95,7 +109,8 @@ pulseaudio-utils package.
 
 
 %prep
-%ifarch %{ix86} x86_64
+%if %with svgalib
+echo HOOOOOOOOOOOOOOOOO
 # SVGAlib variant build tree
 %setup -q -n %{name}-%{version}-svga -c
 cd %{name}%{version}
@@ -106,6 +121,7 @@ cd %{name}%{version}
 %patch10 -p1 -b .retrace
 %patch11 -p1 -b .make
 %endif
+exit 1
 
 # X11 variant build tree
 %setup -q -n %{name}-%{version}-x11 -c
@@ -126,7 +142,7 @@ cd %{name}%{version}
 
 
 %build
-%ifarch %{ix86} x86_64
+%if %with svgalib
 # Build SVGAlib variant
 cd $RPM_BUILD_DIR/%{name}-%{version}-svga/%{name}%{version}
 # Builds with multiple concurrent jobs are problematic
@@ -146,7 +162,7 @@ install -d $RPM_BUILD_ROOT%{_mandir}/man
 install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/sound
 install -d $RPM_BUILD_ROOT%{_libexecdir}/%{name}
 
-%ifarch %{ix86} x86_64
+%if %with svgalib
 # Install SVGAlib variant
 cd $RPM_BUILD_DIR/%{name}-%{version}-svga/%{name}%{version}
 make -f Makefile.svgalib install %{makedirs} DESTDIR=$RPM_BUILD_ROOT \
@@ -187,7 +203,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/%{name}
 %{_libexecdir}/%{name}
 
-%ifarch %{ix86} x86_64
+%if %with svgalib
 %files svgalib
 %attr(755,root,root) %{_bindir}/koules.svga
 %attr(644,root,root) %{_mandir}/man6/koules.svga.6*
@@ -201,6 +217,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Jul 9 2010 Lubomir Rintel <lkundrak at v3.sk> 1.4-9
+- Do not build svgalib flavour on RHEL-6
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild