[magicor/f13/master] * Wed Aug 4 2010 Hans de Goede <hdegoede at redhat.com> - 1.1-7 - Add missing Requires libmikmod (#620

[Hans de Goede]

commit 0f403e70001b30d3892ec51276704fdc7c11a03d
Author: Hans de Goede <hdegoede at redhat.com>
Date:   Wed Aug 4 11:47:34 2010 +0200

    * Wed Aug  4 2010 Hans de Goede <hdegoede at redhat.com> - 1.1-7
    - Add missing Requires libmikmod (#620995)
    - Set sound and music vol to something sane when no config file is found

 magicor-1.1-soundvol.patch |   14 ++++++++++++++
 magicor.spec               |   10 ++++++++--
 2 files changed, 22 insertions(+), 2 deletions(-)
---
diff --git a/magicor-1.1-soundvol.patch b/magicor-1.1-soundvol.patch
new file mode 100644
index 0000000..856a625
--- /dev/null
+++ b/magicor-1.1-soundvol.patch
@@ -0,0 +1,14 @@
+diff -up magicor-1.1/magicor/__init__.py~ magicor-1.1/magicor/__init__.py
+--- magicor-1.1/magicor/__init__.py~	2008-07-08 09:39:20.000000000 +0200
++++ magicor-1.1/magicor/__init__.py	2010-08-04 10:01:10.796786234 +0200
+@@ -269,8 +269,8 @@ class GameEngine(object):
+         self.resources = getResources(paths=paths,
+                                       sound=config.getBool("sound"),
+                                       music=config.getBool("music"))
+-        self.resources.soundVol = self.config.getInt("sound_vol")
+-        self.resources.musicVol = self.config.getInt("music_vol")
++        self.resources.soundVol = self.config.getInt("sound_vol", 50)
++        self.resources.musicVol = self.config.getInt("music_vol", 50)
+         self.clock = pygame.time.Clock()
+ 
+     def handleEvents(self, state, events):
diff --git a/magicor.spec b/magicor.spec
index 8c7670c..f06fe28 100644
--- a/magicor.spec
+++ b/magicor.spec
@@ -2,7 +2,7 @@
 
 Name:           magicor
 Version:        1.1
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Push ice blocks around to extenguish all fires
 Group:          Amusements/Games
 License:        Public Domain
@@ -11,10 +11,11 @@ Source0:        http://downloads.sourceforge.net/%{name}/%{name}-source-%{versio
 Source1:        http://downloads.sourceforge.net/%{name}/%{name}-data-%{version}.tar.gz
 Source2:        %{name}.desktop
 Source3:        %{name}.png
+Patch0:         magicor-1.1-soundvol.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  python desktop-file-utils
 BuildArch:      noarch
-Requires:       pygame hicolor-icon-theme
+Requires:       pygame hicolor-icon-theme libmikmod
 
 %description
 The goal of the game is to annihilate all burning fires. You do this
@@ -25,6 +26,7 @@ Once all fires are extinguished the level is completed.
 
 %prep
 %setup -q -b 1
+%patch0 -p1
 sed -i 's:###CONFIG_PATH###:%{_sysconfdir}/%{name}.conf:' *.py
 sed -i 's:###SHARE_PATH###:%{_datadir}/%{name}:' etc/*.conf
 
@@ -85,6 +87,10 @@ fi
 
 
 %changelog
+* Wed Aug  4 2010 Hans de Goede <hdegoede at redhat.com> - 1.1-7
+- Add missing Requires libmikmod (#620995)
+- Set sound and music vol to something sane when no config file is found
+
 * Wed Jul 21 2010 David Malcolm <dmalcolm at redhat.com> - 1.1-6
 - Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild