- Update to 0.04.6 (build system uses waf now)

- License is GPLv2+
- Add missing Requires: ladspa

.cvsignore

@@ -1 +1 @@
-guitarix-0.04.5-1.tar.bz2
+guitarix-0.04.6-1.tar.bz2

guitarix.spec

@@ -1,13 +1,14 @@
 Name:           guitarix
-Version:        0.04.5
+Version:        0.04.6
 Release:        1%{?dist}
 Summary:        Mono amplifier to JACK
 Group:          Applications/Multimedia
-License:        GPL+
+License:        GPLv2+
 URL:            http://guitarix.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}-1.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+BuildRequires:  boost-devel
 BuildRequires:  desktop-file-utils
 BuildRequires:  gtk2-devel
 BuildRequires:  jack-audio-connection-kit-devel
@@ -16,6 +17,7 @@ BuildRequires:  libsndfile-devel
 
 Requires:       jack_capture
 Requires:       jconv
+Requires:       ladspa
 Requires:       vorbis-tools
 
 %description
@@ -29,32 +31,29 @@ can use the feedback and feedforward sliders.
 guitarix includes an experimental tuner and a JACK midi output port with 3
 channels. They will be fed by a mix from a pitch tracker and a beat detector.
 You can pitch the octave (2 up or down), choose the midi channel, the program,
-the velocity and the sensitiviy, which means how fast the note will read after
+the velocity and the sensitivity, which means how fast the note will read after
 the beat detector emits a signal. Values can be set for the beat detector for
 all channels.
 
 %prep
 %setup -q -n %{name}-%{version}-1
 
-# Fix encoding
-iconv -f iso-8859-1 -t utf-8 changelog -o changelog.utf 
-touch -r changelog changelog.utf
-mv -f changelog.utf changelog
+# Correct libdir path
+sed -i 's|lib/|%{_lib}/|' wscript
 
+# Comply with freedesktop standards
+sed -i 's|\.png||' %{name}.desktop
 
 %build
-make %{?_smp_mflags} \
-     LADSPAPATH=%{_libdir}/ladspa \
-     CXXFLAGS="%{optflags}" 
-
+./waf -vvv configure --prefix=%{_prefix} --cxxflags="%{optflags}"
+./waf -vvv build %{?_smp_mflags}
 
 %install
 rm -rf %{buildroot}
-make install LADSPAPATH=%{_libdir}/ladspa DESTDIR=%{buildroot}
+./waf -vvv install --destdir="%{buildroot}"
 
-desktop-file-install \
-    --dir=%{buildroot}%{_datadir}/applications \
-     %{buildroot}/%{_datadir}/applications/%{name}.desktop
+%check
+desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop
 
 %clean
 rm -rf %{buildroot}
@@ -71,6 +70,11 @@ rm -rf %{buildroot}
 %{_datadir}/applications/%{name}.desktop
 
 %changelog
+* Wed Jun 24 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.04.6-1
+- Update to 0.04.6 (build system uses waf now)
+- License is GPLv2+
+- Add missing Requires: ladspa
+
 * Tue May 26 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.04.5-1
 - Update to 0.04.5
 

sources

@@ -1 +1 @@
-d0c8d81c352675a5caaa88cb0bdebc9d  guitarix-0.04.5-1.tar.bz2
+e172669f64596a238bc6a926ed42e7b5  guitarix-0.04.6-1.tar.bz2