rpms/armstrong/devel armstrong-conflict-namespace.patch, NONE, 1.1 armstrong.spec, 1.6, 1.7

[Orcan Ogetbil]

Author: oget

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

Modified Files:
	armstrong.spec 
Added Files:
	armstrong-conflict-namespace.patch 
Log Message:
* Sat Jan 30 2010 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com>  0.2.6-9
- Rebuild against portmidi-200
- Make the pyzzub package noarch


armstrong-conflict-namespace.patch:
 libzzub.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE armstrong-conflict-namespace.patch ---
diff -rupN armstrong.old/src/libzzub/libzzub.cpp armstrong/src/libzzub/libzzub.cpp
--- armstrong.old/src/libzzub/libzzub.cpp	2009-01-09 16:17:44.000000000 -0500
+++ armstrong/src/libzzub/libzzub.cpp	2010-01-30 11:33:39.000000000 -0500
@@ -1447,7 +1447,7 @@ int zzub_plugin_describe_value(zzub_plug
 	int index = -1;
 	zzub_plugin_pattern_to_linear_no_connections(plugin, group, 0, column, &index);
 
-	const parameter* para = plugin->_player->back.plugin_get_parameter_info(plugin->id, group, 0, column);
+	const zzub::parameter* para = plugin->_player->back.plugin_get_parameter_info(plugin->id, group, 0, column);
 	if (index != -1) {
 		if (value != getNoValue(para)) {	// infector crashen when trying to describe novalues (and out-of-range-values)
 			


Index: armstrong.spec
===================================================================
RCS file: /cvs/pkgs/rpms/armstrong/devel/armstrong.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- armstrong.spec	24 Jul 2009 17:06:51 -0000	1.6
+++ armstrong.spec	30 Jan 2010 17:11:57 -0000	1.7
@@ -2,7 +2,7 @@
 
 Name:           armstrong
 Version:        0.2.6
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Powerful music sequencing library
 Group:          System Environment/Libraries
 # src/plugins/Geonik is GPL+
@@ -61,6 +61,10 @@ Patch6:         armstrong-bcb8dd70b78f.d
 # Resolve undefined symbols
 # http://bitbucket.org/paniq/armstrong/issue/12/undefined-symbols
 Patch7:         armstrong-define-symbols.patch
+# Resolve a conflict in the namespace against new boost
+# http://bitbucket.org/paniq/armstrong/issue/17/trunk-fails-to-build-w-boost-graph-140
+Patch8:         armstrong-conflict-namespace.patch
+
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -110,6 +114,8 @@ applications and plugins that use %{name
 Summary:        Python Bindings For libzzub
 Group:          System Environment/Libraries
 License:        GPLv2+
+BuildArch:      noarch
+Obsoletes:      pyzzub < 0.2.6-8
 Requires:       %{name} = %{version}-%{release}
 
 %description -n pyzzub
@@ -127,6 +133,12 @@ Python scripts.
 %patch5 -p1 -b .64bit
 %patch6 -p1 -b .multidssi
 %patch7 -p1 -b .symbols
+%patch8 -p1 -b .conflict
+
+# To build against portmidi >=184
+%if 0%{fedora} > 11
+sed -i '/porttime/d' src/libzzub/SConscript
+%endif
 
 # Remove the binded libraries. We'll use the system-wide ones
 pushd src
@@ -290,6 +302,10 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitelib}/*
 
 %changelog
+* Sat Jan 30 2010 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com>  0.2.6-9
+- Rebuild against portmidi-200
+- Make the pyzzub package noarch
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.6-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild