[sonic-visualiser] Update to 1.8

[Michel Alexandre Salim]

commit 7ff4911c8c81262456816394f088fd8978c1b8f9
Author: Michel Alexandre Salim <michel.salim at cs.fau.de>
Date:   Tue Jun 21 20:49:37 2011 +0200

    Update to 1.8

 .gitignore                       |    2 +-
 sonic-visualiser-1.5-alsa.patch  |   11 ------
 sonic-visualiser-1.5-gcc44.patch |   65 --------------------------------------
 sonic-visualiser.desktop         |   11 ++----
 sonic-visualiser.spec            |   45 ++++++++++++++-----------
 sources                          |    2 +-
 6 files changed, 31 insertions(+), 105 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d0bd2c0..2116313 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-sonic-visualiser-1.7.2.tar.bz2
+/sonic-visualiser-1.8.tar.gz
diff --git a/sonic-visualiser.desktop b/sonic-visualiser.desktop
index a0a242b..1211d45 100644
--- a/sonic-visualiser.desktop
+++ b/sonic-visualiser.desktop
@@ -1,12 +1,9 @@
 [Desktop Entry]
 Name=Sonic Visualiser
-GenericName=Audio visualization tool
-Comment=Audio visualization tool
-Categories=AudioVideo;Viewer;Player;X-DigitalProcessing;
-Encoding=UTF-8
+GenericName=Audio visualisation tool
 Exec=sonic-visualiser %U
-Icon=sonic-visualiser
-MimeType=application/x-flac;audio/x-flac;audio/wav;audio/x-wav;audio/x-pn-wav;application/x-ogg;application/ogg;audio/ogg;
-StartupNotify=true
 Terminal=false
 Type=Application
+Icon=sonic-visualiser
+Categories=Audio;AudioVideo;
+MimeType=application/x-sonicvisualiser;application/x-sonicvisualiser-layer;application/x-ogg;audio/x-flac;audio/x-wav;audio/wav;application/ogg;audio/x-vorbis+ogg;
diff --git a/sonic-visualiser.spec b/sonic-visualiser.spec
index bb8f951..9f7b862 100644
--- a/sonic-visualiser.spec
+++ b/sonic-visualiser.spec
@@ -1,15 +1,15 @@
 Name:           sonic-visualiser
-Version:        1.7.2
-Release:        3%{?dist}
+Version:        1.8
+Release:        1%{?dist}
 Summary:        A program for viewing and exploring audio data
 
 Group:          Applications/Multimedia
 License:        GPLv2+
 URL:            http://www.sonicvisualiser.org/
-Source0:        http://downloads.sourceforge.net/sv1/sonic-visualiser-%{version}.tar.bz2
+Source0:        http://downloads.sourceforge.net/sv1/sonic-visualiser-%{version}.tar.gz
 Source1:        sonic-visualiser.desktop
-Patch0:         sonic-visualiser-1.5-gcc44.patch
-Patch1:         sonic-visualiser-1.5-alsa.patch
+Patch0:         %{name}-1.8-gcc46.patch
+Patch1:         %{name}-1.8-implicit-dso.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  qt4-devel vamp-plugin-sdk-devel
@@ -22,7 +22,7 @@ BuildRequires:  desktop-file-utils
 Requires:       hicolor-icon-theme
 
 %description
-Sonic Visualiser is an application for viewing and analysing the
+Sonic Visualiser is an application for viewing and analyzing the
 contents of music audio files.
 
 The aim of Sonic Visualiser is to be the first program you reach for
@@ -38,15 +38,15 @@ analysis plugin format – as well as applying standard audio effects.
 
 %prep
 %setup -q
-# https://sourceforge.net/tracker/?func=detail&aid=2715387&group_id=162924&atid=825705
-%patch0 -p1 -b .gcc44
-# https://sourceforge.net/tracker/?func=detail&aid=2715381&group_id=162924&atid=825705
-%patch1 -p1 -b .alsa
+%patch0 -p1 -b .gcc46
+%patch1 -p1 -b .implicit-dso
 
 
 %build
-qmake-qt4
-make %{?_smp_mflags}
+%configure
+#qmake-qt4
+#make {?_smp_mflags}
+make
 
 
 %install
@@ -54,15 +54,15 @@ rm -rf $RPM_BUILD_ROOT
 # install does nothing right now
 # make install DESTDIR=$RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{_bindir}
-install -m 755 -p sv/sonic-visualiser \
+install -m 755 -p sonic-visualiser/sonic-visualiser \
         $RPM_BUILD_ROOT%{_bindir}/
 # desktop file and icon
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
-install -m 644 -p sv/icons/sv-48x48.png \
-        $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/sonic-visualiser.png
-desktop-file-install --vendor="fedora" \
-                     --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
-                     %{SOURCE1}
+for s in 16 22 24 32 48 64 128; do
+    mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${s}x${s}/apps
+    install -m 644 -p sonic-visualiser/icons/sv-${s}x${s}.png \
+        $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${s}x${s}/apps/sonic-visualiser.png
+done
+desktop-file-install --dir=$RPM_BUILD_ROOT%{_datadir}/applications %{SOURCE1}
 
 
 %clean
@@ -71,12 +71,14 @@ rm -rf $RPM_BUILD_ROOT
 
 %post
 touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+update-desktop-database &> /dev/null || :
 
 %postun
 if [ $1 -eq 0 ] ; then
     touch --no-create %{_datadir}/icons/hicolor &>/dev/null
     gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 fi
+update-desktop-database &> /dev/null || :
 
 %posttrans
 gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
@@ -84,13 +86,16 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 %files
 %defattr(-,root,root,-)
-%doc COPYING README README.OSC
+%doc sonic-visualiser/CHANGELOG sonic-visualiser/COPYING sonic-visualiser/README sonic-visualiser/README.OSC
 %{_bindir}/sonic-visualiser
 %{_datadir}/applications/*.desktop
 %{_datadir}/icons/hicolor/*/apps/*.png
 
 
 %changelog
+* Tue Jun 21 2011 Michel Salim <salimma at fedoraproject.org> - 1.8-1
+- Update to 1.8
+
 * Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.7.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
diff --git a/sources b/sources
index e9063c8..e0972ab 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-06b31cd07eee708d33aba46cb2d20fe2  sonic-visualiser-1.7.2.tar.bz2
+ad676d0b4cf5b8561306487f52642862  sonic-visualiser-1.8.tar.gz