From ca24254f6f4b951c5d4106d5d2c91d2f0d94b826 Mon Sep 17 00:00:00 2001 From: Orcan Ogetbil Date: Feb 13 2010 21:22:28 +0000 Subject: - Fix DSO linking RHBZ#564719 --- diff --git a/hydrogen-linking.patch b/hydrogen-linking.patch new file mode 100644 index 0000000..2460aad --- /dev/null +++ b/hydrogen-linking.patch @@ -0,0 +1,12 @@ +diff -rupN hydrogen-0.9.4.old/Sconstruct hydrogen-0.9.4/Sconstruct +--- hydrogen-0.9.4.old/Sconstruct 2009-09-07 17:31:13.000000000 -0400 ++++ hydrogen-0.9.4/Sconstruct 2010-02-13 15:56:14.000000000 -0500 +@@ -269,7 +269,7 @@ def get_hydrogen_gui( lib_hydrogen , opt + if str(env['lash']) == "1": + env.ParseConfig('pkg-config --cflags --libs lash-1.0') + +- if sys.platform == "darwin": ++ if sys.platform == "darwin" or sys.platform == "linux2": + env.Append( LIBS = ["z"] ) + + if sys.platform == "darwin" and str(env['coreaudio']) == "1": diff --git a/hydrogen.spec b/hydrogen.spec index b8eb6c2..d636075 100644 --- a/hydrogen.spec +++ b/hydrogen.spec @@ -1,13 +1,15 @@ Summary: Advanced drum machine for GNU/Linux Name: hydrogen Version: 0.9.4 -Release: 2%{?dist} +Release: 3%{?dist} URL: http://www.hydrogen-music.org/ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz # For convenience, to take the svn snapshot: Source9: hydrogen-snapshot.sh # portmidi-200 needs a new patch. Causes RHBZ#555488 Patch0: hydrogen-portmidi-200.patch +# Fix DSO linking. RHBZ#564719. Sent to upstream ML: +Patch1: hydrogen-linking.patch License: GPLv2+ Group: Applications/Multimedia BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -37,6 +39,7 @@ patch -p0 < patches/portmidi.patch %else %patch0 -p1 -b .200 %endif +%patch1 -p1 -b .linking %build export QTDIR=%{_qt4_prefix} @@ -95,6 +98,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_datadir}/icons/hicolor/scalable/apps/*.svg %changelog +* Sat Feb 13 2010 Orcan Ogetbil - 0.9.4-3 +- Fix DSO linking RHBZ#564719 + * Sat Jan 30 2010 Orcan Ogetbil - 0.9.4-2 - Add patch against portmidi-200 on F13+. Fixes RHBZ#555488