SPECS: ufo2000.spec - builds, packages

[glen]

Author: glen                         Date: Mon Jan  7 17:47:27 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- builds, packages

---- Files affected:
SPECS:
   ufo2000.spec (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: SPECS/ufo2000.spec
diff -u SPECS/ufo2000.spec:1.3 SPECS/ufo2000.spec:1.4
--- SPECS/ufo2000.spec:1.3	Mon Jan  7 17:28:40 2008
+++ SPECS/ufo2000.spec	Mon Jan  7 18:47:22 2008
@@ -67,30 +67,32 @@
 EOF
 %{__make} \
 	CC="%{__cc}" \
+	CX="%{__cxx}" \
 	OPTFLAGS="%{rpmcflags} -I/usr/include/hawknl" \
 	OFLAGS="%{rpmcflags} -fPIC"
 cd -
 
-%{__make}
+%{__make} \
 	CC="%{__cc}" \
+	CX="%{__cxx}" \
 	OPTFLAGS="%{rpmcflags} -I/usr/include/hawknl -Idumb/include" \
 	DATA_DIR="%{_datadir}/games/%{name}" \
 	all server
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install $RPM_BUILD_ROOT%{_prefix}/games
-install %{name} $RPM_BUILD_ROOT%{_prefix}/games
-install %{name}-srv $RPM_BUILD_ROOT%{_prefix}/games
+install -d $RPM_BUILD_ROOT%{_bindir}
+install %{name} $RPM_BUILD_ROOT%{_bindir}
+install %{name}-srv $RPM_BUILD_ROOT%{_bindir}
 
-install $RPM_BUILD_ROOT%{_datadir}/games/%{name}
+install -d $RPM_BUILD_ROOT%{_datadir}/games/%{name}
 install %{name}.default.ini $RPM_BUILD_ROOT%{_datadir}/games/%{name}/%{name}.ini
 
 for i in arts extensions fonts init-scripts newmaps newmusic newunits script translations; do
 	cp -a $i $RPM_BUILD_ROOT%{_datadir}/games/%{name}
 done
-install $RPM_BUILD_ROOT%{_datadir}/games/%{name}/TFTD
-install $RPM_BUILD_ROOT%{_datadir}/games/%{name}/XCOM
+install -d $RPM_BUILD_ROOT%{_datadir}/games/%{name}/TFTD
+install -d $RPM_BUILD_ROOT%{_datadir}/games/%{name}/XCOM
 for i in keyboard.dat select_option.ini soundmap.xml squad.default.lua \
 	ufo2000.dat %{name}.default.ini xcom_folder.ini; do
 	cp -a $i $RPM_BUILD_ROOT%{_datadir}/games/%{name}
@@ -100,7 +102,7 @@
 find $RPM_BUILD_ROOT%{_datadir}/games/%{name} -type d -print0 | xargs -0 chmod 775
 
 # create menu and icon
-install $RPM_BUILD_ROOT%{_pixmapsdir}
+install -d $RPM_BUILD_ROOT%{_pixmapsdir}
 install %{SOURCE1} $RPM_BUILD_ROOT%{_pixmapsdir}
 
 cat > %{name}.desktop << EOF
@@ -114,6 +116,7 @@
 Categories=Game;StrategyGame;
 Type=Application
 EOF
+install -d $RPM_BUILD_ROOT%{_desktopdir}
 install %{name}.desktop $RPM_BUILD_ROOT%{_desktopdir}
 
 %clean
@@ -123,8 +126,8 @@
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog COPYING *.txt *.html readme_select.ini
 %doc docs/*
-%{_prefix}/games/ufo2000
-%{_prefix}/games/ufo2000-srv
+%attr(755,root,root) %{_bindir}/ufo2000
+%attr(755,root,root) %{_bindir}/ufo2000-srv
 %dir %{_datadir}/games/%{name}
 %{_datadir}/games/%{name}/*
 %{_pixmapsdir}/*.png
@@ -132,10 +135,13 @@
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
-* %{date} RPM Team <rpm at cvs.delfi.ee>
-All persons listed below can be reached at <cvs_login>@cvs.delfi.ee
+* %{date} PLD Team <feedback at pld-linux.org>
+All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.4  2008-01-07 17:47:22  glen
+- builds, packages
+
 Revision 1.3  2008-01-07 16:28:40  glen
 - misc fixes
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/ufo2000.spec?r1=1.3&r2=1.4&f=u