SPECS: et.spec - avoid ELF objects in -data package

[glen]

Author: glen                         Date: Tue Mar 20 01:00:36 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- avoid ELF objects in -data package

---- Files affected:
SPECS:
   et.spec (1.12 -> 1.13) 

---- Diffs:

================================================================
Index: SPECS/et.spec
diff -u SPECS/et.spec:1.12 SPECS/et.spec:1.13
--- SPECS/et.spec:1.12	Mon Feb 12 22:23:54 2007
+++ SPECS/et.spec	Tue Mar 20 02:00:31 2007
@@ -9,7 +9,7 @@
 Summary(pl.UTF-8):	Enemy Territory - Terytorium wroga
 Name:		et
 Version:	2.60
-Release:	0.1
+Release:	0.3
 Epoch:		0
 License:	RTCW-ETEULA
 Group:		Applications/Games
@@ -25,7 +25,7 @@
 
 %define		no_install_post_strip	1
 %define		no_install_post_chrpath 1
-%define		_gamelibdir	%{_libdir}/games/et
+%define		_gamelibdir		%{_libdir}/games/et
 %define		_gamedatadir	%{_datadir}/games/et
 
 %description
@@ -51,10 +51,12 @@
 %setup -qcT
 sh %{SOURCE0} --tar xf
 
+mv pb/PB_EULA.txt .
+
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_bindir},%{_pixmapsdir},%{_desktopdir}} \
-	$RPM_BUILD_ROOT{%{_gamelibdir},%{_gamedatadir}}
+	$RPM_BUILD_ROOT{%{_gamelibdir}/{pb,etmain},%{_gamedatadir}/etmain}
 
 install bin/Linux/x86/et.x86 $RPM_BUILD_ROOT%{_gamelibdir}/%{name}
 
@@ -64,32 +66,39 @@
 # the binaries must run with correct working directory
 cd %{_gamelibdir}
 export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:.
-exec ./%{name} "\$@"
+exec ./%{name} ${1:+"$@"}
 EOF
 
 install ET.xpm $RPM_BUILD_ROOT%{_pixmapsdir}/%{name}.xpm
 install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
-ln -s ../../../share/games/et/etmain $RPM_BUILD_ROOT%{_gamelibdir}
-
-cp -a pb $RPM_BUILD_ROOT%{_gamelibdir}
-# in DOCS
-rm -f $RPM_BUILD_ROOT%{_gamelibdir}/pb/PB_EULA.txt
+install etmain/*.so $RPM_BUILD_ROOT%{_gamelibdir}/etmain
 
 %if %{with data}
-cp -a etmain $RPM_BUILD_ROOT%{_gamedatadir}
+cp -a etmain/{video,*.{pk3,cfg,dat,txt}} $RPM_BUILD_ROOT%{_gamedatadir}/etmain
+cd $RPM_BUILD_ROOT%{_gamedatadir}/etmain
+for a in video *.{pk3,cfg,dat,txt}; do
+	ln -s ../../../../share/games/et/etmain/$a $RPM_BUILD_ROOT%{_gamelibdir}/etmain
+done
+cd -
 %endif
 
+install pb/*.so $RPM_BUILD_ROOT%{_gamelibdir}/pb
+install pb/*.x86 $RPM_BUILD_ROOT%{_gamelibdir}/pb
+cp -a pb/*.db $RPM_BUILD_ROOT%{_gamelibdir}/pb
+cp -a pb/htm $RPM_BUILD_ROOT%{_gamelibdir}/pb
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc CHANGES README Docs pb/PB_EULA.txt
+%doc CHANGES README Docs PB_EULA.txt
 %attr(755,root,root) %{_bindir}/*
 
 %dir %{_gamelibdir}
 %attr(755,root,root) %{_gamelibdir}/et
-%{_gamelibdir}/etmain
+%dir %{_gamelibdir}/etmain
+%attr(755,root,root) %{_gamelibdir}/etmain/*.so
 
 %dir %{_gamelibdir}/pb
 %{_gamelibdir}/pb/htm
@@ -113,6 +122,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.13  2007/03/20 01:00:31  glen
+- avoid ELF objects in -data package
+
 Revision 1.12  2007/02/12 21:23:54  glen
 - tabs in preamble
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/et.spec?r1=1.12&r2=1.13&f=u