rpms/ufoai-data/F-17 .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 ufoai-data.spec, 1.5, 1.6

[Karel Volný]

Author: kvolny

Update of /cvs/nonfree/rpms/ufoai-data/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv18518

Modified Files:
	.cvsignore sources ufoai-data.spec 
Log Message:
* Fri Jun 29 2012 Karel Volny <kvolny at redhat.com> 2.4-1
- Version bump
- Added introductory video



Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/ufoai-data/F-17/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	12 Mar 2011 16:21:59 -0000	1.4
+++ .cvsignore	1 Jul 2012 13:57:29 -0000	1.5
@@ -1,2 +1,3 @@
-ufoai-2.3.1-data.tar
+ufoai-2.4-data.tar
+intro.ogm
 1maps.pk3


Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/ufoai-data/F-17/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	12 Mar 2011 16:21:59 -0000	1.4
+++ sources	1 Jul 2012 13:57:29 -0000	1.5
@@ -1,2 +1,3 @@
-11468144bc00618c38667eec04b12a4a  ufoai-2.3.1-data.tar
+4f3f343754a4aae401582021901c4737  ufoai-2.4-data.tar
+692737788043d2fc049b060393f17b7a  intro.ogm
 0187f2169401d59423c6e01184fff90d  1maps.pk3


Index: ufoai-data.spec
===================================================================
RCS file: /cvs/nonfree/rpms/ufoai-data/F-17/ufoai-data.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ufoai-data.spec	8 Feb 2012 23:50:09 -0000	1.5
+++ ufoai-data.spec	1 Jul 2012 13:57:29 -0000	1.6
@@ -1,16 +1,19 @@
 %define game_name ufoai
 
 Name:		ufoai-data
-Version:	2.3.1
-Release:	2
+Version:	2.4
+Release:	1
 Summary:	UFO: Alien Invasion data files
 
 Group:		Amusements/Games
 License:	GPLv2+
 URL:		http://ufoai.sourceforge.net/
 Source0:	http://downloads.sourceforge.net/%{game_name}/%{game_name}-%{version}-data.tar
+# not included in the package, downloaded from
+# http://ufoai.git.sourceforge.net/git/gitweb.cgi?p=ufoai/ufoai;a=blob;f=base/videos/intro.ogm;h=f71651694d6397dec38ece7bd0b8aac304aa708d;hb=HEAD
+Source1:	intro.ogm
 # city maps hotfix
-Source1:	http://mattn.ninex.info/1maps.pk3
+Source2:	http://mattn.ninex.info/1maps.pk3
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
@@ -46,8 +49,11 @@
 rm -rf %{buildroot}
 mkdir -p -m 0755 %{buildroot}%{_datadir}/%{game_name}
 cp -pr base %{buildroot}%{_datadir}/%{game_name}/
+# introductory video not in data pack
+mkdir -p -m 0755 %{buildroot}%{_datadir}/%{game_name}/base/videos/
+install -m 644 %{SOURCE1} %{buildroot}%{_datadir}/%{game_name}/base/videos/
 # city maps hotfix
-install -m 644 %{SOURCE1} %{buildroot}%{_datadir}/%{game_name}/base/
+install -m 644 %{SOURCE2} %{buildroot}%{_datadir}/%{game_name}/base/
 
 
 %clean
@@ -63,6 +69,8 @@
 %{_datadir}/%{game_name}/base/0pics.pk3
 %{_datadir}/%{game_name}/base/0snd.pk3
 %{_datadir}/%{game_name}/base/0shaders.pk3
+%{_datadir}/%{game_name}/base/0textures.pk3
+%{_datadir}/%{game_name}/base/videos/
 
 
 %files server
@@ -77,6 +85,10 @@
 
 
 %changelog
+* Fri Jun 29 2012 Karel Volny <kvolny at redhat.com> 2.4-1
+- Version bump
+- Added introductory video
+
 * Thu Feb 09 2012 Nicolas Chauvet <kwizart at gmail.com> - 2.3.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild