SPECS: openttd.spec - scenarios removed - S: openttd-ai - added dirs for AI...

[sparky]

Author: sparky                       Date: Sat Apr  4 14:17:52 2009 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- scenarios removed
- S: openttd-ai
- added dirs for AI and scenarios
- removed data <-> binary loop
- game and dedicated are not mutually exclusive

---- Files affected:
SPECS:
   openttd.spec (1.64 -> 1.65) 

---- Diffs:

================================================================
Index: SPECS/openttd.spec
diff -u SPECS/openttd.spec:1.64 SPECS/openttd.spec:1.65
--- SPECS/openttd.spec:1.64	Fri Apr  3 18:02:00 2009
+++ SPECS/openttd.spec	Sat Apr  4 16:17:46 2009
@@ -12,12 +12,8 @@
 Group:		X11/Applications/Games
 Source0:	http://dl.sourceforge.net/openttd/%{name}-%{version}-source.tar.bz2
 # Source0-md5:	3185dccdb094ada9a1f3f610965c15bc
-Source1:	http://dl.sourceforge.net/openttd/%{name}-0.4.8-scenarios.tar.bz2
-# Source1-md5:	34e8cb13ce1d4e6b5b24887c628c1ac8
-Source2:	http://dl.sourceforge.net/openttd/%{name}-0.5.0-scenarios.tar.bz2
-# Source2-md5:	37892f1fdded957f956766642a9e877d
-Source3:	%{name}.desktop
-Source4:	%{name}-server.desktop
+Source1:	%{name}.desktop
+Source2:	%{name}-server.desktop
 Patch0:		%{name}-home_etc.patch
 Patch1:		%{name}-libiconv.patch
 URL:		http://www.openttd.com/
@@ -30,7 +26,7 @@
 BuildRequires:	zlib-devel
 Requires:	%{name}-data = %{version}-%{release}
 Provides:	%{name}-binary = %{version}-%{release}
-Obsoletes:	openttd-server
+Suggests:	%{name}-ai
 Suggests:	TiMidity++
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -53,7 +49,6 @@
 Summary:	OpenTTD data files
 Summary(pl.UTF-8):	Pliki danych OpenTTD
 Group:		X11/Applications/Games
-Requires:	%{name}-binary = %{version}-%{release}
 
 %description data
 OpenTTD data files.
@@ -67,7 +62,6 @@
 Group:		X11/Applications/Games
 Requires:	%{name}-data = %{version}-%{release}
 Provides:	%{name}-binary = %{version}-%{release}
-Obsoletes:	openttd
 
 %description server
 This package contains OpenTTD dedicated server. Note that
@@ -79,13 +73,6 @@
 
 %prep
 %setup -q
-mkdir bin/scenario
-cd bin/scenario
-tar xvjf %{SOURCE1}
-tar xvjf %{SOURCE2}
-mv openttd-0.4.8-RC1-scenarios/* .
-rmdir openttd-0.4.8-RC1-scenarios
-cd ../..
 %{?with_home_etc:%patch0 -p1}
 %patch1 -p1
 
@@ -164,7 +151,8 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 
-install -d $RPM_BUILD_ROOT{%{_desktopdir},%{_mandir}/man6,%{_pixmapsdir},%{_datadir}/%{name}/scenario}
+install -d $RPM_BUILD_ROOT{%{_desktopdir},%{_mandir}/man6,%{_pixmapsdir}}
+install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/{ai/library,scenario/heightmap}
 
 %{__make} install \
 	INSTALL_DIR=$RPM_BUILD_ROOT \
@@ -173,9 +161,8 @@
 	PREFIX="/" \
 
 install bin/openttd-dedicated $RPM_BUILD_ROOT%{_bindir}
-install bin/scenario/* $RPM_BUILD_ROOT%{_datadir}/%{name}/scenario
-install %{SOURCE3} $RPM_BUILD_ROOT%{_desktopdir}
-install %{SOURCE4} $RPM_BUILD_ROOT%{_desktopdir}
+install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
+install %{SOURCE2} $RPM_BUILD_ROOT%{_desktopdir}
 install docs/openttd.6 $RPM_BUILD_ROOT%{_mandir}/man6
 install media/openttd.256.png $RPM_BUILD_ROOT%{_pixmapsdir}/openttd.png
 
@@ -207,6 +194,13 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.65  2009/04/04 14:17:46  sparky
+- scenarios removed
+- S: openttd-ai
+- added dirs for AI and scenarios
+- removed data <-> binary loop
+- game and dedicated are not mutually exclusive
+
 Revision 1.64  2009/04/03 16:02:00  adamg
 - include icons
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/openttd.spec?r1=1.64&r2=1.65&f=u