rpms/crack-attack/FC-6 crack-attack-1.1.14-audio.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 crack-attack.spec, 1.1, 1.2 sources, 1.2, 1.3

[Hans de Goede (jwrdegoede)]

Author: jwrdegoede

Update of /cvs/extras/rpms/crack-attack/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24108

Modified Files:
	.cvsignore crack-attack.spec sources 
Added Files:
	crack-attack-1.1.14-audio.patch 
Log Message:
* Fri Jan 12 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.1.14-9
- Add music and sounds based on a suggestion by Michal Ambroz <rebus at seznam.cz>


crack-attack-1.1.14-audio.patch:

--- NEW FILE crack-attack-1.1.14-audio.patch ---
--- crack-attack-1.1.14/src/Music.h~	2007-01-12 10:54:25.000000000 +0100
+++ crack-attack-1.1.14/src/Music.h	2007-01-12 10:54:25.000000000 +0100
@@ -34,10 +34,10 @@
 #include <vector>
 
 #define GC_MUSIC_FILENAME_LENGTH 128
-#define GC_MUSIC_PRELUDE_TRACK   "prelude"
-#define GC_MUSIC_GAME_TRACK      "game"
-#define GC_MUSIC_GAMEOVER_TRACK  "gameover"
-#define GC_MUSIC_YOUWIN_TRACK    "youwin"
+#define GC_MUSIC_PRELUDE_TRACK   "prelude.xm"
+#define GC_MUSIC_GAME_TRACK      "game.xm"
+#define GC_MUSIC_GAMEOVER_TRACK  "gameover.xm"
+#define GC_MUSIC_YOUWIN_TRACK    "youwin.xm"
 
 class Music {
 	public:
--- crack-attack-1.1.14/src/Music.cxx~	2007-01-12 11:23:15.000000000 +0100
+++ crack-attack-1.1.14/src/Music.cxx	2007-01-12 11:23:15.000000000 +0100
@@ -91,7 +91,7 @@
 	cout << "Playing " << music_filelist[current_track].c_str() << endl;
 	#endif
 	music = Mix_LoadMUS( music_filelist[current_track].c_str() );
-	Mix_VolumeMusic( MIX_MAX_VOLUME / 4 );
+	Mix_VolumeMusic( (MIX_MAX_VOLUME * 8) / 10 );
 	Mix_PlayMusic( music , 0 );
 	Mix_HookMusicFinished(Music::finished);
 	keep_playing = 1;
@@ -126,7 +126,7 @@
 	cout << "Playing " << Track.c_str() << endl;
 	#endif
 	music = Mix_LoadMUS( Track.c_str() );
-	Mix_VolumeMusic( MIX_MAX_VOLUME / 4 );
+	Mix_VolumeMusic( (MIX_MAX_VOLUME * 8) / 10 );
 	Mix_PlayMusic( music , 0 );
 	keep_playing = 0;
 }


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/crack-attack/FC-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	3 Sep 2006 05:03:28 -0000	1.2
+++ .cvsignore	12 Jan 2007 11:06:44 -0000	1.3
@@ -1 +1,3 @@
 crack-attack-1.1.14.tar.bz2
+crack-attack-music.tar.gz
+crack-attack-sounds.tar.gz


Index: crack-attack.spec
===================================================================
RCS file: /cvs/extras/rpms/crack-attack/FC-6/crack-attack.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- crack-attack.spec	3 Sep 2006 05:03:28 -0000	1.1
+++ crack-attack.spec	12 Jan 2007 11:06:44 -0000	1.2
@@ -1,13 +1,16 @@
 Summary:        Puzzle action game
 Name:           crack-attack
 Version:        1.1.14
-Release:        8%{?dist}
+Release:        9%{?dist}
 License:        GPL
 Group:          Amusements/Games
 URL:            http://www.nongnu.org/crack-attack/
 Source0:        http://savannah.nongnu.org/download/%{name}/%{name}-%{version}.tar.bz2
+Source1:        http://www.miguev.net/misc/%{name}-sounds.tar.gz
+Source2:        %{name}-music.tar.gz
 Patch0:         crack-attack-1.1.14-glutInit.patch
 Patch1:         crack-attack-1.1.14-sanitize.patch
+Patch2:         crack-attack-1.1.14-audio.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  libstdc++-devel desktop-file-utils ImageMagick
 BuildRequires:  SDL-devel gtk2-devel pkgconfig SDL_mixer-devel freeglut-devel
@@ -21,11 +24,12 @@
 
 
 %prep
-%setup -q
+%setup -q -a 1 -a 2
 perl -pi -e 's/-O3 -s//g' src/Makefile.in
 perl -pi -e 's/-O2//g' src/gtk-gui/Makefile.in
 %patch0 -p1 -b .glutinit
 %patch1 -p1 -b .sanitize
+%patch2 -p1 -b .audio
 # fixup provided desktop file
 sed -i -e 's/%{name}\.xpm/%{name}\.png/' -e 's/Games/Game/' \
   data/%{name}.desktop
@@ -33,7 +37,7 @@
 
 
 %build
-%configure
+%configure --enable-sound
 make %{?_smp_mflags}
 
 
@@ -41,6 +45,12 @@
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
+#copy Music and Sounds
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/sounds
+install -m 644 data/sounds/* $RPM_BUILD_ROOT%{_datadir}/%{name}/sounds
+cp -a music $RPM_BUILD_ROOT%{_datadir}/%{name}
+
+# below is the desktop file and icon stuff.
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
 desktop-file-install --vendor fedora            \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
@@ -73,6 +83,7 @@
 %files
 %defattr(-,root,root,-)
 %doc doc/*.html doc/*.jpg doc/*.xpm AUTHORS COPYING README ChangeLog
+%doc music-sound-copyright.txt
 %{_bindir}/%{name}
 %{_datadir}/%{name}
 %{_datadir}/applications/fedora-%{name}*.desktop
@@ -81,6 +92,9 @@
 
 
 %changelog
+* Fri Jan 12 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.1.14-9
+- Add music and sounds based on a suggestion by Michal Ambroz <rebus at seznam.cz>
+
 * Sun Aug 27 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.1.14-8
 - Some small specfile cleanups
 - Don't ship patch backup files and other cruft as docs


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/crack-attack/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	3 Sep 2006 05:03:28 -0000	1.2
+++ sources	12 Jan 2007 11:06:44 -0000	1.3
@@ -1 +1,3 @@
 77bfcb38a293e87fd0d0eab05bae8177  crack-attack-1.1.14.tar.bz2
+1d82103472efd879ca7e65298ec9f8cf  crack-attack-music.tar.gz
+ba9f4ac0b0972427801f28c4f50422c8  crack-attack-sounds.tar.gz