[pnmixer] Update to 0.5.1

[Christoph Wickert]

commit 3cbe5f31603c0415d7b93cdfbaeaac87b7184f09
Author: Christoph Wickert <cwickert at fedoraproject.org>
Date:   Sat Mar 3 21:34:44 2012 +0100

    Update to 0.5.1
    
    - Only autostart in LXDE or Xfce

 .gitignore                          |    1 +
 pnmixer-0.3-mouse_scroll_step.patch |   11 ----
 pnmixer-0.3-on_mixer.patch          |   13 ----
 pnmixer-0.5.0-volume-steps.patch    |   13 ++++
 pnmixer.desktop                     |  111 -----------------------------------
 pnmixer.spec                        |   41 ++++++++-----
 sources                             |    2 +-
 7 files changed, 40 insertions(+), 152 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5398508..b5b1647 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /pnmixer-0.3.tar.gz
+/pnmixer-0.5.1.tar.gz
diff --git a/pnmixer-0.5.0-volume-steps.patch b/pnmixer-0.5.0-volume-steps.patch
new file mode 100644
index 0000000..9396c14
--- /dev/null
+++ b/pnmixer-0.5.0-volume-steps.patch
@@ -0,0 +1,13 @@
+--- pnmixer-0.5.1.orig/src/prefs.c	2011-12-19 00:34:56.000000000 +0100
++++ pnmixer-0.5.1/src/prefs.c	2012-03-03 21:06:27.265687048 +0100
+@@ -34,8 +34,8 @@
+ #define DEFAULT_PREFS "[PNMixer]\n\
+ DisplayTextVolume=true\n\
+ TextVolumePosition=3\n\
+-MouseScrollStep=1\n\
+-HotkeyVolumeStep=1\n\
++MouseScrollStep=5\n\
++HotkeyVolumeStep=5\n\
+ MiddleClickAction=0\n\
+ CustomCommand=\n\
+ VolMuteKey=-1\n\
diff --git a/pnmixer.spec b/pnmixer.spec
index 58131a0..a4e42a7 100644
--- a/pnmixer.spec
+++ b/pnmixer.spec
@@ -1,19 +1,19 @@
 # Review at https://bugzilla.redhat.com/show_bug.cgi?id=710672
 
 Name:           pnmixer
-Version:        0.3
-Release:        3%{?dist}
+Version:        0.5.1
+Release:        1%{?dist}
 Summary:        Lightweight mixer applet
 
 Group:          Applications/Multimedia
 License:        GPLv3
 URL:            https://github.com/nicklan/pnmixer/wiki
 Source0:        https://github.com/downloads/nicklan/%{name}/%{name}-%{version}.tar.gz
-Source1:        %{name}.desktop
-# Don't print useless messages to xsession-errors
-Patch0:         pnmixer-0.3-on_mixer.patch
+# Small fixes for the desktop file, upstreamed via
+# https://github.com/nicklan/pnmixer/issues/18
+Patch0:         pnmixer-0.5.1-desktop-file.patch
 # Set default mouse scroll step to 5
-Patch1:         pnmixer-0.3-mouse_scroll_step.patch
+Patch1:         pnmixer-0.5.0-volume-steps.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  alsa-lib-devel
@@ -43,8 +43,8 @@ PNMixer is a fork of OBMixer with a number of additions. These include:
 
 %prep
 %setup -q
-%patch0 -p1 -b .on_mixer
-%patch1 -p1 -b .mouse_scroll_step
+%patch0 -p1 -b .orig
+%patch1 -p1 -b .volume-steps
 NOCONFIGURE=yes ./autogen.sh
 
 
@@ -54,18 +54,21 @@ make %{?_smp_mflags}
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'
+rm -rf %{buildroot}
+make install DESTDIR=%{buildroot} INSTALL='install -p'
+desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop
 
-desktop-file-install                                    \
-    --dir=${RPM_BUILD_ROOT}%{_sysconfdir}/xdg/autostart \
-    %{SOURCE1}
+desktop-file-install \
+    --dir=%{buildroot}%{_sysconfdir}/xdg/autostart \
+    --add-category="TrayIcon" \
+    --add-only-show-in="XFCE;LXDE;" \
+    data/pnmixer.desktop
 
 %find_lang %{name}
 
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 
 %files -f %{name}.lang
@@ -74,10 +77,16 @@ rm -rf $RPM_BUILD_ROOT
 %config %{_sysconfdir}/xdg/autostart/%{name}.desktop
 %{_bindir}/%{name}
 %{_datadir}/%{name}/
+%{_datadir}/applications/%{name}.desktop
 
 %changelog
-* Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+* Sat Mar 03 2012 Christoph Wickert <cwickert at fedoraproject.org> - 0.5.1-1
+- Update to 0.5.1
+- Only autostart in LXDE or Xfce
+
+* Fri Dec 09 2011 Christoph Wickert <cwickert at fedoraproject.org> - 0.5-1
+- Update to 0.5 (#729741)
+- Drop on_mixer patch (similar change included)
 
 * Tue Dec 06 2011 Adam Jackson <ajax at redhat.com> - 0.3-2
 - Rebuild for new libpng
diff --git a/sources b/sources
index 376b347..9c4df6d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-94cfcbb0dc9a1cdb061f195ed26ca75d  pnmixer-0.3.tar.gz
+2288af95ab280721b39b7c33601d5dd4  pnmixer-0.5.1.tar.gz