[solfege] - Update patch to fix the build problem with swig 2.0
chkr
chkr at fedoraproject.org
Mon Oct 11 21:43:21 UTC 2010
commit 7b028ba18352657a72fc1ee647e688f433678946
Author: Christian Krause <chkr at fedoraproject.org>
Date: Mon Oct 11 23:43:29 2010 +0200
- Update patch to fix the build problem with swig 2.0
solfege-3.16.4-build-fix.patch | 12 ------------
solfege-3.18.3-build-fix.patch | 13 +++++++++++++
solfege.spec | 6 +++++-
3 files changed, 18 insertions(+), 13 deletions(-)
---
diff --git a/solfege-3.18.3-build-fix.patch b/solfege-3.18.3-build-fix.patch
new file mode 100644
index 0000000..db771e9
--- /dev/null
+++ b/solfege-3.18.3-build-fix.patch
@@ -0,0 +1,13 @@
+diff -uNr solfege-3.18.3.old/solfege/soundcard/Makefile solfege-3.18.3/solfege/soundcard/Makefile
+--- solfege-3.18.3.old/solfege/soundcard/Makefile 2010-10-08 11:31:36.000000000 +0200
++++ solfege-3.18.3/solfege/soundcard/Makefile 2010-10-11 23:26:21.000000000 +0200
+@@ -34,6 +34,9 @@
+ ifeq ($(SWIG_VERSION),1.3)
+ TARGETS += solfege/soundcard/_solfege_c_midi.so
+ endif
++ ifeq ($(SWIG_VERSION),2.0)
++ TARGETS += solfege/soundcard/_solfege_c_midi.so
++ endif
+ ifeq ($(SWIG_VERSION),unknown)
+ TARGETS += solfege/soundcard/_solfege_c_midi.so
+ endif
diff --git a/solfege.spec b/solfege.spec
index 9696e2f..d397613 100644
--- a/solfege.spec
+++ b/solfege.spec
@@ -11,6 +11,9 @@ Source0: http://downloads.sourceforge.net/solfege/%{name}-%{version}.tar.gz
Patch1: solfege-3.14.1-desktop.patch
# use timidity as default
Patch2: solfege-3.14.11-default-timidity.patch
+# http://code.google.com/p/solfege/issues/detail?id=202
+Patch3: solfege-3.18.3-build-fix.patch
+
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: texinfo, swig, gettext, docbook-style-xsl
@@ -30,6 +33,7 @@ interval, scale and chord skills. Solfege - Smarten your ears!
%setup -q
%patch1 -p0
%patch2 -F 1 -p1
+%patch3 -p1
#remove unneeded shebang to make rpmlint happy
%{__sed} -i.stamp -e 's|#!/usr/bin/python||' solfege/rhythmwidget.py
@@ -85,7 +89,7 @@ rm -rf $RPM_BUILD_ROOT
%changelog
* Sun Oct 10 2010 Christian Krause <chkr at fedoraproject.org> - 3.18.3-1
- Update to new upstream release (BZ 636475)
-- Remove upstreamed patch
+- Update patch to fix the build problem with swig 2.0
* Sat Jul 24 2010 Christian Krause <chkr at fedoraproject.org> - 3.16.4-1
- Update to new upstream release (BZ 617836)
More information about the scm-commits
mailing list