rpms/scorchwentbonkers/devel scorchwentbonkers-divbyzero.patch, NONE, 1.1 scorchwentbonkers-fullscreen.patch, NONE, 1.1 scorchwentbonkers-no-fmod.patch, NONE, 1.1 scorchwentbonkers-support-16bpp.patch, NONE, 1.1 scorchwentbonkers-unixify.patch, NONE, 1.1 scorchwentbonkers.desktop, NONE, 1.1 scorchwentbonkers.png, NONE, 1.1 scorchwentbonkers.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

Hans de Goede (jwrdegoede) fedora-extras-commits at redhat.com
Thu Mar 15 11:27:24 UTC 2007


Author: jwrdegoede

Update of /cvs/extras/rpms/scorchwentbonkers/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13208/devel

Modified Files:
	.cvsignore sources 
Added Files:
	scorchwentbonkers-divbyzero.patch 
	scorchwentbonkers-fullscreen.patch 
	scorchwentbonkers-no-fmod.patch 
	scorchwentbonkers-support-16bpp.patch 
	scorchwentbonkers-unixify.patch scorchwentbonkers.desktop 
	scorchwentbonkers.png scorchwentbonkers.spec 
Log Message:
auto-import scorchwentbonkers-1.1-2.fc7 on branch devel from scorchwentbonkers-1.1-2.fc7.src.rpm

scorchwentbonkers-divbyzero.patch:

--- NEW FILE scorchwentbonkers-divbyzero.patch ---
diff -ur scorchwentbonkers-1.1.orig/src/control/DroneControl.cpp scorchwentbonkers-1.1/src/control/DroneControl.cpp
--- scorchwentbonkers-1.1.orig/src/control/DroneControl.cpp	2005-05-10 22:34:28.000000000 +0200
+++ scorchwentbonkers-1.1/src/control/DroneControl.cpp	2007-03-13 13:35:56.000000000 +0100
@@ -79,8 +79,13 @@
 		double power = pc.min + (pc.max - pc.min) * i / 10;
 		double vx = std::cos(angle * M_PI / 180) * power * 2;
 		double vy = -std::sin(angle * M_PI / 180) * power * 2;
-		double shotX = tank->getX() + vx * 10 / power;
-		double shotY = tank->getY() + vy * 10 / power;
+		double shotX = tank->getX();
+		double shotY = tank->getY();
+		if (power != 0.0)
+		{
+			shotX += vx * 10 / power;
+			shotY += vy * 10 / power;
+		}
 		
 		fb = new FakeBullet(shotX, shotY, vx, vy, 3.0);
 		fb->setParent(tank->getParent());

scorchwentbonkers-fullscreen.patch:

--- NEW FILE scorchwentbonkers-fullscreen.patch ---
--- scorchwentbonkers-1.1/src/misc/Settings.cpp~	2007-03-11 22:31:31.000000000 +0100
+++ scorchwentbonkers-1.1/src/misc/Settings.cpp	2007-03-11 22:31:31.000000000 +0100
@@ -40,7 +40,7 @@
 
 const int settingDefaults[LAST_SETTING] =
 {
-	0, // windowed
+	1, // fullscreen
 	3, // full detail explosions
 	3, // loads o' debris
 	3, // good-looking smoke

scorchwentbonkers-no-fmod.patch:

--- NEW FILE scorchwentbonkers-no-fmod.patch ---
diff -ur scorchwentbonkers.orig/Makefile.linux scorchwentbonkers/Makefile.linux
--- scorchwentbonkers.orig/Makefile.linux	2005-07-25 23:23:52.000000000 +0200
+++ scorchwentbonkers/Makefile.linux	2007-02-03 22:24:17.000000000 +0100
@@ -52,14 +52,13 @@
 DEPENDS = Makefile.dep
 EXENAME = swb
 
-FMOD = -lfmod-3.74
-LIBS = $(FMOD) -ljpgal -lagl `allegro-config --libs` -lGL -lGLU
+LIBS = -ljpgal -lagl `allegro-config --libs` `pkg-config --libs AllegroOGG` -lGL -lGLU -ldumb -laldmb
 
 CXX = g++
 RM = rm -f
 MV = mv
 
-CXXFLAGS = -Wall -O3
+CXXFLAGS = -g -Wall -O2 `pkg-config --cflags AllegroOGG`
 DEPFLAGS = -MM
 
 $(EXENAME): $(OBJS)
diff -ur scorchwentbonkers.orig/src/sound/SoundSystem.cpp scorchwentbonkers/src/sound/SoundSystem.cpp
--- scorchwentbonkers.orig/src/sound/SoundSystem.cpp	2005-07-25 23:25:12.000000000 +0200
+++ scorchwentbonkers/src/sound/SoundSystem.cpp	2007-02-03 22:29:39.000000000 +0100
@@ -1,7 +1,8 @@
-#include <allegro.h>
-#include <fmod.h>
-#include <fmod_errors.h>
-
+#include <stdio.h>
+#include <errno.h>
+#include <string.h>
+#include <alogg.h>
+ 
 #include "../misc/Settings.h"
 
 #include "SoundSystem.h"
@@ -13,10 +14,14 @@
 //  STATICS
 // *********
 
-FSOUND_SAMPLE *SoundSystem::sounds[SND_MAX];
-FMUSIC_MODULE *SoundSystem::modules[MOD_MAX];
+SAMPLE *SoundSystem::sounds[SND_MAX];
+DUH *SoundSystem::modules[MOD_MAX];
 bool SoundSystem::loadFlag = false;
 
+AL_DUH_PLAYER *SoundSystem::duh_player = NULL;
+pthread_t SoundSystem::duh_player_thread;
+pthread_mutex_t SoundSystem::duh_player_mutex;
+
 //  CONSTRUCTORS AND DESTRUCTORS
 // ******************************
 
@@ -38,29 +43,49 @@
 	static const char *moduleFileNames[MOD_MAX] = {"mus/menu.mod"};
 	
 	loadFlag = true;
- 	if (!FSOUND_Init(44100, 32, 0))
+	reserve_voices(32, 0);
+	if(install_sound(DIGI_AUTODETECT, MIDI_NONE, NULL))
  	{
- 		allegro_message("Couldn't initialize FMOD sound.\n%s", FMOD_ErrorString(FSOUND_GetError()));
+		if (Settings::setting[GFX_FULLSCREEN]) /* don't use allegro_message when fullscreen! */
+			fprintf(stderr, "Couldn't initialize sound.\n%s\n", allegro_error);
+		else
+ 			allegro_message("Couldn't initialize sound.\n%s", allegro_error);
  		loadFlag = false;
  	}
  	
 	if (loadFlag)
 	{
+		dumb_register_packfiles();
+		pthread_mutex_init(&duh_player_mutex, NULL);
 		for (int i = 0; i < SND_MAX; i++)
 		{
-			sounds[i] = FSOUND_Sample_Load(FSOUND_UNMANAGED, Settings::path(sampleFileNames[i]), FSOUND_LOOP_OFF, 0, 0);
+			ALOGG_OGG *ogg;
+			FILE *f = fopen(Settings::path(sampleFileNames[i]), "r");
+			sounds[i] = NULL;
+			if (!f)
+			{
+				allegro_message("Couldn't load sound file: '%s': %s", sampleFileNames[i], strerror(errno));
+				continue;
+			}
+			ogg = alogg_create_ogg_from_file(f);
+			if (!ogg)
+			{
+				fclose(f);
+				allegro_message("Couldn't load sound file: '%s'", sampleFileNames[i]);
+				continue;
+			}
+			sounds[i] = alogg_create_sample_from_ogg(ogg);
+			alogg_destroy_ogg(ogg);
 			if (!sounds[i])
 				allegro_message("Couldn't load sound file: '%s'", sampleFileNames[i]);
 		}
 		
 		for (int i = 0; i < MOD_MAX; i++)
 		{
-			modules[i] = FMUSIC_LoadSong(moduleFileNames[i]);
+			modules[i] = dumb_load_mod_quick(Settings::path(moduleFileNames[i]));
 			if (!modules[i])
 			{
-				int error = FSOUND_GetError();
-				if (error != FMOD_ERR_FILE_NOTFOUND)
-					allegro_message("Error loading '%s'\n%s", Settings::path(moduleFileNames[i]), FMOD_ErrorString(error));
+				allegro_message("Error loading '%s'\n", Settings::path(moduleFileNames[i]));
 			}
 		}
 	}
@@ -70,21 +92,24 @@
 
 void SoundSystem::freeAll()
 {
+	if (!loadFlag) return;
+	
 	for (int i = 0; i < SND_MAX; i++)
 	{
 		if (sounds[i])
-			FSOUND_Sample_Free(sounds[i]);
+			destroy_sample(sounds[i]);
 		sounds[i] = NULL;
 	}
 	
 	for (int i = 0; i < MOD_MAX; i++)
 	{
 		if (modules[i])
-			FMUSIC_FreeSong(modules[i]);
+			unload_duh(modules[i]);
 		modules[i] = NULL;
 	}
 	
-	FSOUND_Close();
+	dumb_exit();
+	remove_sound();
 	
 	loadFlag = false;
 }
@@ -105,9 +130,12 @@
 		percent = 0;
 	
 	musicVolume = ((float)percent) / 100.0;
-	
-	for (int i = 0; i < MOD_MAX; i++)
-		FMUSIC_SetMasterVolume(modules[i], (int)(masterVolume * musicVolume * moduleAtVolume[i] * 256.0));
+	if (SoundSystem::duh_player)
+	{
+	    pthread_mutex_lock(&SoundSystem::duh_player_mutex);
+	    al_duh_set_volume(SoundSystem::duh_player, musicVolume);
+	    pthread_mutex_unlock(&SoundSystem::duh_player_mutex);
+	}
 }
 
 /********************************/
@@ -115,25 +143,59 @@
 void SoundSystem::setMasterVolume(int percent)
 {
 	masterVolume = ((float)percent) / 100.0;
-	setMusicVolume((int)(musicVolume * 100));
+	set_volume((int)(masterVolume * 255.0), 0);
 }
 
 //  MUSIC HANDLING
 // ****************
 
+static void *duh_player_thread_function(void *arg)
+{
+    while(1)
+    {
+	pthread_mutex_lock(&SoundSystem::duh_player_mutex);
+	/* this may be nuked if things fail in set_music_pattern */
+	if (SoundSystem::duh_player)
+	    al_poll_duh(SoundSystem::duh_player);
+	pthread_mutex_unlock(&SoundSystem::duh_player_mutex);
+	pthread_setcanceltype(PTHREAD_CANCEL_ASYNCHRONOUS, NULL);
+	usleep(10000);
+	pthread_setcanceltype(PTHREAD_CANCEL_DEFERRED, NULL);
+    }
+    return NULL;
+}
+
 void SoundSystem::playMusic(int id, bool looped, float volume)
 {
+  stopMusic();
+  
   if ((!modules[id]) || (!loadFlag)) return;
 
-  int realVolume = (int)(masterVolume * musicVolume * volume * 256.0);
-
-  FMUSIC_SetMasterVolume(modules[id], realVolume);
-  FMUSIC_SetLooping(modules[id], looped);
-
-  if (!FMUSIC_PlaySong(modules[id]))
-    allegro_message("FMOD Error: %s %d", FMOD_ErrorString(FSOUND_GetError()), realVolume);
-
-  moduleAtVolume[id] = volume;
+  duh_player = al_start_duh(modules[id], 2, 0, musicVolume, 4096, 44100);
+  if (!looped)
+    dumb_it_set_loop_callback(
+      duh_get_it_sigrenderer(al_duh_get_sigrenderer(duh_player)),
+      dumb_it_callback_terminate, NULL);
+
+  if (pthread_create(&duh_player_thread, NULL,
+          duh_player_thread_function, NULL))
+  {
+    al_stop_duh(duh_player);
+    duh_player = NULL;
+  }
+}
+
+void SoundSystem::stopMusic()
+{
+    if (duh_player)
+    {
+        /* stop the player thread */
+        pthread_cancel(duh_player_thread);
+        pthread_join(duh_player_thread, NULL);
+        /* and clean up */
+        al_stop_duh(duh_player);
+        duh_player = NULL;
+    }
 }
 
 //  SOUND HANDLING
@@ -143,19 +205,9 @@
 {
   if ((!sounds[id]) || (!loadFlag)) return;
   if (!Settings::setting[SND_SFX]) return;
-
-  int realVolume = (int)(masterVolume * soundVolume * volume * 255.0);
-  int realFreq = (int)(44100.0 * freq);
-
-  int channel = FSOUND_PlaySoundEx(FSOUND_FREE, sounds[id], NULL, true);
-
-  if (channel == -1)
-    allegro_message("FMOD Error: %s", FMOD_ErrorString(FSOUND_GetError()));
-
-  FSOUND_SetPan(channel, pan);
-  FSOUND_SetFrequency(channel, realFreq);
-  FSOUND_SetVolume(channel, realVolume);
-  FSOUND_SetPaused(channel, false);
+  
+  play_sample(sounds[id], (int)(soundVolume * volume * 255.0), pan,
+    (int)(freq * 1000.0), 0);
 }
 
 /********************************/
@@ -163,13 +215,14 @@
 void SoundSystem::cutAllSounds()
 {
   if (!loadFlag) return;
-
-  FSOUND_StopSound(FSOUND_ALL);
+  
+  for (int i = 0; i < SND_MAX; i++)
+  {
+    if (sounds[i])
+      stop_sample(sounds[i]);
+  }
 }
 
 /*******************************************************************************/
 
 SoundSystem *soundSys;
-
-
-
diff -ur scorchwentbonkers.orig/src/sound/SoundSystem.h scorchwentbonkers/src/sound/SoundSystem.h
--- scorchwentbonkers.orig/src/sound/SoundSystem.h	2005-05-11 14:13:18.000000000 +0200
+++ scorchwentbonkers/src/sound/SoundSystem.h	2007-01-28 17:53:12.000000000 +0100
@@ -3,7 +3,10 @@
 
 /****************************************************************************/
 
-#include <fmod.h>
+#include <allegro.h>
+#include <aldumb.h>
+#include <unistd.h>
+#include <pthread.h>
 
 /****************************************************************************/
 
@@ -24,16 +27,20 @@
     
     // an array of all samples
 
-    static FSOUND_SAMPLE *sounds[SND_MAX];
-    static FMUSIC_MODULE *modules[MOD_MAX];
+    static SAMPLE *sounds[SND_MAX];
+    static DUH *modules[MOD_MAX];
 
     // volumes
 
     float soundVolume, musicVolume, masterVolume;
-    float moduleAtVolume[MOD_MAX];
-
+    
   public:
 
+    // dumb stuff, must be public and static for the thread function
+    static AL_DUH_PLAYER *duh_player;
+    static pthread_t duh_player_thread;
+    static pthread_mutex_t duh_player_mutex;
+
     // standard load-s and free-s
 
     static void loadAll();
@@ -49,6 +56,7 @@
 
     void playSound(int id, int pan = 128, float freq = 1.0, float volume = 1.0);
     void playMusic(int id, bool looped = true, float volume = 1.0);
+    void stopMusic();
     void cutAllSounds();
 
     // constructors and destructors

scorchwentbonkers-support-16bpp.patch:

--- NEW FILE scorchwentbonkers-support-16bpp.patch ---
--- scorchwentbonkers-1.1/src/Main.cpp.16bpp	2005-07-24 23:32:12.000000000 +0200
+++ scorchwentbonkers-1.1/src/Main.cpp	2007-02-05 19:56:59.000000000 +0100
@@ -56,14 +56,26 @@
 	
 	set_color_depth(32);
 	request_refresh_rate(100);
+	/* don't convert bitmap's as we don't use the allegro bitmap accept
+	   for loading bitmaps for textures in which case we want to keep
+	   the bitmaps in their native format */
+	set_color_conversion(COLORCONV_NONE);
 	
 	if (set_gfx_mode(GFX_OPENGL, 800, 600, 0, 0) != 0)
 	{
-		allegro_gl_set(AGL_SUGGEST, suggested);
+		/* try again with a 16 bpp colordepth */
+		allegro_gl_set(AGL_COLOR_DEPTH, 16);
+		set_color_depth(16);
 		if (set_gfx_mode(GFX_OPENGL, 800, 600, 0, 0) != 0)
 		{
-			allegro_message("Error setting up display: %s", allegro_error);
-			exit(-1);
+			/* try again with "any" settings */
+			allegro_gl_set(AGL_SUGGEST, suggested);
+			if (set_gfx_mode(GFX_OPENGL, 800, 600, 0, 0) != 0)
+			{
+				allegro_message("Error setting up display: %s", allegro_error);
+				exit(-1);
+			}
+			set_color_depth(allegro_gl_get(AGL_COLOR_DEPTH));
 		}
 	};
 	
--- scorchwentbonkers-1.1/src/engine/TextRenderer.cpp.16bpp	2007-02-05 19:55:53.000000000 +0100
+++ scorchwentbonkers-1.1/src/engine/TextRenderer.cpp	2007-02-05 19:57:01.000000000 +0100
@@ -35,9 +35,7 @@
 {
 	TextRenderer *ret = NULL;
 	
-	set_color_conversion(COLORCONV_NONE);
 	BITMAP *fontBMP = load_bitmap(bitmapName, NULL);
-	set_color_conversion(COLORCONV_TOTAL);
 	
 	if (!fontBMP)
 	{

scorchwentbonkers-unixify.patch:

--- NEW FILE scorchwentbonkers-unixify.patch ---
--- scorchwentbonkers-1.1/Makefile.linux.unix	2007-02-04 21:31:59.000000000 +0100
+++ scorchwentbonkers-1.1/Makefile.linux	2007-02-04 21:32:42.000000000 +0100
@@ -1,3 +1,6 @@
+PREFIX = /usr
+BINDIR = $(PREFIX)/bin
+DATADIR = $(PREFIX)/share/swb
 OBJS = src/engine/FPSCounter.o  \
   src/engine/TimeKeeper.o  \
   src/engine/TimeRoutines.o \
@@ -58,7 +61,8 @@
 RM = rm -f
 MV = mv
 
-CXXFLAGS = -g -Wall -O2 `pkg-config --cflags AllegroOGG`
+OPTFLAGS = -g -Wall -O2
+CXXFLAGS = $(OPTFLAGS) `pkg-config --cflags AllegroOGG` -DDATADIR=\"$(DATADIR)/\"
 DEPFLAGS = -MM
 
 $(EXENAME): $(OBJS)
@@ -87,6 +91,13 @@
 	@$(MV) $(DEPENDS)2 $(DEPENDS)
 	@echo Done.
 	
-include $(DEPENDS)
+include $(DEPENDS)
+
+install: $(EXENAME)
+	mkdir -p $(BINDIR)
+	mkdir -p $(DATADIR)
+	install -m 755 $(EXENAME) $(BINDIR)
+	cp -a fonts gfx misc mus snd $(DATADIR)
+	
 
-.PHONY: clean veryclean depend
+.PHONY: clean veryclean depend install
--- scorchwentbonkers-1.1/src/misc/Settings.cpp.unix	2005-07-24 21:52:14.000000000 +0200
+++ scorchwentbonkers-1.1/src/misc/Settings.cpp	2007-02-04 21:31:59.000000000 +0100
@@ -1,4 +1,6 @@
 #include <allegro.h>
+#include <stdio.h>
+#include <stdlib.h>
 
 #include "Settings.h"
 
@@ -64,19 +66,35 @@
 
 void Settings::loadSettings()
 {
+#ifdef __unix__
+	char *home = getenv("HOME");
+	snprintf(filenameBuffer, sizeof(filenameBuffer), "%s/.swb.ini", home? home:".");
+	override_config_file(filenameBuffer);
+#else
 	set_config_file("settings.ini");
+#endif
 
 	for (int i = 0; i < LAST_SETTING; i++)
 		setting[i] = get_config_int(settingSections[i], settingNames[i], settingDefaults[i]);
 
+#ifdef __unix__
+	snprintf(basePath, sizeof(basePath), DATADIR);
+#else
 	char tempPath[512];
 	get_executable_name(tempPath, 512);
 	replace_filename(basePath, tempPath, "", 512);
+#endif
 }
 
 void Settings::saveSettings()
 {
+#ifdef __unix__
+	char *home = getenv("HOME");
+	snprintf(filenameBuffer, sizeof(filenameBuffer), "%s/.swb.ini", home? home:".");
+	override_config_file(filenameBuffer);
+#else
 	set_config_file("settings.ini");
+#endif
 	
 	for (int i = 0; i < LAST_SETTING; i++)
 		set_config_int(settingSections[i], settingNames[i], setting[i]);
--- scorchwentbonkers-1.1/src/misc/Theme.cpp.unix	2005-07-23 23:01:22.000000000 +0200
+++ scorchwentbonkers-1.1/src/misc/Theme.cpp	2007-02-04 21:31:59.000000000 +0100
@@ -5,6 +5,7 @@
 
 #include "../engine/GLTexture.h"
 #include "../engine/GLBitmap.h"
+#include "../misc/Settings.h"
 #include "Theme.h"
 
 /*********************************************/
@@ -13,7 +14,7 @@
 {
 	static char buf[200];
 	
-	set_config_file("misc/themes.ini");
+	override_config_file(Settings::path("misc/themes.ini"));
 	
 	if (!get_config_int(name, "exists", 0))
 	{
@@ -50,7 +51,7 @@
 		for (int i = 0; i < ret->cloudsTypeCount; i++)
 		{
 			sprintf(buf,"gfx/clouds/%s_%d.tga", name, i + 1);
-			BITMAP *bmp = load_bitmap(buf, NULL);
+			BITMAP *bmp = load_bitmap(Settings::path(buf), NULL);
 			if (!bmp)
 			{
 				allegro_message("Unable to load bitmap '%s'", buf);


--- NEW FILE scorchwentbonkers.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=Scorch Went Bonkers
Comment=Realtime remake of Scorched Earth
Exec=swb
Icon=scorchwentbonkers.png
Terminal=false
StartupNotify=false
Type=Application
Categories=Game;StrategyGame;


--- NEW FILE scorchwentbonkers.spec ---
Name:           scorchwentbonkers
Version:        1.1
Release:        2%{?dist}
Summary:        Realtime remake of Scorched Earth
Group:          Amusements/Games
License:        zlib/libpng License
URL:            http://www.allegro.cc/depot/ScorchWentBonkers
Source0:        http://www.allegro.cc/files/depot/537/%{name}-src-%{version}.tar.gz
Source1:        %{name}.desktop
Source2:        %{name}.png
Patch0:         %{name}-no-fmod.patch
Patch1:         %{name}-support-16bpp.patch
Patch2:         %{name}-unixify.patch
Patch3:         %{name}-fullscreen.patch
Patch4:         %{name}-divbyzero.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  alleggl-devel jpgalleg-devel dumb-devel AllegroOGG-devel 
BuildRequires:  libGLU-devel desktop-file-utils
Requires:       hicolor-icon-theme

%description
As the name suggests, Scorch Went Bonkers is a remake of the old PC classic.
However, many things were changed and the type of fun delivered by the game is
different. Where Scorched Earth puts emphasis on tactics and careful
calculations, SWB requires quick thinking, perfect timing and only one finger
for controlling your tank. The game is real-time instead of turn based.


%prep
%setup -q -c
%patch0 -p1 -z .no-fmod
%patch1 -p1 -z .16bpp
%patch2 -p1 -z .unix
%patch3 -p1 -z .fs
%patch4 -p1 -z .dbz
sed -i 's/\r//' doc/readme.htm


%build
make %{?_smp_mflags} -f Makefile.linux PREFIX=%{_prefix} \
  OPTFLAGS="$RPM_OPT_FLAGS -fsigned-char -Wno-non-virtual-dtor"


%install
rm -rf $RPM_BUILD_ROOT
make -f Makefile.linux install PREFIX=$RPM_BUILD_ROOT%{_prefix}

# 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 \
  %{SOURCE1}
mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps
install -p -m 644 %{SOURCE2} \
  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps


%clean
rm -rf $RPM_BUILD_ROOT


%post
touch --no-create %{_datadir}/icons/hicolor || :
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :

%postun
touch --no-create %{_datadir}/icons/hicolor || :
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :


%files
%defattr(-,root,root,-)
%doc README doc/readme.htm
%{_bindir}/swb
%{_datadir}/swb
%{_datadir}/applications/fedora-%{name}.desktop
%{_datadir}/icons/hicolor/32x32/apps/%{name}.png


%changelog
* Tue Mar 13 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.1-2
- Fix a divide by zero crash when playing against the computer
- Add missing BuildRequires: jpgalleg-devel, libGLU-devel

* Sun Feb  4 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.1-1
- Initial Fedora Extras package


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/scorchwentbonkers/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	15 Mar 2007 08:05:01 -0000	1.1
+++ .cvsignore	15 Mar 2007 11:26:52 -0000	1.2
@@ -0,0 +1 @@
+scorchwentbonkers-src-1.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/scorchwentbonkers/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	15 Mar 2007 08:05:01 -0000	1.1
+++ sources	15 Mar 2007 11:26:52 -0000	1.2
@@ -0,0 +1 @@
+dfaf1a509d2776edf983cd5e1540df95  scorchwentbonkers-src-1.1.tar.gz




More information about the scm-commits mailing list