rpms/sonic-visualiser/devel sonic-visualiser-1.4-specfix.patch, NONE, 1.1 sonic-visualiser.spec, 1.11, 1.12

[Michel Alexandre Salim]

Author: salimma

Update of /cvs/pkgs/rpms/sonic-visualiser/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29337

Modified Files:
	sonic-visualiser.spec 
Added Files:
	sonic-visualiser-1.4-specfix.patch 
Log Message:
* Sun Dec 14 2008 Michel Salim <salimma at fedoraproject.org> - 1.4-2
- Fix qmake profiles to properly detect 64-bit Linux


sonic-visualiser-1.4-specfix.patch:

--- NEW FILE sonic-visualiser-1.4-specfix.patch ---
--- sonic-visualiser-1.4/sv/sv.pro.specfix	2008-12-11 07:50:34.000000000 -0500
+++ sonic-visualiser-1.4/sv/sv.pro	2008-12-14 20:41:22.000000000 -0500
@@ -9,7 +9,7 @@
 QT += xml network
 
 TARGET = "Sonic Visualiser"
-linux-g++:TARGET = sonic-visualiser
+linux-g++*:TARGET = sonic-visualiser
 
 ICON = icons/sv-macicon.icns
 RC_FILE = icons/sv.rc
--- sonic-visualiser-1.4/sv.prf.specfix	2008-12-11 07:50:55.000000000 -0500
+++ sonic-visualiser-1.4/sv.prf	2008-12-14 20:41:07.000000000 -0500
@@ -17,12 +17,12 @@
 # Always define NDEBUG and NO_TIMING for release builds.
 # 
 QMAKE_CXXFLAGS_RELEASE += -DNDEBUG -DNO_TIMING -O3
-#linux-g++:QMAKE_CXXFLAGS_RELEASE += -march=pentium3 -msse -mmmx -ftree-vectorize -fomit-frame-pointer
+#linux-g++*:QMAKE_CXXFLAGS_RELEASE += -march=pentium3 -msse -mmmx -ftree-vectorize -fomit-frame-pointer
 
 # To do a static build with gcc on Linux
 #
-#linux-g++:LIBS += -Wl,-Bstatic
-#linux-g++:DEFINES += BUILD_STATIC
+#linux-g++*:LIBS += -Wl,-Bstatic
+#linux-g++*:DEFINES += BUILD_STATIC
 
 
 # These are testable on platforms with pkg-config.  If you don't have
@@ -196,12 +196,12 @@
 
 LIBS -= -lpthread
 
-linux-g++ {
+linux-g++* {
     contains(DEFINES, BUILD_STATIC) {
     	LIBS += -lFLAC -lxml2
     }
 }
 
 # Restore dynamic linkage, in case we went static earlier
-linux-g++:LIBS += -Wl,-Bdynamic -lpthread -ldl
+linux-g++*:LIBS += -Wl,-Bdynamic -lpthread -ldl
 


Index: sonic-visualiser.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sonic-visualiser/devel/sonic-visualiser.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sonic-visualiser.spec	14 Dec 2008 23:23:33 -0000	1.11
+++ sonic-visualiser.spec	15 Dec 2008 01:52:06 -0000	1.12
@@ -1,7 +1,7 @@
 # rebuild with --with libmad to enable support for MP3 files
 Name:           sonic-visualiser
 Version:        1.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A program for viewing and exploring audio data
 
 Group:          Applications/Multimedia
@@ -9,6 +9,7 @@
 URL:            http://www.sonicvisualiser.org/
 Source0:        http://downloads.sourceforge.net/sv1/sonic-visualiser-%{version}.tar.bz2
 Source1:        %{name}.desktop
+Patch0:         %{name}-1.4-specfix.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  qt4-devel vamp-plugin-sdk-devel
@@ -37,6 +38,9 @@
 
 %prep
 %setup -q
+# SF tracker #2430266
+# s|linux-g++|linux-g++*
+%patch0 -p1 -b .specfix
 
 
 %build
@@ -52,8 +56,8 @@
 # install does nothing right now
 # make install DESTDIR=$RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{_bindir}
-install -m 755 -p sv/Sonic\ Visualiser \
-	$RPM_BUILD_ROOT%{_bindir}/sonic-visualiser
+install -m 755 -p sv/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 \
@@ -89,6 +93,9 @@
 
 
 %changelog
+* Sun Dec 14 2008 Michel Salim <salimma at fedoraproject.org> - 1.4-2
+- Fix qmake profiles to properly detect 64-bit Linux
+
 * Sun Dec 14 2008 Michel Salim <salimma at fedoraproject.org> - 1.4-1
 - Update to 1.4
 - Replace PortAudio dependency with PulseAudio