rpms/qsynth/devel qsynth-linking.patch, NONE, 1.1 qsynth.spec, 1.15, 1.16

[Orcan Ogetbil]

Author: oget

Update of /cvs/pkgs/rpms/qsynth/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1791

Modified Files:
	qsynth.spec 
Added Files:
	qsynth-linking.patch 
Log Message:
* Sat Feb 13 2010 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> 0.3.4-3
- Fix DSO linking failure RHBZ#564615
- Clean up the specfile from bits related to Fedora < 11


qsynth-linking.patch:
 configure.ac |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

--- NEW FILE qsynth-linking.patch ---
diff -rupN qsynth-0.3.4.old/configure.ac qsynth-0.3.4/configure.ac
--- qsynth-0.3.4.old/configure.ac	2009-05-10 08:01:14.000000000 -0400
+++ qsynth-0.3.4/configure.ac	2010-02-13 12:58:05.000000000 -0500
@@ -150,7 +150,12 @@ AC_SUBST(ac_lrelease)
 
 # Checks for libraries.
 AC_CHECK_LIB(m, main)
-AC_CHECK_LIB(X11, main)
+AC_CHECK_LIB(X11, main, [ac_X11_lib="yes"], [ac_X11_lib="no"])
+if test "x$ac_X11_lib" = "xno"; then
+   AC_MSG_ERROR([libX11 library not found.])
+else
+   ac_libs="$ac_libs -lX11"
+fi
 AC_CHECK_LIB(Xext, main)
 
 # Check for round math function.


Index: qsynth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qsynth/devel/qsynth.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- qsynth.spec	27 Jul 2009 02:35:46 -0000	1.15
+++ qsynth.spec	13 Feb 2010 18:55:54 -0000	1.16
@@ -3,24 +3,25 @@
 Summary:       Qt based Fluidsynth GUI front end
 Name:          qsynth
 Version:       0.3.4
-Release:       2%{?dist}
+Release:       3%{?dist}
 URL:           http://qsynth.sourceforge.net
 Source0:       http://dl.sourceforge.net/qsynth/qsynth-%{version}.tar.gz
 # We don't want .qm files in the default locale dir
 Patch2:        qsynth-fix-locale-path.patch
 # Tweak the defaults to make things work properly
 Patch3:        qsynth-fedora-defaults.patch
+# Fix DSO linking error
+# https://sourceforge.net/tracker/?func=detail&aid=2951295&group_id=93509&atid=604540
+Patch4:        qsynth-linking.patch
 License:       GPLv2+
 Group:         Applications/Multimedia
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:      hicolor-icon-theme
-
-%if 0%{?fedora} < 11
-Requires:      PersonalCopy-Lite-soundfont
-%else
 Requires:      soundfont2-default
-%endif
 
+
+BuildRequires: autoconf
+BuildRequires: automake
 BuildRequires: desktop-file-utils
 BuildRequires: fluidsynth-devel
 BuildRequires: qt-devel
@@ -36,11 +37,7 @@ command line software synthesiser based 
 %setup -q
 %patch2 -p1 -b .localedir
 %patch3 -p1 -b .defaults
-
-# default.sf2 not available for Fedora < 11
-%if 0%{?fedora} < 11
-sed -i 's|default\.sf2|PCLite.sf2|' src/qsynthOptions.cpp
-%endif
+%patch4 -p1 -b .linking
 
 iconv --from=ISO88591 --to=UTF8 AUTHORS -o AUTHORS.tmp
 touch -r AUTHORS AUTHORS.tmp
@@ -48,6 +45,7 @@ mv -f AUTHORS.tmp AUTHORS
 
 
 %build
+autoreconf
 %configure
 make # doesn't understand %%{?_smp_mflags}
 
@@ -91,6 +89,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sat Feb 13 2010 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> 0.3.4-3
+- Fix DSO linking failure RHBZ#564615
+- Clean up the specfile from bits related to Fedora < 11
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild