diff --git a/.gitignore b/.gitignore index 755041b..870cd55 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /volumeicon-0.4.1.tar.gz +/volumeicon-0.4.5.tar.gz diff --git a/sources b/sources index 71540c6..dd1ed1b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a63e83b8a5d41dca38d077934bce9fcf volumeicon-0.4.1.tar.gz +4758428004366a04a9617bd083f007b7 volumeicon-0.4.5.tar.gz diff --git a/volumeicon-0.4.1-dsofix.patch b/volumeicon-0.4.1-dsofix.patch deleted file mode 100644 index 0a136a2..0000000 --- a/volumeicon-0.4.1-dsofix.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- volumeicon-0.4.1.orig/src/Makefile.in 2011-06-12 21:08:45.000000000 +0200 -+++ volumeicon-0.4.1/src/Makefile.in 2011-07-01 01:38:26.005863805 +0200 -@@ -95,7 +95,7 @@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ - INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ --LDFLAGS = @LDFLAGS@ -+LDFLAGS = @LDFLAGS@ -lX11 - LIBOBJS = @LIBOBJS@ - LIBS = @GTK_LIBS@ @ALSA_LIBS@ - LTLIBOBJS = @LTLIBOBJS@ diff --git a/volumeicon-0.4.5-default-config.patch b/volumeicon-0.4.5-default-config.patch new file mode 100644 index 0000000..5638d12 --- /dev/null +++ b/volumeicon-0.4.5-default-config.patch @@ -0,0 +1,16 @@ +--- volumeicon-0.4.5.orig/src/config.c 2011-11-05 19:00:51.000000000 -0400 ++++ volumeicon-0.4.5/src/config.c 2012-01-14 10:44:49.682085469 -0500 +@@ -59,11 +59,11 @@ + static void config_load_default() + { + if(!m_helper_program) +- config_set_helper("xterm -e 'alsamixer'"); ++ config_set_helper("pavucontrol"); + if(!m_channel) + config_set_channel(NULL); + if(!m_card) +- config_set_card("hw:0"); ++ config_set_card("default"); + if(!m_stepsize) + config_set_stepsize(5); + if(!m_theme) diff --git a/volumeicon.spec b/volumeicon.spec index 62e9a43..5bcdb06 100644 --- a/volumeicon.spec +++ b/volumeicon.spec @@ -1,8 +1,8 @@ # Review at https://bugzilla.redhat.com/show_bug.cgi?id=722914 Name: volumeicon -Version: 0.4.1 -Release: 5%{?dist} +Version: 0.4.5 +Release: 1%{?dist} Summary: Lightweight volume control for the system tray License: GPLv3 @@ -10,13 +10,15 @@ URL: http://www.softwarebakery.com/maato/volumeicon.html Source0: http://www.softwarebakery.com/maato/files/volumeicon/volumeicon-%{version}.tar.gz # Source1 was borrowed from gnome-media package and adjusted for our needs Source1: %{name}.desktop -# Patch0 fixes DSO linking, sent upstream via mail on 2011-07-21 -Patch0: volumeicon-0.4.1-dsofix.patch +# Use pavucontrol by default in Fedora. Not upstreamed. +# Do not hardcode card hw:0. Submitted upstream by mail on 2012-01-14. Accepted. +Patch0: %{name}-0.4.5-default-config.patch BuildRequires: alsa-lib-devel BuildRequires: desktop-file-utils BuildRequires: gtk2-devel BuildRequires: keybinder-devel +BuildRequires: libnotify-devel >= 0.5.0 %description Volume Icon aims to be a lightweight volume control that sits in your system @@ -33,11 +35,11 @@ Features: %prep %setup -q -%patch0 -p1 -b .dso +#%patch0 -p1 -b .default %build -%configure +%configure --enable-notify make %{?_smp_mflags} @@ -59,6 +61,12 @@ rm -rf %{buildroot} %{_datadir}/%{name}/ %changelog +* Sat Jan 14 2012 Christoph Wickert - 0.4.5-1 +- Update ot 0.4.5 (#781649) +- Enable libnotify support (#781642) +- Drop upstreamed DSO fix +- Use default ALAS device rather than hardcoded 'hw:0' + * Sat Jan 14 2012 Fedora Release Engineering - 0.4.1-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild