rpms/armstrong/F-10 armstrong-buildfix.patch, NONE, 1.1 armstrong-gcc44.patch, NONE, 1.1 armstrong-size_t.patch, NONE, 1.1 armstrong-sonamefix.patch, NONE, 1.1 armstrong-use-system-libs.patch, NONE, 1.1 armstrong.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

Orcan Ogetbil oget at fedoraproject.org
Thu Mar 5 22:04:05 UTC 2009 

Author: oget

Update of /cvs/pkgs/rpms/armstrong/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32716/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	armstrong-buildfix.patch armstrong-gcc44.patch 
	armstrong-size_t.patch armstrong-sonamefix.patch 
	armstrong-use-system-libs.patch armstrong.spec import.log 
Log Message:
* Thu Mar 05 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com>  0.2.6-4
- Update the size_t patch to fix compilation on ppc64
- Remove some proprietary code from the tarball (src/rtaudio/include)

* Sat Feb 28 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com>  0.2.6-3
- License for -devel and pyzzub packages is GPLv2+
- Clarify system-wide library usage
- Fix sonames
- Don't package the empty directory %%_defaultdocdir/zzub

* Fri Feb 27 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com>  0.2.6-2
- BR: rtaudio-static instead of rtaudio-devel

* Fri Feb 27 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com>  0.2.6-1
- name changed from libzzub to armstrong
- update to 0.2.6

* Wed Jan  7 2009 Caolán McNamara <caolanm at redhat.com> - 0.2.3-14
- defuzz patches and extend buildfix to get building again

* Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.2.3-13
- Rebuild for Python 2.6

* Sun Mar  2 2008 Alexander Kahl <akahl at iconmobile.com> - 0.2.3-12
- patch for missing explicit gcc 4.3 includes
- pyzzub %%files also seizes the python egg now

* Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.2.3-11
- Autorebuild for GCC 4.3

* Tue Nov 20 2007 Alexander Kahl <akahl at iconmobile.com> - 0.2.3-10
- updated buildfix patch to drop explicit sse optimizations
- removed JOBS option again since scons supports -j build option

* Thu Oct 25 2007 Alexander Kahl <akahl at iconmobile.com> - 0.2.3-9
- fixed multiarch conflict

* Thu Sep 20 2007 Alexander Kahl <akahl at iconmobile.com> - 0.2.3-8
- included patch to install missing documentation to the right place
- removed move macro instead
- moved all plugin files *.{cpp,h,xml} back to get the lunar plugin loading right

* Mon Sep 17 2007 Alexander Kahl <akahl at iconmobile.com> - 0.2.3-7
- re-added pyzzub python-devel build requirement
- explicitly nailed the name of pyzzub

* Mon Sep 17 2007 Alexander Kahl <akahl at iconmobile.com> - 0.2.3-6
- added pyzzub as an internal extra package

* Thu Sep 13 2007 Alexander Kahl <akahl at iconmobile.com> - 0.2.3-5
- removed redundant explicit flac requirement

* Mon Sep 10 2007 Alexander Kahl <akahl at iconmobile.com> - 0.2.3-4
- fixed double source definition
- adapted modified source tarball w/ mp3 support removed
- added patch to use internal flac support
- removed INSTALL from %%doc
- removed explicit python requirement
- replaced static rm commands with macros

* Mon Sep 10 2007 Alexander Kahl <akahl at iconmobile.com> - 0.2.3-3
- fixed redundant dependencies
- replaced occurence of /usr with prefix macro
- removed manual stripping of binaries
- fixed directory ownership issue
- fixed encoding of CREDITS file
- excluded arch ppc64 due to build failure
- replaced all space occurences with tabs

* Mon Sep  3 2007 Alexander Kahl <akahl at iconmobile.com> - 0.2.3-2
- added flag to remove mp3 support

* Sun Sep  2 2007 Alexander Kahl <akahl at iconmobile.com> - 0.2.3-1
- initial release


armstrong-buildfix.patch:

--- NEW FILE armstrong-buildfix.patch ---
--- armstrong.old/SConstruct	2009-01-09 16:17:44.000000000 -0500
+++ armstrong/SConstruct	2009-02-26 19:54:31.000000000 -0500
@@ -89,6 +89,7 @@ opts.Add("JOBS", "Number of threads to c
 opts.Add("PYZZUB", "Support pyzzub",True,None,bool_converter)
 opts.Add(EnumOption('MSVS_VERSION', 'MS Visual C++ version', None,
     allowed_values=('7.1', '8.0', '9.0')))
+opts.Add("optflags",'Default: none',"")
 
 env = Environment(ENV = os.environ, options = opts)
 
@@ -130,9 +131,7 @@ SetOption('num_jobs', env['JOBS'].replac
 if posix:
 	env.Append(CCFLAGS=[
 		'-DPOSIX',
-	])
-	env.Append(LINKFLAGS=[
-		'--rpath%s' % str(env.Dir('${PREFIX}${LIBDIR}')),
+		'-fPIC',
 	])
 	if os.uname()[0] == 'FreeBSD':
 		env.Append(CCFLAGS=[ '-I/usr/local/include' ])
@@ -173,38 +172,15 @@ cl = env['CC'] == 'cl'
 if gcc:
 	#env['CXXFLAGS'] += ['--no-rtti']
 	if env['DEBUG'] == False:
-		env.Append(CCFLAGS=[
-			'-O1', # O2 O3 break infector and a few others
-			'-fomit-frame-pointer',
-			'-funroll-loops',
-			'-DNDEBUG',
-		])
 		env.Append(CCFLAGS=ARGUMENTS.get('CCFLAGS')) 
+		env.Append(CCFLAGS=['-DNDEBUG'])
 	else:
 		env.Append(CCFLAGS=[
 			'-g',
 			'-DDEBUG',
 			'-D_DEBUG',
 		])
-	if env['SSE2'] == True:
-		if not x86_64:
-			env.Append(CCFLAGS=[
-				'-march=i686', 
-			])
-		env.Append(CCFLAGS=[
-			'-mfpmath=sse',
-			'-msse2',
-		])
-	elif env['SSE'] == True:
-		if not x86_64:
-			env.Append(CCFLAGS=[
-				'-march=i686',
-			])
-		env.Append(CCFLAGS=[
-			'-mfpmath=sse',
-			'-msse',
-		])
-
+
 if cl:
 	env.Append(CCFLAGS=[
 		'-nologo',
@@ -219,6 +195,13 @@ if cl:
 		env.Append(CCFLAGS=['-MT', '-O2' ])
 	else:
 		env.Append(CCFLAGS=['-MTd', '-Zi' ])
+
+for flag in env["optflags"].split(" "):
+    	 env.Append(CCFLAGS=flag)
+
+for flag in env["optflags"].split(" "):
+    	 env.Append(LINKFLAGS=flag)
+
 
 ######################################
 # 64-bit fixes
@@ -393,10 +376,8 @@ if env['LUNARTARGET'] == '':
 	env['CONFIGURED'] = ''
 
 def is_cleaning():
-	import SCons.Script.Main 
-	try: return SCons.Script.Main.GetOption('clean')
-	except: return SCons.Script.Main.options.clean
-
+	return False	
+
 if (not is_cleaning()) and ('configure' in COMMAND_LINE_TARGETS):
 	import os
 	
@@ -679,7 +660,7 @@ env.Signature(target='include/zzub/signa
 
 env.SConscript('${LIBZZUB_SRC_PATH}/SConscript')
 env.SConscript('${PLUGINS_SRC_PATH}/SConscript')
-env.SConscript('${CCMPLAYER_SRC_PATH}/SConscript')
+#env.SConscript('${CCMPLAYER_SRC_PATH}/SConscript')
 env.SConscript('${BMPCCM_SRC_PATH}/SConscript')
 env.SConscript('${PYZZUB_SRC_PATH}/SConscript')
 

armstrong-gcc44.patch:

--- NEW FILE armstrong-gcc44.patch ---
diff -rupN armstrong.old/src/libzzub/archive.h armstrong/src/libzzub/archive.h
--- armstrong.old/src/libzzub/archive.h	2009-01-09 16:17:44.000000000 -0500
+++ armstrong/src/libzzub/archive.h	2009-02-26 17:25:03.000000000 -0500
@@ -18,7 +18,7 @@ Foundation, Inc., 51 Franklin Street, Fi
 */
 
 #pragma once
-
+#include <cstdio>
 #include <vector>
 #include <list>
 
diff -rupN armstrong.old/src/libzzub/bmxreader.cpp armstrong/src/libzzub/bmxreader.cpp
--- armstrong.old/src/libzzub/bmxreader.cpp	2009-02-26 17:23:25.000000000 -0500
+++ armstrong/src/libzzub/bmxreader.cpp	2009-02-26 17:24:24.000000000 -0500
@@ -15,7 +15,7 @@ You should have received a copy of the G
 License along with this library; if not, write to the Free Software
 Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
-
+#include <cstdio>
 #include "common.h"
 #include <sstream>
 #include "archive.h"
diff -rupN armstrong.old/src/libzzub/host.cpp armstrong/src/libzzub/host.cpp
--- armstrong.old/src/libzzub/host.cpp	2009-01-09 16:17:44.000000000 -0500
+++ armstrong/src/libzzub/host.cpp	2009-02-26 17:27:47.000000000 -0500
@@ -15,7 +15,7 @@ You should have received a copy of the G
 License along with this library; if not, write to the Free Software
 Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
-
+#include <cstdio>
 #include "common.h"
 
 using namespace std;
diff -rupN armstrong.old/src/libzzub/pluginloader.cpp armstrong/src/libzzub/pluginloader.cpp
--- armstrong.old/src/libzzub/pluginloader.cpp	2009-01-09 16:17:44.000000000 -0500
+++ armstrong/src/libzzub/pluginloader.cpp	2009-02-26 17:30:48.000000000 -0500
@@ -16,7 +16,7 @@ You should have received a copy of the G
 License along with this library; if not, write to the Free Software
 Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
-
+#include <cstdio>
 #include <string>
 #include <algorithm>
 #include "common.h"
diff -rupN armstrong.old/src/libzzub/tools.cpp armstrong/src/libzzub/tools.cpp
--- armstrong.old/src/libzzub/tools.cpp	2009-01-09 16:17:44.000000000 -0500
+++ armstrong/src/libzzub/tools.cpp	2009-02-26 17:33:27.000000000 -0500
@@ -15,7 +15,7 @@ You should have received a copy of the G
 License along with this library; if not, write to the Free Software
 Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
-
+#include <cstdio>
 #include <string>
 
 #if defined(POSIX)
diff -rupN armstrong.old/src/plugins/bigyo_frequencyshifter/Bigyo_FrequencyShifter.cpp armstrong/src/plugins/bigyo_frequencyshifter/Bigyo_FrequencyShifter.cpp
--- armstrong.old/src/plugins/bigyo_frequencyshifter/Bigyo_FrequencyShifter.cpp	2009-01-09 16:17:45.000000000 -0500
+++ armstrong/src/plugins/bigyo_frequencyshifter/Bigyo_FrequencyShifter.cpp	2009-02-26 17:45:09.000000000 -0500
@@ -16,6 +16,7 @@ License along with this library; if not,
 Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
 #define _USE_MATH_DEFINES
+#include <cstdio>
 #include <math.h>
 #include <float.h>
 #include <zzub/signature.h>
diff -rupN armstrong.old/src/plugins/btdsys_ringmod/ringmod.cpp armstrong/src/plugins/btdsys_ringmod/ringmod.cpp
--- armstrong.old/src/plugins/btdsys_ringmod/ringmod.cpp	2009-01-09 16:17:45.000000000 -0500
+++ armstrong/src/plugins/btdsys_ringmod/ringmod.cpp	2009-02-26 17:47:29.000000000 -0500
@@ -27,7 +27,7 @@ ANY THEORY OF LIABILITY, WHETHER IN CONT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-
+#include <cstdio>
 #include <zzub/signature.h>
 #include <zzub/plugin.h>
 
diff -rupN armstrong.old/src/plugins/CyanPhase_DTMF-1/CyanPhase_DTMF-1.cpp armstrong/src/plugins/CyanPhase_DTMF-1/CyanPhase_DTMF-1.cpp
--- armstrong.old/src/plugins/CyanPhase_DTMF-1/CyanPhase_DTMF-1.cpp	2009-01-09 16:17:45.000000000 -0500
+++ armstrong/src/plugins/CyanPhase_DTMF-1/CyanPhase_DTMF-1.cpp	2009-02-26 17:39:51.000000000 -0500
@@ -4,7 +4,7 @@
 // CyanPhase DTMF-1
 // Copyright 2000 CyanPhase aka Edward L. Blake
 // Enjoy
-
+#include <cstdio>
 #include <zzub/signature.h>
 #include <zzub/plugin.h>
 
diff -rupN armstrong.old/src/plugins/Intoxicat_ACloud/Cloud.cpp armstrong/src/plugins/Intoxicat_ACloud/Cloud.cpp
--- armstrong.old/src/plugins/Intoxicat_ACloud/Cloud.cpp	2009-01-09 16:17:45.000000000 -0500
+++ armstrong/src/plugins/Intoxicat_ACloud/Cloud.cpp	2009-02-26 17:42:22.000000000 -0500
@@ -1,6 +1,6 @@
 #include <zzub/signature.h>
 #include <zzub/plugin.h>
-
+#include <cstdio>
 #include <stdlib.h>
 #include <math.h>
 #include <string.h>
diff -rupN armstrong.old/src/plugins/jmmcd_Crossfade/crossfade.cpp armstrong/src/plugins/jmmcd_Crossfade/crossfade.cpp
--- armstrong.old/src/plugins/jmmcd_Crossfade/crossfade.cpp	2009-01-09 16:17:45.000000000 -0500
+++ armstrong/src/plugins/jmmcd_Crossfade/crossfade.cpp	2009-02-26 17:51:20.000000000 -0500
@@ -4,7 +4,7 @@
 
 // Lots of code from BTDSys RingMod -- thanks!
 
-
+#include <cstdio>
 #include <zzub/signature.h>
 #include <zzub/plugin.h>
 //#include "../buzz2zzub/mdk.h"
diff -rupN armstrong.old/src/plugins/jmmcd_Note_Pool/jmmcd_Note_Pool.cpp armstrong/src/plugins/jmmcd_Note_Pool/jmmcd_Note_Pool.cpp
--- armstrong.old/src/plugins/jmmcd_Note_Pool/jmmcd_Note_Pool.cpp	2009-01-09 16:17:45.000000000 -0500
+++ armstrong/src/plugins/jmmcd_Note_Pool/jmmcd_Note_Pool.cpp	2009-02-26 17:52:03.000000000 -0500
@@ -6,7 +6,7 @@
 
 // thanks to btdsys, 7900, and usr for answering questions, but especially btdsys
 // for making peerlib, without which this wouldn't be possible.
-
+#include <cstdio>
 #define MACHINE_NAME "Peer Note-Pool"
 #define AUTHOR "jmmcd"
 #define FULL_NAME AUTHOR " " MACHINE_NAME
diff -rupN armstrong.old/src/plugins/ladspadapter/ladspadapter.cpp armstrong/src/plugins/ladspadapter/ladspadapter.cpp
--- armstrong.old/src/plugins/ladspadapter/ladspadapter.cpp	2009-01-09 16:17:45.000000000 -0500
+++ armstrong/src/plugins/ladspadapter/ladspadapter.cpp	2009-02-26 17:55:34.000000000 -0500
@@ -17,7 +17,7 @@
 
 
 // ladspadapter allows running LADSPA plugins as zzub plugins
-
+#include <cstdio>
 #include <ladspa.h>
 #include <zzub/signature.h>
 #include 	"zzub/plugin.h"
diff -rupN armstrong.old/src/plugins/ladspadapter/paramtools.h armstrong/src/plugins/ladspadapter/paramtools.h
--- armstrong.old/src/plugins/ladspadapter/paramtools.h	2009-01-09 16:17:45.000000000 -0500
+++ armstrong/src/plugins/ladspadapter/paramtools.h	2009-02-26 17:54:52.000000000 -0500
@@ -17,7 +17,7 @@
 
 #if !defined(__LADSPA_PARAMTOOLS_H__)
 #define __LADSPA_PARAMTOOLS_H__
-
+#include <cstdio>
 #include <math.h>
 #include <algorithm>
 
diff -rupN armstrong.old/src/plugins/lunar/pugxml.h armstrong/src/plugins/lunar/pugxml.h
--- armstrong.old/src/plugins/lunar/pugxml.h	2009-01-09 16:17:45.000000000 -0500
+++ armstrong/src/plugins/lunar/pugxml.h	2009-02-26 18:00:33.000000000 -0500
@@ -24,7 +24,7 @@
 #	endif
 #endif
 
-
+#include <cstdio>
 #define TCHAR char
 #define _T(x) x
 
diff -rupN armstrong.old/src/plugins/zzub_miditracker/miditracker.cpp armstrong/src/plugins/zzub_miditracker/miditracker.cpp
--- armstrong.old/src/plugins/zzub_miditracker/miditracker.cpp	2009-01-09 16:17:45.000000000 -0500
+++ armstrong/src/plugins/zzub_miditracker/miditracker.cpp	2009-02-26 18:03:39.000000000 -0500
@@ -7,7 +7,7 @@
 #include <zzub/signature.h>
 #include <zzub/plugin.h>
 #include "miditracker.h"
-
+#include <cstdio>
 using namespace std;
 
 namespace miditracker {

armstrong-size_t.patch:

--- NEW FILE armstrong-size_t.patch ---
diff -rupN armstrong.old/src/libzzub/ccm.cpp armstrong/src/libzzub/ccm.cpp
--- armstrong.old/src/libzzub/ccm.cpp	2009-01-09 16:17:44.000000000 -0500
+++ armstrong/src/libzzub/ccm.cpp	2009-03-04 11:09:35.000000000 -0500
@@ -378,7 +378,7 @@ std::string paramtype_to_string(int para
 
 std::string id_from_ptr(const void *p) {
 	char id[64];
-	sprintf(id, "%x", p);
+	sprintf(id, "%p", p);
 	return id;
 }
 
diff -rupN armstrong.old/src/plugins/btdsys_ringmod/ringmod.cpp armstrong/src/plugins/btdsys_ringmod/ringmod.cpp
--- armstrong.old/src/plugins/btdsys_ringmod/ringmod.cpp	2009-01-09 16:17:45.000000000 -0500
+++ armstrong/src/plugins/btdsys_ringmod/ringmod.cpp	2009-03-04 11:09:35.000000000 -0500
@@ -324,7 +324,7 @@ void ringmod::command(const int i)
 		"BTDSys RingMod v1.0\n"
 		"©2002 Ed Powley (BTDSys)\n\n"
 		"Comments/suggestions/bug reports to e at btd2001.freeserve.co.uk\n\n");
-	sprintf(txt,"%s%i inputs", txt, Inputs.size());
+	sprintf(txt,"%s%zi inputs", txt, Inputs.size());
 	for (int j=0; j<Inputs.size(); j++)
 		sprintf(txt, "%s\n%i: %s", txt, j, Inputs[j].MacName);
 	sprintf(txt, "%s\n", txt);
diff -rupN armstrong.old/src/plugins/jmmcd_Crossfade/crossfade.cpp armstrong/src/plugins/jmmcd_Crossfade/crossfade.cpp
--- armstrong.old/src/plugins/jmmcd_Crossfade/crossfade.cpp	2009-01-09 16:17:45.000000000 -0500
+++ armstrong/src/plugins/jmmcd_Crossfade/crossfade.cpp	2009-03-04 11:09:35.000000000 -0500
@@ -277,7 +277,7 @@ void crossfade::command(const int i)
 	       "The even-numbered inputs are mixed; the odd-numbered inputs are mixed;\n"
 	       "then the two groups are crossfaded together according to the parameter.\n"
 	       "Comments/suggestions/bug reports to jamesmichaelmcdermott at gmail.com\n\n");
-	sprintf(txt,"%s%i inputs", txt, Inputs.size());
+	sprintf(txt,"%s%zi inputs", txt, Inputs.size());
 	for (int j=0; j<Inputs.size(); j++)
 		sprintf(txt, "%s\n%i: %s", txt, j, Inputs[j].MacName);
 	sprintf(txt, "%s\n", txt);
diff -rupN armstrong.old/src/plugins/ladspadapter/ladspadapter.cpp armstrong/src/plugins/ladspadapter/ladspadapter.cpp
--- armstrong.old/src/plugins/ladspadapter/ladspadapter.cpp	2009-01-09 16:17:45.000000000 -0500
+++ armstrong/src/plugins/ladspadapter/ladspadapter.cpp	2009-03-04 11:09:35.000000000 -0500
@@ -350,7 +350,7 @@ struct ladspaplugincollection : zzub::pl
 		{
 			factory->register_info(infos[i]);
 		}	
-		printf("ladspadapter: enumerated %i plugin(s).\n", infos.size());
+		printf("ladspadapter: enumerated %zi plugin(s).\n", infos.size());
 	}
 	
 	// Called by the host upon song loading. If the collection
diff -rupN armstrong.old/src/plugins/lunar/include/lunar/fx.h armstrong/src/plugins/lunar/include/lunar/fx.h
--- armstrong.old/src/plugins/lunar/include/lunar/fx.h	2009-01-09 16:17:45.000000000 -0500
+++ armstrong/src/plugins/lunar/include/lunar/fx.h	2009-03-04 11:10:37.000000000 -0500
@@ -12,7 +12,7 @@ extern "C" {
 // at build time stating the platform,
 // catch it here with an ifdef and have different 
 // typedefs per platform.
-#if defined(__X86_64__) || defined(CONFIG_X86_64) || defined(__APPLE__)
+#if defined(__X86_64__) || defined(CONFIG_X86_64) || defined(__APPLE__) || defined(__powerpc64__)
 typedef long unsigned int lunar_size_t;
 #else
 typedef unsigned int lunar_size_t;

armstrong-sonamefix.patch:

--- NEW FILE armstrong-sonamefix.patch ---
diff -rupN armstrong.old/src/libzzub/SConscript armstrong/src/libzzub/SConscript
--- armstrong.old/src/libzzub/SConscript	2009-02-26 23:27:36.000000000 -0500
+++ armstrong/src/libzzub/SConscript	2009-02-26 23:25:18.000000000 -0500
@@ -151,6 +151,10 @@ if posix:
 			localenv.Append(LIBS=[ 'asound', ])
 			localenv.Append(CCFLAGS=[ '-DPMALSA', ])
 
+	localenv.Append(LINKFLAGS=[
+		'-Wl,-soname,libzzub.so.0'
+		])
+
 elif win32:
 	if cl:
 		localenv.Append(LIBS=[
diff -rupN armstrong.old/src/plugins/lunar/SConscript armstrong/src/plugins/lunar/SConscript
--- armstrong.old/src/plugins/lunar/SConscript	2009-02-26 23:29:42.000000000 -0500
+++ armstrong/src/plugins/lunar/SConscript	2009-02-26 23:25:18.000000000 -0500
@@ -28,13 +28,21 @@ import os
 
 if pluginenv["LUNAR"] == True:
 	lunarstdenv = env.Copy()
+	shlibsuffix =  lunarstdenv['SHLIBSUFFIX'] 
+	lunarstdenv['SHLIBSUFFIX'] += '.0'
+	lunarstdenv.Append(LINKFLAGS=[
+		'-Wl,-soname,liblunarstd.so.0'
+	])
 	lunarstdfiles = [
 		'lunarstd.cpp',
 	]
 	if win32:
 		lunarstdfiles.append('lunarstd.def')
 	lunarstd = lunarstdenv.SharedLibrary('${LIB_BUILD_PATH}/lunarstd', lunarstdfiles)[0]
-	install_lib(lunarstd)
+	installed_lunarstd = install_lib(lunarstd)
+	symlinkcmd = 'cd $TARGET.dir && rm -f $TARGET.name && ln -s $SOURCE.name $TARGET.name'
+	lunarstdenv.Command('${LIB_BUILD_PATH}/liblunarstd'+shlibsuffix, lunarstd, symlinkcmd)
+	lunarstdenv.Command('${DESTDIR}${PREFIX}${LIBDIR}/liblunarstd'+shlibsuffix, installed_lunarstd, symlinkcmd)
 
 	pluginenv.Append(LIBS=[
 		'lunarstd'

armstrong-use-system-libs.patch:

--- NEW FILE armstrong-use-system-libs.patch ---
diff -rupN armstrong.old/src/libzzub/ccm.cpp armstrong/src/libzzub/ccm.cpp
--- armstrong.old/src/libzzub/ccm.cpp	2009-01-09 16:17:44.000000000 -0500
+++ armstrong/src/libzzub/ccm.cpp	2009-02-26 23:33:28.000000000 -0500
@@ -21,8 +21,8 @@ Foundation, Inc., 51 Franklin Street, Fi
 #include <algorithm>
 #include <iostream>
 #include <sstream>
-#include "../minizip/unzip.h"
-#include "../minizip/zip.h"
+#include <unzip.h>
+#include <zip.h>
 #include "FLAC/all.h"
 
 #include "ccm.h"
@@ -1049,7 +1049,7 @@ bool CcmWriter::save(std::string fileNam
 }
 
 
-static FLAC__StreamEncoderWriteStatus flac_stream_encoder_write_callback(const FLAC__StreamEncoder *encoder, const FLAC__byte buffer[], unsigned bytes, unsigned samples, unsigned current_frame, void *client_data) {
+static FLAC__StreamEncoderWriteStatus flac_stream_encoder_write_callback(const FLAC__StreamEncoder *encoder, const FLAC__byte buffer[], size_t bytes, unsigned samples, unsigned current_frame, void *client_data) {
 	zzub::outstream* writer=(zzub::outstream*)client_data;
 
     writer->write((void*)buffer, sizeof(FLAC__byte)*bytes);
@@ -1086,7 +1086,7 @@ struct DecoderInfo {
 // buffer can hold. The callback may choose to supply less data and modify the byte count
 // but must be careful not to overflow the buffer. The callback then returns a status code
 // chosen from FLAC__StreamDecoderReadStatus.
-static FLAC__StreamDecoderReadStatus flac_stream_decoder_read_callback(const FLAC__StreamDecoder *decoder, FLAC__byte buffer[], unsigned *bytes, void *client_data) {
+static FLAC__StreamDecoderReadStatus flac_stream_decoder_read_callback(const FLAC__StreamDecoder *decoder, FLAC__byte buffer[], size_t *bytes, void *client_data) {
 	DecoderInfo* info = (DecoderInfo*)client_data;
 
 	if (info->reader->position() >= info->reader->size()-1) return FLAC__STREAM_DECODER_READ_STATUS_END_OF_STREAM;
@@ -1139,19 +1139,20 @@ void flac_stream_decoder_error_callback(
 void decodeFLAC(zzub::instream* reader, zzub::player& player, int wave, int level) {
 
     FLAC__StreamDecoder* stream=FLAC__stream_decoder_new();
-    FLAC__stream_decoder_set_read_callback(stream, flac_stream_decoder_read_callback);
-    FLAC__stream_decoder_set_write_callback(stream, flac_stream_decoder_write_callback);
-    FLAC__stream_decoder_set_metadata_callback(stream, flac_stream_decoder_metadata_callback);
-    FLAC__stream_decoder_set_error_callback(stream, flac_stream_decoder_error_callback);
 
     DecoderInfo decoder_info;
     decoder_info.reader = reader;
-    FLAC__stream_decoder_set_client_data(stream, &decoder_info);
 
     // we're not intersted in meitadeita
     FLAC__stream_decoder_set_metadata_ignore_all(stream);
 
-    FLAC__stream_decoder_init(stream);
+    FLAC__stream_decoder_init_stream(stream,
+          flac_stream_decoder_read_callback,
+          NULL, NULL, NULL, NULL,
+          flac_stream_decoder_write_callback,
+          flac_stream_decoder_metadata_callback,
+          flac_stream_decoder_error_callback,
+          &decoder_info);
 //    FLAC__stream_decoder_process_single(stream);
     FLAC__stream_decoder_process_until_end_of_stream(stream);
     
@@ -1216,11 +1217,12 @@ bool encodeFLAC(zzub::outstream* writer,
 	FLAC__stream_encoder_set_bits_per_sample(stream, bps);
 	FLAC__stream_encoder_set_sample_rate(stream, sample_rate);
 	FLAC__stream_encoder_set_total_samples_estimate(stream, num_samples);
-	FLAC__stream_encoder_set_write_callback(stream, flac_stream_encoder_write_callback);
-	FLAC__stream_encoder_set_metadata_callback(stream, flac_stream_encoder_metadata_callback);
-	FLAC__stream_encoder_set_client_data(stream, writer);
+	int result = FLAC__stream_encoder_init_stream(stream,
+                                                      flac_stream_encoder_write_callback,
+				                      NULL,
+				                      NULL,
+				                      flac_stream_encoder_metadata_callback, writer);
 
-	int result = FLAC__stream_encoder_init(stream);
 	// if this fails, we want it to crash hard - or else will cause dataloss
 	assert(result == FLAC__STREAM_ENCODER_OK);
 
diff -rupN armstrong.old/src/libzzub/ccm.h armstrong/src/libzzub/ccm.h
--- armstrong.old/src/libzzub/ccm.h	2009-01-09 16:17:44.000000000 -0500
+++ armstrong/src/libzzub/ccm.h	2009-02-26 23:33:28.000000000 -0500
@@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fi
 
 #pragma once
 
-#include "../minizip/unzip.h"
-#include "../minizip/zip.h"
+#include <unzip.h>
+#include <zip.h>
 
 #include "pugixml.hpp"
 
diff -rupN armstrong.old/src/libzzub/SConscript armstrong/src/libzzub/SConscript
--- armstrong.old/src/libzzub/SConscript	2009-01-09 16:17:44.000000000 -0500
+++ armstrong/src/libzzub/SConscript	2009-02-26 23:34:07.000000000 -0500
@@ -57,24 +57,15 @@ files = [
 	'thread_id.cpp',
 ]
 
-# we build from our private flac,
-# since some are using 1.1.3, and that
-# one breaks a few things.
+# use internal flac support
+localenv.ParseConfig('pkg-config --libs flac')
+
+# minizip, zlib and flac dependencies
+localenv.ParseConfig('pkg-config --libs minizip')
 localenv.Append(CPPPATH=[
-	"${ROOTPATH}/src/flac/include"
+        '${PREFIX}/include/minizip'
 ])
-localenv.Append(CCFLAGS=[
-	'-DFLAC__NO_DLL',
-])
-env.SConscript("${ROOTPATH}/src/flac/src/libFLAC/SConscript")
 
-# minizip, zlib and flac dependencies
-files += [
-	'${MINIZIP_SRC_PATH}/ioapi.c',
-	'${MINIZIP_SRC_PATH}/mztools.c',
-	'${MINIZIP_SRC_PATH}/unzip.c',
-	'${MINIZIP_SRC_PATH}/zip.c',
-]
 if win32:
 	# build from our private zlib
 	localenv.Append(CPPPATH=["${ROOTPATH}/src/zlib"])
@@ -90,8 +81,10 @@ if mac:
 	])
 
 localenv.Append(LIBS=[
-	'FLAC',
 	'z',
+	'c',
+	'portmidi',
+	'porttime',
 ])
 
 localenv.Append(CCFLAGS=['-D_LIB','-D_LIBZZUB'])
@@ -126,19 +119,7 @@ if localenv['SNDFILE']:
 	])
 
 if localenv['RUBBERBAND']:
-	localenv.SConscript('../rubberband/SConscript')
-	localenv.Append(LIBS=[
-		'rubberband_static',
-		'fftw3',
-		'samplerate',
-		'fftw3f',
-	])
-	localenv.Append(CPPPATH=[
-		'../rubberband',
-	])
-	localenv.Append(CCFLAGS=[
-		'-DUSE_RUBBERBAND',
-	])
+	localenv.ParseConfig('pkg-config --libs rubberband')
 
 if localenv['BUZZ2ZZUB'] == True:
 	localenv.Append(CCFLAGS=[
@@ -146,25 +127,11 @@ if localenv['BUZZ2ZZUB'] == True:
 	])
 
 # portmidi support
-localenv.Append(CPPPATH=[
-	'${PORTMIDI_SRC_PATH}/pm_common',
-	'${PORTMIDI_SRC_PATH}/porttime'
-])
 
 if posix:
 	# porttime and portmidi
-	files += [
-			'${PORTMIDI_SRC_PATH}/porttime/porttime.c',
-			'${PORTMIDI_SRC_PATH}/pm_common/pmutil.c',
-			'${PORTMIDI_SRC_PATH}/pm_common/portmidi.c',
-	]
-
+	
 	if localenv['COREAUDIO'] == True:
-		files += [
-			'${PORTMIDI_SRC_PATH}/pm_mac/pmmac.c', 
-			'${PORTMIDI_SRC_PATH}/pm_mac/pmmacosxcm.c',
-			'${PORTMIDI_SRC_PATH}/porttime/ptmacosx_cf.c',
-		]
 		localenv.Append(LINKFLAGS=[
 			'-framework', 'CoreMIDI',
 			'-framework', 'CoreFoundation',
@@ -175,16 +142,12 @@ if posix:
 			'-DNEWBUFFER'
 		])
 	else:
-		files += [
-			'${PORTMIDI_SRC_PATH}/porttime/ptlinux.c',
-			'${PORTMIDI_SRC_PATH}/pm_linux/pmlinux.c',
-		]
 		localenv.Append(CCFLAGS=[
 			'-DPM_CHECK_ERRORS',
 			'-DNEWBUFFER'
 		])
 		if localenv["ALSA"] == True:
-			files += [ '${PORTMIDI_SRC_PATH}/pm_linux/pmlinuxalsa.c' ]
+			#files += [ '${PORTMIDI_SRC_PATH}/pm_linux/pmlinuxalsa.c' ]
 			localenv.Append(LIBS=[ 'asound', ])
 			localenv.Append(CCFLAGS=[ '-DPMALSA', ])
 
@@ -326,26 +289,14 @@ if localenv['AUDIOENGINE'] == 'rtaudio':
 		'-DUSE_RTAUDIO',
 	])
 
-	localenv.SConscript('../rtaudio/SConscript')
 	localenv.Append(LIBS=[
-		'rtaudio_static',
+		'rtaudio',
 	])
+
 	localenv.Append(CPPPATH=[
-		'../rtaudio',
+		'${PREFIX}/include',
 	])
 
-	if env['MP3'] == True:
-		localenv.SConscript('../libmad/SConscript')
-		localenv.Append(LIBS=[
-			'libmad_static',
-		])
-		localenv.Append(CPPPATH=[
-			'../libmad',
-		])
-		localenv.Append(CCFLAGS=[
-			'-DUSE_LIBMAD',
-		])
-
 	if win32:
 		localenv.Append(CCFLAGS=[
 			'-D__WINDOWS_ASIO__',
@@ -373,6 +324,7 @@ if localenv['AUDIOENGINE'] == 'rtaudio':
 		localenv.Append(LIBS=[
 			'pthread',
 			'm',
+			'rtaudio',
 		])
 
 #######################################
diff -rupN armstrong.old/src/plugins/lunar/SConscript armstrong/src/plugins/lunar/SConscript
--- armstrong.old/src/plugins/lunar/SConscript	2009-01-09 16:17:45.000000000 -0500
+++ armstrong/src/plugins/lunar/SConscript	2009-02-26 23:35:01.000000000 -0500
@@ -57,8 +57,8 @@ if pluginenv["LUNAR"] == True:
 			pluginenv['LIB_COMPAT'],
 		])
 	pluginenv.Append(CCFLAGS=[
-		'-DZZUB_SHARE_DIR_PATH="\\"%s\\""' % str(pluginenv.Dir("${DESTDIR}${PREFIX}/share/zzub")),
-		'-DZZUB_LIB_DIR_PATH="\\"%s\\""' % str(pluginenv.Dir("${DESTDIR}${PREFIX}${LIBDIR}/zzub")),
+		'-DZZUB_SHARE_DIR_PATH="\\"%s\\""' % str(pluginenv.Dir("${PREFIX}/share/zzub")),
+		'-DZZUB_LIB_DIR_PATH="\\"%s\\""' % str(pluginenv.Dir("${PREFIX}${LIBDIR}/zzub")),
 		'-DSHLIBSUFFIX="\\"%s\\""' % pluginenv['SHLIBSUFFIX'],
 		'-DUSE_LUNAR',
 	])
diff -rupN armstrong.old/src/plugins/zzub_stream/SConscript armstrong/src/plugins/zzub_stream/SConscript
--- armstrong.old/src/plugins/zzub_stream/SConscript	2009-02-25 00:50:05.000000000 -0500
+++ armstrong/src/plugins/zzub_stream/SConscript	2009-02-26 23:33:28.000000000 -0500
@@ -22,8 +22,8 @@ Import('pluginenv', 'build_plugin', 'win
 
 if pluginenv['ZZUB_STREAM']:
 	# make sure libmad.lib is in 
-	pluginenv.Append(LIBS = [ "libmad_static", "sndfile" ] );
-	pluginenv.Append(CPPPATH = [ "../../libmad", "resampler" ] );
+	pluginenv.Append(LIBS = [ "sndfile" ] );
+	pluginenv.Append(CPPPATH = [ "${PREFIX}/include", "resampler" ] );
 
 	build_plugin(pluginenv, 'zzub_stream', files=[
 			'main.cpp',


--- NEW FILE armstrong.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           armstrong
Version:        0.2.6
Release:        4%{?dist}
Summary:        Powerful music sequencing library
Group:          System Environment/Libraries
# src/plugins/Geonik is GPL+
# src/plugins/fft is BSD
# src/plugins/btdsys_ringmod is BSD
# src/plugins/firesledge_parameq is LGPLv2+
# src/plugins/zzub_stream/resampler is LGPLv2+
# src/plugins/bigyo_frequencyshifter is LGPLv2+
# src/plugins/buzz2zzub is LGPLv2+ and GPLv2+
# src/plugins/graue_softsat is Public Domain
# src/plugins/zzub_stream is LGPLv2+
# The core part of the library is LGPLv2+
# The rest is GPL+ or GPLv2+
License:        GPLv2+ and GPL+ and BSD and LGPLv2+
URL:            http://code.google.com/p/armstrong/
# The original source tarball
#    http://armstrong.googlecode.com/files/armstrong-0.2.6.tar.gz
# contains libmad, which is a MP3 decoder/encoder, that cannot be 
# included in Fedora because it is patent encumbered. We remove 
#    src/libmad
#    src/plugins/zzub_stream/stream_mp3.*
# from the tarball and remove the MP3 related bits from
#    src/libzzub/import.h
#    src/libzzub/player.cpp
#    src/plugins/zzub_stream/main.h
#    src/plugins/zzub_stream/SConscript
# and we also remove a directory that has some proprietary code
#    src/rtaudio/include
# to produce the following file:
Source0:        %{name}-%{version}-fe.tar.gz
# Fix build issues (optflags, drop sse optimizations). Also
# disable compilation of ccmplayer, which is not ready for
# this release
# Since these (except the last one) are Fedora-specific, and ccmplayer 
# non-compilation is very obivous, they are not sent upstream.
Patch0:         armstrong-buildfix.patch
# armstrong comes with bunch of libraries built in statically
# we modify the sources to link to system libraries
# http://bitbucket.org/paniq/armstrong/issue/6/link-armstrong-to-internal-libraries
Patch1:         armstrong-use-system-libs.patch
# Fix gcc-4.4 issues
# http://bitbucket.org/paniq/armstrong/issue/7/build-with-gcc-44
Patch2:         armstrong-gcc44.patch
# Fix size_t issues for 64bit systems and maybe others
# http://bitbucket.org/paniq/armstrong/issue/8/size_t-issue
Patch3:         armstrong-size_t.patch
# Build shared libraries with proper sonames
# http://bitbucket.org/paniq/armstrong/issue/9/build-libraries-with-sonames
Patch4:         armstrong-sonamefix.patch

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  alsa-lib-devel boost-devel doxygen epydoc fftw-devel flac-devel
BuildRequires:  jack-audio-connection-kit-devel libsamplerate-devel libsndfile-devel 
BuildRequires:  minizip-devel portaudio-devel portmidi-devel python-setuptools-devel
BuildRequires:  rtaudio-static rubberband-devel scons zlib-devel

Obsoletes:      libzzub <= 0.2.5
Provides:       libzzub = %{version}-%{release}

%description
If you are searching for a foundation for your next soundtracker, armstrong is
what you want. armstrong provides an extensible DSP plugin system, a wavetable, 
instruments, a multitrack sequencer and support for major soundcard APIs.
armstrong includes zzub and lunar libraries.


%package        devel
Summary:        Development files for %{name}
Group:          Development/Libraries
License:        GPLv2+
Requires:       %{name} = %{version}-%{release}
Obsoletes:      libzzub-devel <= 0.2.5
Provides:       libzzub-devel = %{version}-%{release}

%description    devel
The %{name}-devel package contains libraries and header files for developing 
applications and plugins that use %{name}.


%package -n     pyzzub
Summary:        Python Bindings For libzzub
Group:          System Environment/Libraries
License:        GPLv2+
Requires:       %{name} = %{version}-%{release}

%description -n pyzzub
These are the Python bindings for armstrong, allowing you to use it from within
Python scripts.


%prep
%setup -q -n %{name}
%patch0 -p1 -b .buildfix
%patch1 -p1 -b .internallibs
%patch2 -p1 -b .gcc44
%patch3 -p1 -b .size_t
%patch4 -p1 -b .soname

# Remove the binded libraries. We'll use the system-wide ones
pushd src
    rm -fr libsndfile flac rubberband zlib bmp-ccm \
           portmidi portaudio rtaudio minizip
popd

# Remove the precompiled binaries
for ext in aps bc dll exe lib ncb zip; do
    find . -name "*.$ext" | xargs rm -f -- || :
done

# There are many source files with wrong permissions and EOL encodings. Fix these
pushd src/plugins
    for ext in cpp h hpp; do
        find . -name "*.$ext" \
               -exec chmod 0644 '{}' \; \
               -exec sed -i "s|\r||" '{}' \;
    done
popd

# Fix the encoding issues with text files
for ext in txt ini; do
    for file in $(find . -name "*.$ext"); do
        sed 's|\r||' $file > tmpfile
        iconv --from-code=ISO-8859-1 --to-code=UTF-8 tmpfile > tmpfile2
        touch -r $file tmpfile2
        mv -f tmpfile2 $file
    done
done


%build
scons configure \
        PREFIX=%{_prefix} \
        LIBDIR=/%{_lib} \
        CCFLAGS="%{optflags}" \
        CXXFLAGS="%{optflags}" \
        optflags="%{optflags}" \
        MP3="False"

scons %{?_smp_mflags}

# Build the documentation:
# (REMINDER: There is an incomplete docbook documentation that we might want
#            to replace with the doxygen documentation in a future release)
pushd share/doc
    ./make_pyzzub_doc
    mv pyzzub html
    doxygen libzzub.dox
    doxygen libzzub-cpp.dox
    doxygen libzzub-plugin.dox
popd


%install
rm -rf $RPM_BUILD_ROOT
scons install DESTDIR=$RPM_BUILD_ROOT 

# signature.h differs per build host, circumvent multiarch conflicts
mv $RPM_BUILD_ROOT%{_includedir}/zzub/signature.h \
%ifarch x86_64 ppc64
    $RPM_BUILD_ROOT%{_includedir}/zzub/signature-64.h
%else
    $RPM_BUILD_ROOT%{_includedir}/zzub/signature-32.h
%endif

cat > $RPM_BUILD_ROOT%{_includedir}/zzub/signature.h << EOF
#include <bits/wordsize.h>

#if __WORDSIZE == 32
#include "signature-32.h"
#elseif __WORDSIZE == 64
#include "signature-64.h"
#else
#error "Unknown word size"
#endif
EOF

# We want to install docs to the proper location:
mkdir -p installed_docs
mv $RPM_BUILD_ROOT%{_docdir}/zzub/* installed_docs/

# Collect the doc files scattered around the source tree:
cp -a CREDITS.txt ChangeLog LICENCE installed_docs/
cp -a share/zzub installed_docs/
mkdir -p installed_docs/plugins/lad2zzub
cp -a src/plugins/lad2zzub/gpl.txt installed_docs/plugins/lad2zzub/
mkdir -p installed_docs/plugins/Geonik
cp -a src/plugins/Geonik/readme.txt installed_docs/plugins/Geonik/
mkdir -p installed_docs/plugins/buzz2zzub
cp -a src/plugins/buzz2zzub/buzz2zzub.ini installed_docs/plugins/buzz2zzub
mkdir -p installed_docs/plugins/jmmcd_Note_Pool
cp -a src/plugins/jmmcd_Note_Pool/{index.html,note-pool-test.ccm} installed_docs/plugins/jmmcd_Note_Pool
mkdir -p installed_docs/plugins/Intoxicat_ACloud
cp -a src/plugins/Intoxicat_ACloud/Intoxicat\ ACloud.htm installed_docs/plugins/Intoxicat_ACloud
mkdir -p installed_docs/plugins/fft
cp -a src/plugins/fft/{test/tailscrap.m,CHANGELOG,COPYING,TIPS,README} installed_docs/plugins/fft
mkdir -p installed_docs/plugins/MadBrain_Dynamite6
cp -a src/plugins/MadBrain_Dynamite6/MadBrains_Dynamite6*.{bmx,prs} installed_docs/plugins/MadBrain_Dynamite6
mkdir -p installed_docs/plugins/CyanPhase_DTMF-1
cp -a src/plugins/CyanPhase_DTMF-1/CyanPhase_DTMF-1.{txt,bmx} installed_docs/plugins/CyanPhase_DTMF-1
cp -a src/plugins/firesledge_parameq/license.txt installed_docs/plugins/firesledge_parameq
mkdir -p installed_docs/plugins/fsm_infector/
cp -a src/plugins/fsm_infector/todo.txt installed_docs/plugins/fsm_infector/
mkdir -p installed_docs/plugins/psy2zzub
cp -a src/plugins/psy2zzub/gpl.txt installed_docs/plugins/psy2zzub
mkdir -p installed_docs/plugins/matilde_tracker
cp -a src/plugins/matilde_tracker/Matilde\ Tracker.html installed_docs/plugins/matilde_tracker
mkdir -p installed_docs/plugins/zzub_stream/resampler
cp -a src/plugins/zzub_stream/resampler/{license,readme}.txt installed_docs/plugins/zzub_stream/resampler
mkdir -p installed_docs/plugins/dssidapter
cp -a src/plugins/dssidapter/README.txt installed_docs/plugins/dssidapter
mkdir -p installed_docs/plugins/zzub_module
cp -a src/plugins/zzub_module/libmodfile/readme.txt installed_docs/plugins/zzub_module
cp -a src/plugins/green_milk/{about_te.bin,LICENSE} installed_docs/plugins/green_milk
mkdir -p installed_docs/plugins/Elenzil_Modulator
cp -a src/plugins/Elenzil_Modulator/elenziltest.bmx installed_docs/plugins/Elenzil_Modulator

# Remove the shebang from the python library
sed -i '\|^#!/usr/bin/env python|d' $RPM_BUILD_ROOT%{python_sitelib}/zzub/__init__.py

# Install the python egg properly
pushd src/pyzzub
    python -c 'import setuptools; execfile("setup.py")' install --skip-build --root $RPM_BUILD_ROOT
popd


%clean
rm -rf $RPM_BUILD_ROOT


%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%doc installed_docs/*
%{_libdir}/*.so.*
%{_libdir}/zzub
%{_libdir}/lunar

%files devel
%defattr(-,root,root,-)
%doc share/doc/zzub/api*
%{_includedir}/*
%{_libdir}/*.so

%files -n pyzzub
%defattr(-,root,root,-)
%doc src/pyzzub/testzzub.py share/doc/html
%{python_sitelib}/*

%changelog
* Thu Mar 05 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com>  0.2.6-4
- Update the size_t patch to fix compilation on ppc64
- Remove some proprietary code from the tarball (src/rtaudio/include)

* Sat Feb 28 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com>  0.2.6-3
- License for -devel and pyzzub packages is GPLv2+
- Clarify system-wide library usage
- Fix sonames
- Don't package the empty directory %%_defaultdocdir/zzub

* Fri Feb 27 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com>  0.2.6-2
- BR: rtaudio-static instead of rtaudio-devel

* Fri Feb 27 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com>  0.2.6-1
- name changed from libzzub to armstrong
- update to 0.2.6

* Wed Jan  7 2009 Caolán McNamara <caolanm at redhat.com> - 0.2.3-14
- defuzz patches and extend buildfix to get building again

* Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.2.3-13
- Rebuild for Python 2.6

* Sun Mar  2 2008 Alexander Kahl <akahl at iconmobile.com> - 0.2.3-12
- patch for missing explicit gcc 4.3 includes
- pyzzub %%files also seizes the python egg now

* Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.2.3-11
- Autorebuild for GCC 4.3

* Tue Nov 20 2007 Alexander Kahl <akahl at iconmobile.com> - 0.2.3-10
- updated buildfix patch to drop explicit sse optimizations
- removed JOBS option again since scons supports -j build option

* Thu Oct 25 2007 Alexander Kahl <akahl at iconmobile.com> - 0.2.3-9
- fixed multiarch conflict

* Thu Sep 20 2007 Alexander Kahl <akahl at iconmobile.com> - 0.2.3-8
- included patch to install missing documentation to the right place
- removed move macro instead
- moved all plugin files *.{cpp,h,xml} back to get the lunar plugin loading right

* Mon Sep 17 2007 Alexander Kahl <akahl at iconmobile.com> - 0.2.3-7
- re-added pyzzub python-devel build requirement
- explicitly nailed the name of pyzzub

* Mon Sep 17 2007 Alexander Kahl <akahl at iconmobile.com> - 0.2.3-6
- added pyzzub as an internal extra package

* Thu Sep 13 2007 Alexander Kahl <akahl at iconmobile.com> - 0.2.3-5
- removed redundant explicit flac requirement

* Mon Sep 10 2007 Alexander Kahl <akahl at iconmobile.com> - 0.2.3-4
- fixed double source definition
- adapted modified source tarball w/ mp3 support removed
- added patch to use internal flac support
- removed INSTALL from %%doc
- removed explicit python requirement
- replaced static rm commands with macros

* Mon Sep 10 2007 Alexander Kahl <akahl at iconmobile.com> - 0.2.3-3
- fixed redundant dependencies
- replaced occurence of /usr with prefix macro
- removed manual stripping of binaries
- fixed directory ownership issue
- fixed encoding of CREDITS file
- excluded arch ppc64 due to build failure
- replaced all space occurences with tabs

* Mon Sep  3 2007 Alexander Kahl <akahl at iconmobile.com> - 0.2.3-2
- added flag to remove mp3 support

* Sun Sep  2 2007 Alexander Kahl <akahl at iconmobile.com> - 0.2.3-1
- initial release



--- NEW FILE import.log ---
armstrong-0_2_6-4_fc10:F-10:armstrong-0.2.6-4.fc10.src.rpm:1236290556


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/armstrong/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	5 Mar 2009 20:18:12 -0000	1.1
+++ .cvsignore	5 Mar 2009 22:03:34 -0000	1.2
@@ -0,0 +1 @@
+armstrong-0.2.6-fe.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/armstrong/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	5 Mar 2009 20:18:12 -0000	1.1
+++ sources	5 Mar 2009 22:03:34 -0000	1.2
@@ -0,0 +1 @@
+fde539f563b85cc73077924f146c9135  armstrong-0.2.6-fe.tar.gz

More information about the fedora-extras-commits mailing list