SPECS: raceGL.spec - dropped ra bcond - FHS fix: binary moved to %...

[qboosh]

Author: qboosh                       Date: Fri Nov 30 18:37:22 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- dropped ra bcond
- FHS fix: binary moved to %{_libdir}/%{name}

---- Files affected:
SPECS:
   raceGL.spec (1.11 -> 1.12) 

---- Diffs:

================================================================
Index: SPECS/raceGL.spec
diff -u SPECS/raceGL.spec:1.11 SPECS/raceGL.spec:1.12
--- SPECS/raceGL.spec:1.11	Fri Nov 30 19:27:12 2007
+++ SPECS/raceGL.spec	Fri Nov 30 19:37:17 2007
@@ -1,11 +1,7 @@
 # $Revision$, $Date$
 # TODO:
 # - some icon
-#
-# Conditional build:
-# _with_ra	- build in PLD Ra environment
-
-%define		_origname	race
+%define		origname	race
 Summary:	OpenGL Racing Game
 Summary(pl.UTF-8):	Gra wyścigowa w OpenGL
 Name:		raceGL
@@ -13,7 +9,7 @@
 Release:	3
 License:	GPL v2
 Group:		X11/Applications/Games
-Source0:	ftp://users.freebsd.org.uk/pub/foobar2k/%{_origname}-%{version}.tar.bz2
+Source0:	ftp://users.freebsd.org.uk/pub/foobar2k/%{origname}-%{version}.tar.bz2
 # Source0-md5:	9f6efbe1b1a7969a9e8d718d691b4095
 Source1:	%{name}.desktop
 URL:		http://projectz.ath.cx/?id=70
@@ -21,15 +17,11 @@
 BuildRequires:	SDL-devel
 BuildRequires:	SDL_image-devel
 BuildRequires:	SDL_mixer-devel
-Requires:	OpenGL
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_noautoreqdep	libGL.so.1 libGLU.so.1
 
-%if %{?_with_ra:1}%{!?_with_ra:0}
-%define		_prefix		/usr/X11R6
-%endif
-%define		_gamedata	%{_datadir}/%{name}/data/
+%define		_gamedata	%{_datadir}/%{name}/data
 
 %description
 OpenGL Racing Game is a Star Wars: Racer style game coded in pure C
@@ -39,39 +31,40 @@
 
 %description -l pl.UTF-8
 OpenGL Racing Game jest grą w stylu Star Wars: Racer napisaną w
-czystym C przy użyciu OpenGL. Możesz jeździć sobie w kółko ile ci się
-podoba. Cechy: Heightfield map loading, mapowanie tekstur,
-prędkościomierz, przezroczysta mapa radarowa, czasomierz, muzyka,
-dźwięk.
+czystym C przy użyciu OpenGL. Gracz może jeździć sobie w kółko ile
+tylko mu się podoba. Możliwości obejmują: wczytywanie mapy wysokości,
+mapowanie tekstur, prędkościomierz, przezroczystą mapę radarową,
+czasomierz, muzykę, dźwięk.
 
 %prep
-%setup -q -n %{_origname}-%{version}
+%setup -q -n %{origname}-%{version}
 
 %build
-%{__make} CC="%{__cc} %{rpmcflags} -I%{_includedir}"
+%{__make} \
+	CC="%{__cc} %{rpmcflags} -I%{_includedir}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_bindir},%{_gamedata}/{all,desert,models,music,sea,sounds},%{_desktopdir}}
+install -d $RPM_BUILD_ROOT{%{_bindir},%{_libdir}/%{name},%{_gamedata}/{all,desert,models,music,sea,sounds},%{_desktopdir}}
 
-install %{_origname}	$RPM_BUILD_ROOT%{_datadir}/%{name}/
-install config		$RPM_BUILD_ROOT%{_datadir}/%{name}/
-install data/all/*	$RPM_BUILD_ROOT%{_gamedata}/all/
-install data/desert/*	$RPM_BUILD_ROOT%{_gamedata}/desert/
-install data/models/*	$RPM_BUILD_ROOT%{_gamedata}/models/
-install data/music/*	$RPM_BUILD_ROOT%{_gamedata}/music/
-install data/sea/*	$RPM_BUILD_ROOT%{_gamedata}/sea/
-install data/sounds/*	$RPM_BUILD_ROOT%{_gamedata}/sounds/
+install %{origname}	$RPM_BUILD_ROOT%{_datadir}/%{name}
+install config		$RPM_BUILD_ROOT%{_datadir}/%{name}
+install data/all/*	$RPM_BUILD_ROOT%{_gamedata}/all
+install data/desert/*	$RPM_BUILD_ROOT%{_gamedata}/desert
+install data/models/*	$RPM_BUILD_ROOT%{_gamedata}/models
+install data/music/*	$RPM_BUILD_ROOT%{_gamedata}/music
+install data/sea/*	$RPM_BUILD_ROOT%{_gamedata}/sea
+install data/sounds/*	$RPM_BUILD_ROOT%{_gamedata}/sounds
 
 cat > $RPM_BUILD_ROOT%{_bindir}/%{name} << EOF
 #!/bin/sh
 # Initialization script:
 
-cd %{_datadir}/%{name}/
-./%{_origname}
+cd %{_datadir}/%{name}
+%{_libdir}/%{name}/%{origname}
 EOF
 
-install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}/
+install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -79,24 +72,13 @@
 %files
 %defattr(644,root,root,755)
 %doc README
-%attr(755,root,root) %{_bindir}/*
-%attr(755,root,root) %{_datadir}/%{name}/%{_origname}
-%config(noreplace) %{_datadir}/%{name}/config
-%{_gamedata}/all/*
-%{_gamedata}/desert/*
-%{_gamedata}/models/*
-%{_gamedata}/music/*
-%{_gamedata}/sea/*
-%{_gamedata}/sounds/*
+%attr(755,root,root) %{_bindir}/%{name}
+%dir %{_libdir}/%{name}
+%attr(755,root,root) %{_libdir}/%{name}/%{origname}
 %dir %{_datadir}/%{name}
-%dir %{_gamedata}
-%dir %{_gamedata}/all
-%dir %{_gamedata}/desert
-%dir %{_gamedata}/models
-%dir %{_gamedata}/music
-%dir %{_gamedata}/sea
-%dir %{_gamedata}/sounds
-%{_desktopdir}/*
+%config(noreplace) %{_datadir}/%{name}/config
+%{_gamedata}
+%{_desktopdir}/%{name}.desktop
 #%%{_pixmapsdir}/*
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -105,6 +87,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.12  2007-11-30 18:37:17  qboosh
+- dropped ra bcond
+- FHS fix: binary moved to %{_libdir}/%{name}
+
 Revision 1.11  2007-11-30 18:27:12  blekot
 - desktop files moved to proper place
 - now build
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/raceGL.spec?r1=1.11&r2=1.12&f=u