[sugar-tamtam] update format length modifier (FTBFS) make it x86-only

Dan Horák sharkcz at fedoraproject.org
Mon Oct 17 12:27:46 UTC 2011


commit 6815b220672818a8280e458daa45dd7fbee2ba69
Author: Dan Horák <dan at danny.cz>
Date:   Mon Oct 17 14:27:44 2011 +0200

    update format length modifier (FTBFS)
    make it x86-only

 sugar-tamtam-types.patch |   12 ++++++++++++
 sugar-tamtam.spec        |   11 ++++++++++-
 2 files changed, 22 insertions(+), 1 deletions(-)
---
diff --git a/sugar-tamtam-types.patch b/sugar-tamtam-types.patch
new file mode 100644
index 0000000..fe4bb42
--- /dev/null
+++ b/sugar-tamtam-types.patch
@@ -0,0 +1,12 @@
+diff -up sugar-tamtam-0/common/Util/Clooper/aclient.cpp.types sugar-tamtam-0/common/Util/Clooper/aclient.cpp
+--- sugar-tamtam-0/common/Util/Clooper/aclient.cpp.types	2011-10-17 14:02:19.000000000 +0200
++++ sugar-tamtam-0/common/Util/Clooper/aclient.cpp	2011-10-17 14:02:46.000000000 +0200
+@@ -719,7 +719,7 @@ struct TamTamSound
+             ll->printf( "INFO(%s:%i) aclient joining performance thread\n", __FILE__, __LINE__ );
+             uintptr_t rval = csoundJoinThread(ThreadID);
+             ll->printf( "INFO(%s:%i) ... joined\n", __FILE__, __LINE__ );
+-            if (rval)  ll->printf( "WARNING: thread returned %zu\n", rval);
++            if (rval)  ll->printf( "WARNING: thread returned %tu\n", rval);
+             ThreadID = NULL;
+             return 0;
+         }
diff --git a/sugar-tamtam.spec b/sugar-tamtam.spec
index 24d247a..ccd0ba7 100644
--- a/sugar-tamtam.spec
+++ b/sugar-tamtam.spec
@@ -12,7 +12,7 @@
 
 Name:           sugar-tamtam
 Version:        0
-Release:        0.7.%{gitdate}git%{?dist}
+Release:        0.8.%{gitdate}git%{?dist}
 Summary:        A suite of four music and sound related activities
 
 Group:          Sugar/Activities
@@ -21,6 +21,7 @@ Group:          Sugar/Activities
 License:        GPLv2+ and GPLv3+
 URL:            http://wiki.sugarlabs.org/go/Activities/Tam_Tam
 Source0:        %{tarfile}
+Patch0:         %{name}-types.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  alsa-lib-devel
@@ -31,6 +32,9 @@ BuildRequires:  sugar-toolkit
 BuildRequires:  gettext
 Requires:       sugar
 
+# x86 asm is used
+ExclusiveArch:  %{ix86} x86_64
+
 %description
 The TamTam activity suite for the Sugar learning environment provides
 a number of music and sound related activities.
@@ -90,6 +94,7 @@ SynthLab is a physics lab and sound synthesizer modeled on Max/MSP.
 
 %prep
 %setup -q
+%patch0 -p1 -b .types
 
 # fix to create proper debuginfo
 sed -i -e 's/-Dsm/-Dm/g' Makefile
@@ -169,6 +174,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Oct 17 2011 Dan Horák <dan[at]danny.cz> - 0-0.8.20100201git
+- update format length modifier (FTBFS)
+- make it x86-only
+
 * Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0-0.7.20100201git
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 


More information about the scm-commits mailing list