From 0f5701f5a91a1f07c6020226a01397a51b484e3e Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@fedoraproject.org>
Date: Mar 05 2009 13:49:45 +0000
Subject: Second preview of upcoming 0.9.8


---

diff --git a/.cvsignore b/.cvsignore
index 294e16f..91e5e12 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-pavucontrol-0.9.7.tar.gz
+pavucontrol-0.9.7.git20090305.tar.gz
diff --git a/01e4826b653065268e7a4b8d57e528836e167a23.patch b/01e4826b653065268e7a4b8d57e528836e167a23.patch
deleted file mode 100644
index 028188f..0000000
--- a/01e4826b653065268e7a4b8d57e528836e167a23.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-diff --git a/src/pavucontrol.cc b/src/pavucontrol.cc
-index b7f7a9b..2bf3463 100644
---- a/src/pavucontrol.cc
-+++ b/src/pavucontrol.cc
-@@ -409,7 +409,6 @@ void ChannelWidget::onVolumeScaleValueChanged() {
-     streamWidget->updateChannelVolume(channel, volume);
- 
-     if (beepDevice != "") {
--        g_debug("blah: %s", beepDevice.c_str());
-         ca_context_change_device(ca_gtk_context_get(), beepDevice.c_str());
- 
-         ca_context_cancel(ca_gtk_context_get(), 2);
-@@ -423,8 +422,6 @@ void ChannelWidget::onVolumeScaleValueChanged() {
-                                CA_PROP_CANBERRA_ENABLE, "1",
-                                NULL);
- 
--        g_debug("%i = %s", r, ca_strerror(r));
--
-         ca_context_change_device(ca_gtk_context_get(), NULL);
-     }
- }
-@@ -935,7 +932,7 @@ void RoleWidget::executeVolumeUpdate() {
-     info.channel_map.channels = 1;
-     info.channel_map.map[0] = PA_CHANNEL_POSITION_MONO;
-     info.volume = volume;
--    info.device = device.c_str();
-+    info.device = device == "" ? NULL : device.c_str();
-     info.mute = muteToggleButton->get_active();
- 
-     pa_operation* o;
-@@ -947,7 +944,6 @@ void RoleWidget::executeVolumeUpdate() {
-     pa_operation_unref(o);
- }
- 
--
- /*** MainWindow ***/
- 
- MainWindow::MainWindow(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& x) :
-@@ -1423,10 +1419,10 @@ void MainWindow::updateRole(const pa_ext_stream_restore_info &info) {
- 
-     eventRoleWidget->updating = true;
- 
--    eventRoleWidget->device = info.device;
-+    eventRoleWidget->device = info.device ? info.device : "";
- 
-     volume.channels = 1;
--    volume.values[0] = pa_cvolume_avg(&info.volume);
-+    volume.values[0] = pa_cvolume_max(&info.volume);
- 
-     eventRoleWidget->setVolume(volume);
-     eventRoleWidget->muteToggleButton->set_active(info.mute);
diff --git a/pavucontrol.spec b/pavucontrol.spec
index 1ab739a..7301539 100644
--- a/pavucontrol.spec
+++ b/pavucontrol.spec
@@ -1,22 +1,21 @@
 Name:           pavucontrol
 Version:        0.9.7
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Volume control for PulseAudio
 
 Group:          Applications/Multimedia
 License:        GPLv2+
 URL:            http://0pointer.de/lennart/projects/pavucontrol
-Source0:        http://0pointer.de/lennart/projects/pavucontrol/pavucontrol-%{version}.tar.gz
+Source0:        http://0pointer.de/lennart/projects/pavucontrol/pavucontrol-%{version}.git20090305.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  pulseaudio-lib-devel >= 0.9.12
+BuildRequires:  pulseaudio-libs-devel >= 0.9.15-3.test4
 BuildRequires:  gtkmm24-devel libglademm24-devel
 BuildRequires:  libsigc++20-devel lynx
 BuildRequires:  desktop-file-utils
 BuildRequires:  libcanberra-devel
 BuildRequires:  intltool
-Requires:	pulseaudio-lib >= 0.9.15
-Patch0: 	01e4826b653065268e7a4b8d57e528836e167a23.patch
+Requires:	pulseaudio-libs >= 0.9.15-3.test5
 
 %description
 PulseAudio Volume Control (pavucontrol) is a simple GTK based volume control
@@ -26,7 +25,6 @@ of each playback stream separately.
 
 %prep
 %setup -q
-%patch0 -p1 -b .01e4826b653065268e7a4b8d57e528836e167a23
 
 %build
 %configure
@@ -36,6 +34,10 @@ make %{?_smp_mflags}
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
+rm $RPM_BUILD_ROOT/usr/share/doc/pavucontrol/README
+rm $RPM_BUILD_ROOT/usr/share/doc/pavucontrol/README.html
+rm $RPM_BUILD_ROOT/usr/share/doc/pavucontrol/style.css
+
 desktop-file-install \
     --dir $RPM_BUILD_ROOT%{_datadir}/applications \
     --add-category="X-Fedora" --vendor="" \
@@ -54,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/applications/pavucontrol.desktop
 
 %changelog
+* Thu Mar 5 2009 Lennart Poettering <lpoetter@redhat.com> 0.9.7-5
+- Second preview of upcoming 0.9.8
+
 * Wed Feb 25 2009 Lennart Poettering <lpoetter@redhat.com> 0.9.7-4
 - Preview of upcoming 0.9.8
 
diff --git a/sources b/sources
index a57b8c6..a0c2cb7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ec5ebdc2cf7155719b7be95c3f3b7d4c  pavucontrol-0.9.7.tar.gz
+cd1f5d470972a0bc45ca1a6595d05557  pavucontrol-0.9.7.git20090305.tar.gz