rpms/vegastrike-data/F-9 vegastrike-data-0.5.0-playlists.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 vegastrike-data.spec, 1.5, 1.6 vegastrike-data-0.4.3-text-encoding.patch, 1.1, NONE
Hans de Goede (jwrdegoede)
fedora-extras-commits at redhat.com
Thu May 8 20:12:17 UTC 2008
Author: jwrdegoede
Update of /cvs/extras/rpms/vegastrike-data/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24173
Modified Files:
.cvsignore sources vegastrike-data.spec
Added Files:
vegastrike-data-0.5.0-playlists.patch
Removed Files:
vegastrike-data-0.4.3-text-encoding.patch
Log Message:
* Sat May 3 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 0.5.0-1
- New upstream release 0.5.0
vegastrike-data-0.5.0-playlists.patch:
--- NEW FILE vegastrike-data-0.5.0-playlists.patch ---
diff -up vegastrike-data-0.5.0/.vegastrike-0.5.0/playlists/battle/aera.m3u~ vegastrike-data-0.5.0/.vegastrike-0.5.0/playlists/battle/aera.m3u
--- vegastrike-data-0.5.0/.vegastrike-0.5.0/playlists/battle/aera.m3u~ 2008-05-04 08:48:18.000000000 +0200
+++ vegastrike-data-0.5.0/.vegastrike-0.5.0/playlists/battle/aera.m3u 2008-05-04 08:48:18.000000000 +0200
@@ -1,12 +1,6 @@
#EXTM3U
#aera-specific
../music/aerathemebattle.ogg
-../music/SonOfSandFleaRemix.ogg
-../music/AyMambo.ogg
#fix weights
../music/aerathemebattle.ogg
../music/aerathemebattle.ogg
-../music/SonOfSandFleaRemix.ogg
-../music/AyMambo.ogg
-../music/SonOfSandFleaRemix.ogg
-../music/AyMambo.ogg
diff -up vegastrike-data-0.5.0/.vegastrike-0.5.0/playlists/battle/rlaan.m3u~ vegastrike-data-0.5.0/.vegastrike-0.5.0/playlists/battle/rlaan.m3u
--- vegastrike-data-0.5.0/.vegastrike-0.5.0/playlists/battle/rlaan.m3u~ 2008-05-04 09:15:59.000000000 +0200
+++ vegastrike-data-0.5.0/.vegastrike-0.5.0/playlists/battle/rlaan.m3u 2008-05-04 09:15:59.000000000 +0200
@@ -1,11 +1,4 @@
#EXTM3U
-#rlaan-specific
-../music/BlackLlama.ogg
#common threat files - remove when enough rlaan-specific variety is achieved
../music/battle3electro.ogg
../music/battle5.ogg
-#fix weights
-../music/BlackLlama.ogg
-../music/BlackLlama.ogg
-../music/BlackLlama.ogg
-../music/BlackLlama.ogg
diff -up vegastrike-data-0.5.0/.vegastrike-0.5.0/playlists/battle/terran.m3u~ vegastrike-data-0.5.0/.vegastrike-0.5.0/playlists/battle/terran.m3u
--- vegastrike-data-0.5.0/.vegastrike-0.5.0/playlists/battle/terran.m3u~ 2008-05-04 09:16:30.000000000 +0200
+++ vegastrike-data-0.5.0/.vegastrike-0.5.0/playlists/battle/terran.m3u 2008-05-04 09:16:30.000000000 +0200
@@ -1,7 +1,6 @@
#EXTM3U
#terran-specific
../music/terranbattle.ogg
-../music/MezzaMessa.ogg
#common threat files
../music/battle3electro.ogg
../music/battle5.ogg
diff -up vegastrike-data-0.5.0/.vegastrike-0.5.0/playlists/peace/around_sig/aera.m3u~ vegastrike-data-0.5.0/.vegastrike-0.5.0/playlists/peace/around_sig/aera.m3u
--- vegastrike-data-0.5.0/.vegastrike-0.5.0/playlists/peace/around_sig/aera.m3u~ 2008-05-04 09:17:20.000000000 +0200
+++ vegastrike-data-0.5.0/.vegastrike-0.5.0/playlists/peace/around_sig/aera.m3u 2008-05-04 09:17:39.000000000 +0200
@@ -1,10 +1,9 @@
#EXTM3U
#aera-specific
../music/aerapeace.ogg
-../music/InnerChild.ogg
#common peace/away files - not very aerish, they break the mood
-#../music/mission.ogg
-#../music/steel_p.ogg
+../music/mission.ogg
+../music/steel_p.ogg
#fix weights - I want aerapeace to kick in most of the time one
# gets within a significant's range
../music/aerapeace.ogg
diff -up vegastrike-data-0.5.0/.vegastrike-0.5.0/playlists/peace/away/aera_friend.m3u~ vegastrike-data-0.5.0/.vegastrike-0.5.0/playlists/peace/away/aera_friend.m3u
--- vegastrike-data-0.5.0/.vegastrike-0.5.0/playlists/peace/away/aera_friend.m3u~ 2008-05-04 09:19:22.000000000 +0200
+++ vegastrike-data-0.5.0/.vegastrike-0.5.0/playlists/peace/away/aera_friend.m3u 2008-05-04 09:19:22.000000000 +0200
@@ -1,12 +1,9 @@
#EXTM3U
#aera-specific
-#../music/aerapeace.ogg#AyMambo and mission are long enough, reserve this for around_sig
-../music/AyMambo.ogg
+../music/aerapeace.ogg
#this is to outweight other tracks
-../music/AyMambo.ogg
-../music/AyMambo.ogg
-../music/AyMambo.ogg
-../music/AyMambo.ogg
+../music/aerapeace.ogg
+../music/aerapeace.ogg
#avoid monotonous play - quite generic tracks, they should be removed
# when enough variety in factionalized tracks has been achieved.
../music/mission.ogg
diff -up vegastrike-data-0.5.0/.vegastrike-0.5.0/playlists/peace/away/aera_hostile.m3u~ vegastrike-data-0.5.0/.vegastrike-0.5.0/playlists/peace/away/aera_hostile.m3u
--- vegastrike-data-0.5.0/.vegastrike-0.5.0/playlists/peace/away/aera_hostile.m3u~ 2008-05-04 10:06:16.000000000 +0200
+++ vegastrike-data-0.5.0/.vegastrike-0.5.0/playlists/peace/away/aera_hostile.m3u 2008-05-04 10:06:16.000000000 +0200
@@ -1,16 +1,15 @@
#EXTM3U
#aeran-specific
../music/aerapeace.ogg
-../music/AyMambo.ogg
-../music/SonOfSandFleaRemix.ogg
#common hostile-space files, not very aerish
-#../music/battle3electro.ogg
-#../music/battle4showdown.ogg
-#../music/battel5_p.ogg
+../music/battle3electro.ogg
+../music/battle4showdown.ogg
+../music/battel5_p.ogg
#fix weights
-../music/AyMambo.ogg
-../music/AyMambo.ogg
-../music/AyMambo.ogg
-../music/AyMambo.ogg
-../music/SonOfSandFleaRemix.ogg
-../music/SonOfSandFleaRemix.ogg
+../music/aerapeace.ogg
+../music/aerapeace.ogg
+../music/aerapeace.ogg
+../music/aerapeace.ogg
+../music/aerapeace.ogg
+../music/aerapeace.ogg
+../music/aerapeace.ogg
diff -up vegastrike-data-0.5.0/.vegastrike-0.5.0/playlists/peace/away/rlaan_friend.m3u~ vegastrike-data-0.5.0/.vegastrike-0.5.0/playlists/peace/away/rlaan_friend.m3u
--- vegastrike-data-0.5.0/.vegastrike-0.5.0/playlists/peace/away/rlaan_friend.m3u~ 2008-05-04 10:05:27.000000000 +0200
+++ vegastrike-data-0.5.0/.vegastrike-0.5.0/playlists/peace/away/rlaan_friend.m3u 2008-05-04 10:05:27.000000000 +0200
@@ -1,14 +1,13 @@
#EXTM3U
#rlaan-specific
../music/industrialmixed.ogg
-../music/Bliss.ogg
../music/DepressionChamber.ogg
#outweight "avoid monotonous play" section
-../music/industrialmixed.ogg|../music/Bliss.ogg
../music/industrialmixed.ogg
-../music/Bliss.ogg|../music/industrialmixed.ogg
-../music/Bliss.ogg|../music/industrialmixed.ogg
-../music/Bliss.ogg
-../music/Bliss.ogg
+../music/industrialmixed.ogg
+../music/industrialmixed.ogg
+../music/DepressionChamber.ogg
+../music/DepressionChamber.ogg
+../music/DepressionChamber.ogg
#avoid monotonous play, rlaanish enough
../music/peace4.ogg
diff -up vegastrike-data-0.5.0/.vegastrike-0.5.0/playlists/peace/away/rlaan_hostile.m3u~ vegastrike-data-0.5.0/.vegastrike-0.5.0/playlists/peace/away/rlaan_hostile.m3u
--- vegastrike-data-0.5.0/.vegastrike-0.5.0/playlists/peace/away/rlaan_hostile.m3u~ 2008-05-04 10:04:42.000000000 +0200
+++ vegastrike-data-0.5.0/.vegastrike-0.5.0/playlists/peace/away/rlaan_hostile.m3u 2008-05-04 10:04:42.000000000 +0200
@@ -1,11 +1,8 @@
#EXTM3U
#rlaan-specific
../music/industralmixed.ogg
-../music/Bliss.ogg
-../music/BlackLlama.ogg
../music/DepressionChamber.ogg
#fix weights
../music/industralmixed.ogg
-../music/Bliss.ogg
-../music/industralmixed.ogg|../music/Bliss.ogg
-../music/Bliss.ogg|../music/industralmixed.ogg
+../music/industralmixed.ogg
+../music/industralmixed.ogg
diff -up vegastrike-data-0.5.0/.vegastrike-0.5.0/playlists/peace/away/terran_hostile.m3u~ vegastrike-data-0.5.0/.vegastrike-0.5.0/playlists/peace/away/terran_hostile.m3u
--- vegastrike-data-0.5.0/.vegastrike-0.5.0/playlists/peace/away/terran_hostile.m3u~ 2008-05-04 10:11:50.000000000 +0200
+++ vegastrike-data-0.5.0/.vegastrike-0.5.0/playlists/peace/away/terran_hostile.m3u 2008-05-04 10:11:50.000000000 +0200
@@ -1,8 +1,6 @@
#EXTM3U
#terran-specific
../music/terranpeace2.ogg
-#terran-hostile
-../music/MezzaMessa.ogg
#common hostile-space files
../music/battle3electro.ogg
../music/battle4showdown.ogg
diff -up vegastrike-data-0.5.0/.vegastrike-0.5.0/playlists/threat/aera.m3u~ vegastrike-data-0.5.0/.vegastrike-0.5.0/playlists/threat/aera.m3u
--- vegastrike-data-0.5.0/.vegastrike-0.5.0/playlists/threat/aera.m3u~ 2008-05-04 10:07:22.000000000 +0200
+++ vegastrike-data-0.5.0/.vegastrike-0.5.0/playlists/threat/aera.m3u 2008-05-04 10:07:22.000000000 +0200
@@ -1,14 +1,14 @@
#EXTM3U
#aera-specific
../music/aerapeace.ogg
-../music/AyMambo.ogg
-#confuse people
-../music/SonOfSandFleaRemix.ogg
#common threat files - don't apply, they don't match with Aeran style
-#../music/battle1.ogg
-#../music/battle2.ogg
+../music/battle1.ogg
+../music/battle2.ogg
#fix weights
-../music/AyMambo.ogg
-../music/AyMambo.ogg
-../music/AyMambo.ogg
-../music/AyMambo.ogg
+../music/aerapeace.ogg
+../music/aerapeace.ogg
+../music/aerapeace.ogg
+../music/aerapeace.ogg
+../music/aerapeace.ogg
+../music/aerapeace.ogg
+../music/aerapeace.ogg
diff -up vegastrike-data-0.5.0/.vegastrike-0.5.0/playlists/threat/rlaan.m3u~ vegastrike-data-0.5.0/.vegastrike-0.5.0/playlists/threat/rlaan.m3u
--- vegastrike-data-0.5.0/.vegastrike-0.5.0/playlists/threat/rlaan.m3u~ 2008-05-04 10:07:46.000000000 +0200
+++ vegastrike-data-0.5.0/.vegastrike-0.5.0/playlists/threat/rlaan.m3u 2008-05-04 10:07:46.000000000 +0200
@@ -1,15 +1,11 @@
#EXTM3U
#rlaan-specific
-../music/Bliss.ogg
-../music/BlackLlama.ogg
../music/DepressionChamber.ogg
#common threat files - remove when rlaan-specific variety permits it
../music/battle1.ogg
../music/battle2.ogg
#fix weights
-../music/Bliss.ogg
-../music/BlackLlama.ogg
-../music/Bliss.ogg
-../music/BlackLlama.ogg
-../music/Bliss.ogg
-../music/BlackLlama.ogg
+../music/DepressionChamber.ogg
+../music/DepressionChamber.ogg
+../music/DepressionChamber.ogg
+../music/DepressionChamber.ogg
diff -up vegastrike-data-0.5.0/.vegastrike-0.5.0/playlists/threat/terran.m3u~ vegastrike-data-0.5.0/.vegastrike-0.5.0/playlists/threat/terran.m3u
--- vegastrike-data-0.5.0/.vegastrike-0.5.0/playlists/threat/terran.m3u~ 2008-05-04 10:08:03.000000000 +0200
+++ vegastrike-data-0.5.0/.vegastrike-0.5.0/playlists/threat/terran.m3u 2008-05-04 10:08:03.000000000 +0200
@@ -1,7 +1,6 @@
#EXTM3U
#terran-specific
../music/terranpeace2.ogg
-../music/MezzaMessa.ogg
../music/Trapped.ogg
#common threat files
../music/battle1.ogg
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/vegastrike-data/F-9/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 17 Jun 2007 07:00:16 -0000 1.3
+++ .cvsignore 8 May 2008 20:11:39 -0000 1.4
@@ -1,2 +1 @@
-vegastrike-data-0.4.3.tar.bz2
-generic_cargo_datapatch.zip
+vegastrike-data-0.5.0.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/vegastrike-data/F-9/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 17 Jun 2007 07:00:16 -0000 1.3
+++ sources 8 May 2008 20:11:39 -0000 1.4
@@ -1,2 +1 @@
-e0ea822683b94828dcdd5b64aa2dc75d vegastrike-data-0.4.3.tar.bz2
-ba5de8465faebe9c37c73159c3d0073f generic_cargo_datapatch.zip
+a25fd4a4458dc5795f9e11166db1e06f vegastrike-data-0.5.0.tar.bz2
Index: vegastrike-data.spec
===================================================================
RCS file: /cvs/extras/rpms/vegastrike-data/F-9/vegastrike-data.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- vegastrike-data.spec 27 Feb 2008 21:22:25 -0000 1.5
+++ vegastrike-data.spec 8 May 2008 20:11:39 -0000 1.6
@@ -1,25 +1,16 @@
Name: vegastrike-data
-Version: 0.4.3
-Release: 5%{?dist}
+Version: 0.5.0
+Release: 1
Summary: Data files for Vega Strike
Group: Amusements/Games
License: GPLv2+
URL: http://vegastrike.sourceforge.net/
-# sigh no tarballs from upstream why o why? Created by doing the following:
-# cvs -z9 \
-# -d:pserver:anonymous at vegastrike.cvs.sourceforge.net:/cvsroot/vegastrike \
-# checkout -rvegastrike_0_4_3 data4.x
-# mv data4.x vegastrike-data-0.4.3
-# pushd vegastrike-data-0.4.3
-# rm -rf aclocal.m4 configure.ac Makefile.in vegastrike-data.spec stamp-h.in
-# rm -rf bin fixmusic.sh *loki* vegastrike.sh vsinstall.sh play_vs 021.nsi
-# rm -rf `find -name CVS -type d` `find -name Makefile.am -type f`
-# rm -rf `find -name '*~' -type f`
-# popd
-# tar cvfj vegastrike-data-0.4.3.tar.bz2 vegastrike-data-0.4.3
+# This is:
+# http://downloads.sourceforge.net/vegastrike/vegastrike-linux-0.5.0.tar.bz2
+# with the music and bin directories removed as those are packaged seperately
Source0: %{name}-%{version}.tar.bz2
-Source1: http://downloads.sourceforge.net/vegastrike/generic_cargo_datapatch.zip
-Patch0: vegastrike-data-0.4.3-text-encoding.patch
+# Remove non free songs from playlists
+Patch0: vegastrike-data-0.5.0-playlists.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
Requires: vegastrike >= %{version}
@@ -30,18 +21,16 @@
%prep
-%setup -q -a 1
+%setup -q
%patch0 -p1
-iconv -f WINDOWS-1250 -t utf-8 bases/bartender.py > bases/bartender.py.tmp
-mv bases/bartender.py.tmp bases/bartender.py
# some cleanup
-rm -r modules/.#total_war.c.1.8 cockpits/bomber-cockpit.cpt/#cockpit.xmesh# \
- modules/.cvsignore modules/.#faction_ships.py.1.13 modules/builtin
-sed -i 's/\r//g' modules/spawner.py modules/cleansweep.py
+rm -r cockpits/bomber-cockpit.cpt/#cockpit.xmesh# meshes/supernova.bmp.xmesh~ \
+ modules/.cvsignore modules/builtin `find -name "*.xmesh"`
find . -type f -print0 | xargs -0 chmod -x
-chmod +x convertbfxm.sh BFXMupdate.pl units/findunits.py modules/webpageize.py
-# remove the stale included manpages
-rm documentation/*.1
+chmod +x units/findunits.py modules/webpageize.py
+sed -i 's/\r//g' documentation/mission_howto.txt
+# remove the stale included manpages and the .xls abonimation
+rm documentation/*.1 documentation/*.xls
%build
@@ -51,24 +40,48 @@
%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_datadir}/vegastrike
-cp -a * $RPM_BUILD_ROOT%{_datadir}/vegastrike
-mv $RPM_BUILD_ROOT%{_datadir}/vegastrike/documentation installed-docs
-mv $RPM_BUILD_ROOT%{_datadir}/vegastrike/newfs_changes.txt installed-docs
+for i in .vegastrike-0.5.0 ai animations bases cockpits communications \
+ history meshes mission modules movies programs sectors sounds \
+ sprites textures units universe \
+ *.xml *.csv *.config *.cur *.xpm New_Game Version.txt; do
+ cp -a $i $RPM_BUILD_ROOT%{_datadir}/vegastrike
+done
ln -s ../doc/%{name}-%{version} \
$RPM_BUILD_ROOT%{_datadir}/vegastrike/documentation
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/128x128/apps
+install -p -m 644 vegastrike.xpm \
+ $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/128x128/apps
+
%clean
rm -rf $RPM_BUILD_ROOT
+%post
+touch --no-create %{_datadir}/icons/hicolor || :
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+ %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
+
+%postun
+touch --no-create %{_datadir}/icons/hicolor || :
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+ %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
+
+
%files
%defattr(-,root,root,-)
-%doc README vega-license.txt installed-docs/*
+%doc vega-license.txt documentation/*
%{_datadir}/vegastrike
+%{_datadir}/icons/hicolor/128x128/apps/vegastrike.xpm
%changelog
+* Sat May 3 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 0.5.0-1
+- New upstream release 0.5.0
+
* Wed Feb 27 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 0.4.3-5
- Fix text encoding issues in 2 python files causing vegastrike to fail
with python 2.5 (bz 435157)
--- vegastrike-data-0.4.3-text-encoding.patch DELETED ---
More information about the fedora-extras-commits
mailing list