[pulseaudio-equalizer/f12/master] Fix rhbz #635400

[Hicham HAOUARI]

commit d4502c8c94cba76ecfeebe3047469689263493b1
Author: Hicham HAOUARI <hicham.haouari at gmail.com>
Date:   Mon Sep 20 19:43:27 2010 +0000

    Fix rhbz #635400

 .gitignore                                         |    1 +
 ...lizer-2.7-force-default-persistence-value.patch |   13 ++++++++++
 pulseaudio-equalizer.spec                          |   24 +++++++++++++++----
 3 files changed, 33 insertions(+), 5 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ff67486..a2401fe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 pulseaudio-equalizer-2.7.tar.bz2
+/pulseaudio-equalizer-2.7.tar.bz2
diff --git a/pulseaudio-equalizer-2.7-force-default-persistence-value.patch b/pulseaudio-equalizer-2.7-force-default-persistence-value.patch
new file mode 100644
index 0000000..7cc2f0c
--- /dev/null
+++ b/pulseaudio-equalizer-2.7-force-default-persistence-value.patch
@@ -0,0 +1,13 @@
+--- pulseaudio-equalizer-2.7/usr/bin/pulseaudio-equalizer.old	2010-09-20 19:28:09.000000000 +0000
++++ pulseaudio-equalizer-2.7/usr/bin/pulseaudio-equalizer	2010-09-20 19:28:58.000000000 +0000
+@@ -128,7 +128,9 @@ fi 
+ if [ -f $HOME/.pulse/default.pa ]; then
+     if [ "$(cat $HOME/.pulse/default.pa | grep -m1 "### BEGIN: Equalized audio configuration")" = "### BEGIN: Equalized audio configuration" ]; then
+     PA_EQUALIZER_PERSISTENCE=1
+-  fi
++    else
++    PA_EQUALIZER_PERSISTENCE=0
++    fi
+ else
+   PA_EQUALIZER_PERSISTENCE=0
+ fi
diff --git a/pulseaudio-equalizer.spec b/pulseaudio-equalizer.spec
index 5f622cd..b60f63e 100644
--- a/pulseaudio-equalizer.spec
+++ b/pulseaudio-equalizer.spec
@@ -2,16 +2,16 @@
 
 Name:           pulseaudio-equalizer
 Version:        2.7
-Release:        1%{?dist}
+Release:        3%{?dist}
 Summary:        A 15 Bands Equalizer for PulseAudio
 
 Group:          Applications/Multimedia
 License:        GPLv3+
 URL:            https://code.launchpad.net/~psyke83/+junk/%{name}
 # This is a bzr checkout, to obtain the used tarball in this spec :
-# bzr branch -r %{rev} lp:~psyke83/+junk/pulseaudio-equalizer
-# mv %{name} %{name}-%{version}
-# tar cjf %{name}-%{version}.tar.bz2 %{name}-%{version}
+# bzr branch -r %%{rev} lp:~psyke83/+junk/pulseaudio-equalizer
+# mv %%{name} %%{name}-%%{version}
+# tar cjf %%{name}-%%{version}.tar.bz2 %%{name}-%%{version}
 Source0:        %{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
@@ -21,6 +21,9 @@ BuildRequires:  desktop-file-utils
 Requires:       pygtk2 ladspa-swh-plugins gnome-media
 Requires:       pulseaudio-utils >= 0.9.19
 
+# Force default equalizer persistence value, fixes rhbz #635400
+Patch0:         %{name}-%{version}-force-default-persistence-value.patch
+
 %description
 PulseAudio Equalizer is a 15 bands system wide equalizer, that means
 any application that is using PulseAudio, will benefit from the sound
@@ -30,6 +33,11 @@ improvement.
 %setup -q
 cp debian/copyright COPYING
 cp debian/changelog ChangeLog
+%if %{fedora} >= 14
+sed -i 's|gnome-volume-control|multimedia-volume-control|g' usr/share/{applications/pulseaudio-equalizer.desktop,pulseaudio-equalizer/pulseaudio-equalizer.py}
+%endif 
+
+%patch0 -p1
 
 %build
 
@@ -54,7 +62,13 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Sun Feb 07 2010 Hicham HAOUARI <hicham.haouari at gmail.com> 2.7-1
+* Mon Sep 20 2010 Hicham HAOUARI <hicham.haouari at gmail.com> - 2.7-3
+- Force default equalizer persistence value, fixes rhbz #635400
+
+* Wed Sep 15 2010 Hicham HAOUARI <hicham.haouari at gmail.com> - 2.7-2
+- Fix rhbz #632940
+
+* Sun Feb 07 2010 Hicham HAOUARI <hicham.haouari at gmail.com> - 2.7-1
 - New upstream release
 - New project URL
 - Dropped patches ( merged upstream )