From d222fa52fd262dd2faa28c1a48486a3075f229f2 Mon Sep 17 00:00:00 2001 From: Hicham HAOUARI Date: Feb 07 2010 14:05:10 +0000 Subject: *** empty log message *** --- diff --git a/.cvsignore b/.cvsignore index 07268a8..ff67486 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -pulseaudio-equalizer_2.4debsource.tar.bz2 +pulseaudio-equalizer-2.7.tar.bz2 diff --git a/import.log b/import.log index 125d469..3f4e880 100644 --- a/import.log +++ b/import.log @@ -1 +1,2 @@ pulseaudio-equalizer-2_4-1_fc12:HEAD:pulseaudio-equalizer-2.4-1.fc12.src.rpm:1262475160 +pulseaudio-equalizer-2_7-1_fc12:HEAD:pulseaudio-equalizer-2.7-1.fc12.src.rpm:1265551443 diff --git a/moving-active-clients.patch b/moving-active-clients.patch deleted file mode 100644 index b09fb95..0000000 --- a/moving-active-clients.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- pulseaudio-equalizer-2.4/pulseaudio-equalizer/usr/bin/pulseaudio-equalizer.orig 2009-11-19 18:12:23.000000000 +0000 -+++ pulseaudio-equalizer-2.4/pulseaudio-equalizer/usr/bin/pulseaudio-equalizer 2009-11-26 21:28:43.617223850 +0000 -@@ -353,7 +353,7 @@ if [ "$1" = "disable" ]; then - - # Move currently active client sinks to ALSA sink - echo "Moving active PulseAudio clients to ALSA sink ($PA_MASTER_SINK)..." -- pacmd "list-sink-inputs" | grep 'index: ' | sed 's/ index: /move-sink-input /g' | sed "s/$/ $PA_MASTER_SINK/g" | pacmd >/dev/null -+ pacmd >/dev/null "$(pacmd "list-sink-inputs" | grep 'index: ' | sed 's/ index: /move-sink-input /g' | sed "s/$/ $PA_MASTER_SINK/g")" - - # Resmume running clients - echo "Resuming clients..." -@@ -387,7 +387,7 @@ if [ "$1" = "enable" ]; then - - # Move currently active client sinks to LADSPA sink - echo "Moving active PulseAudio clients to LADSPA sink ($PA_LADSPA_SINK)..." -- pacmd "list-sink-inputs" | grep 'index: ' | sed 's/ index: /move-sink-input /g' | sed "s/$/ $PA_LADSPA_SINK/g" | pacmd >/dev/null -+ pacmd >/dev/null "$(pacmd "list-sink-inputs" | grep 'index: ' | sed 's/ index: /move-sink-input /g' | sed "s/$/ $PA_LADSPA_SINK/g")" - - # Unmute & set preamp level on ALSA sink (as LADSPA sink will act as primary volume control) - echo "Setting ALSA sink ($PA_MASTER_SINK) preamp ("$PA_PREAMP"x)..." diff --git a/pulseaudio-equalizer.spec b/pulseaudio-equalizer.spec index f04861a..5f622cd 100644 --- a/pulseaudio-equalizer.spec +++ b/pulseaudio-equalizer.spec @@ -1,22 +1,21 @@ +%define rev 4 + Name: pulseaudio-equalizer -Version: 2.4 +Version: 2.7 Release: 1%{?dist} Summary: A 15 Bands Equalizer for PulseAudio Group: Applications/Multimedia License: GPLv3+ -URL: http://ubuntuforums.org/showthread.php?t=1308838 -# To obtain the source, logon to http://ubuntuforums.org ( or create an account if u don't have one ) -# then you can download the file from : http://ubuntuforums.org/attachment.php?attachmentid=140874&d=1261515002 -Source0: %{name}_%{version}debsource.tar.bz2 +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} +Source0: %{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -#Patch0: fix a hang when applying settings -Patch0: moving-active-clients.patch -#Patch1: respect FHS as per Fedora Guidelines -Patch1: respect-fhs.patch - BuildRequires: desktop-file-utils Requires: pygtk2 ladspa-swh-plugins gnome-media @@ -28,18 +27,9 @@ any application that is using PulseAudio, will benefit from the sound improvement. %prep -%setup -q -c %{name}-%{version} -cp %{name}/debian/copyright COPYING -cp %{name}/debian/changelog ChangeLog - -mv %{name}/usr/bin/%{name}.sh %{name}/usr/bin/%{name} - -sed -i s/%{name}.sh/%{name}/ %{name}/usr/bin/%{name} -sed -i s/%{name}.sh/%{name}/ %{name}/usr/share/%{name}/%{name}.py - -%patch0 -p1 -%patch1 -p1 -chmod +x %{name}/usr/bin/%{name}-gtk +%setup -q +cp debian/copyright COPYING +cp debian/changelog ChangeLog %build @@ -47,7 +37,7 @@ chmod +x %{name}/usr/bin/%{name}-gtk %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/usr -cp -rfp %{name}/usr $RPM_BUILD_ROOT +cp -rfp usr $RPM_BUILD_ROOT desktop-file-validate $RPM_BUILD_ROOT/%{_datadir}/applications/%{name}.desktop @@ -64,5 +54,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sun Feb 07 2010 Hicham HAOUARI 2.7-1 +- New upstream release +- New project URL +- Dropped patches ( merged upstream ) + * Thu Nov 26 2009 Hicham HAOUARI 2.4-1 - Initial package diff --git a/respect-fhs.patch b/respect-fhs.patch deleted file mode 100644 index 1475d1d..0000000 --- a/respect-fhs.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -up /dev/null pulseaudio-equalizer-2.4/pulseaudio-equalizer/usr/bin/pulseaudio-equalizer-gtk ---- /dev/null 2009-12-21 15:13:08.824222031 +0000 -+++ pulseaudio-equalizer-2.4/pulseaudio-equalizer/usr/bin/pulseaudio-equalizer-gtk 2009-12-21 15:57:39.504464379 +0000 -@@ -0,0 +1,2 @@ -+#!/bin/bash -+python /usr/share/pulseaudio-equalizer/pulseaudio-equalizer.py -diff -up pulseaudio-equalizer-2.4/pulseaudio-equalizer/usr/share/applications/pulseaudio-equalizer.desktop.orig pulseaudio-equalizer-2.4/pulseaudio-equalizer/usr/share/applications/pulseaudio-equalizer.desktop ---- pulseaudio-equalizer-2.4/pulseaudio-equalizer/usr/share/applications/pulseaudio-equalizer.desktop.orig 2009-12-21 16:00:22.995464841 +0000 -+++ pulseaudio-equalizer-2.4/pulseaudio-equalizer/usr/share/applications/pulseaudio-equalizer.desktop 2009-12-21 16:00:39.964477791 +0000 -@@ -1,10 +1,9 @@ - [Desktop Entry] - Version=1.0 --Encoding=UTF-8 - Name=PulseAudio Equalizer - GenericName=Equalizer - Comment=15 band graphic equalizer --Exec=/usr/share/pulseaudio-equalizer/pulseaudio-equalizer.py -+Exec=pulseaudio-equalizer-gtk - Icon=gnome-volume-control - StartupNotify=true - Type=Application diff --git a/sources b/sources index c3cad6f..c2e8a37 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -76cc270a6926bf4881165b84ee811d19 pulseaudio-equalizer_2.4debsource.tar.bz2 +7fda0f950d9364ac18938fe5fe645911 pulseaudio-equalizer-2.7.tar.bz2