rpms/sonic-visualiser/F-11 .cvsignore, 1.6, 1.7 sonic-visualiser.desktop, 1.1, 1.2 sonic-visualiser.spec, 1.15, 1.16 sources, 1.6, 1.7

[Michel Alexandre Salim]

Author: salimma

Update of /cvs/pkgs/rpms/sonic-visualiser/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29573/F-11

Modified Files:
	.cvsignore sonic-visualiser.desktop sonic-visualiser.spec 
	sources 
Log Message:
* Sun Sep 13 2009 Michel Salim <salimma at fedoraproject.org> - 1.6-3
- No longer conflict with RPM Fusion packaging
- Updated icon cache scriptlet

* Sun Aug 23 2009 Michel Salim <salimma at fedoraproject.org> - 1.6-2
- Package now conflicts with RPM Fusion packaging

* Fri Aug 21 2009 Michel Salim <salimma at fedoraproject.org> - 1.6-1
- Update to 1.6




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sonic-visualiser/F-11/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	26 Mar 2009 20:45:42 -0000	1.6
+++ .cvsignore	13 Sep 2009 15:56:29 -0000	1.7
@@ -1 +1 @@
-sonic-visualiser-1.5.tar.bz2
+sonic-visualiser-1.6.tar.bz2


Index: sonic-visualiser.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/sonic-visualiser/F-11/sonic-visualiser.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sonic-visualiser.desktop	30 Jan 2008 21:03:31 -0000	1.1
+++ sonic-visualiser.desktop	13 Sep 2009 15:56:29 -0000	1.2
@@ -6,7 +6,7 @@ Categories=AudioVideo;Viewer;Player;
 Encoding=UTF-8
 Exec=sonic-visualiser %U
 Icon=sonic-visualiser
-MimeType=application/x-flac;audio/x-flac;audio/wav;audio/x-wav;audio/x-pn-wav;audio/x-mp3;application/x-ogg;application/ogg;audio/ogg;
+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


Index: sonic-visualiser.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sonic-visualiser/F-11/sonic-visualiser.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sonic-visualiser.spec	26 Mar 2009 20:45:42 -0000	1.15
+++ sonic-visualiser.spec	13 Sep 2009 15:56:29 -0000	1.16
@@ -1,16 +1,15 @@
-# rebuild with --with libmad to enable support for MP3 files
 Name:           sonic-visualiser
-Version:        1.5
-Release:        1%{?dist}
+Version:        1.6
+Release:        3%{?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
-Source1:        %{name}.desktop
-Patch0:         %{name}-1.5-gcc44.patch
-Patch1:         %{name}-1.5-alsa.patch
+Source1:        sonic-visualiser.desktop
+Patch0:         sonic-visualiser-1.5-gcc44.patch
+Patch1:         sonic-visualiser-1.5-alsa.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  qt4-devel vamp-plugin-sdk-devel
@@ -18,7 +17,6 @@ BuildRequires:  libsndfile-devel libsamp
 BuildRequires:  alsa-lib-devel jack-audio-connection-kit-devel
 BuildRequires:  pulseaudio-libs-devel
 BuildRequires:  redland-devel rubberband-devel
-%{?_with_libmad:BuildRequires:  libmad-devel}
 BuildRequires:  liboggz-devel libfishsound-devel liblo-devel
 BuildRequires:  desktop-file-utils
 Requires:       hicolor-icon-theme
@@ -48,10 +46,7 @@ analysis plugin format – as well as ap
 
 %build
 qmake-qt4
-# patch in correct optflags
-sed -i 's|QMAKE_CXXFLAGS_RELEASE += -DNDEBUG -DNO_TIMING .*|QMAKE_CXXFLAGS_RELEASE += -DNDEBUG -DNO_TIMING ${RPM_OPT_FLAGS}|1' sv.prf
-# parallel build does not work
-make #%{?_smp_mflags}
+make %{?_smp_mflags}
 
 
 %install
@@ -75,17 +70,17 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %post
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+if [ $1 -eq 0 ] ; then
+    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 fi
 
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
 
 %files
 %defattr(-,root,root,-)
@@ -96,6 +91,16 @@ fi
 
 
 %changelog
+* Sun Sep 13 2009 Michel Salim <salimma at fedoraproject.org> - 1.6-3
+- No longer conflict with RPM Fusion packaging
+- Updated icon cache scriptlet
+
+* Sun Aug 23 2009 Michel Salim <salimma at fedoraproject.org> - 1.6-2
+- Package now conflicts with RPM Fusion packaging
+
+* Fri Aug 21 2009 Michel Salim <salimma at fedoraproject.org> - 1.6-1
+- Update to 1.6
+
 * Thu Mar 26 2009 Michel Salim <salimma at fedoraproject.org> - 1.5-1
 - Update to 1.5
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sonic-visualiser/F-11/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	26 Mar 2009 20:45:42 -0000	1.6
+++ sources	13 Sep 2009 15:56:29 -0000	1.7
@@ -1 +1 @@
-6a4c29abbadce83dc8b55ac84c34c0d4  sonic-visualiser-1.5.tar.bz2
+2c547a0eb5c61a8fb6318db1370a872b  sonic-visualiser-1.6.tar.bz2