rpms/libzzub/F-7 libzzub-buildfix.patch, 1.1, 1.2 libzzub.spec, 1.4, 1.5

[Alexander Kahl (akahl)]

Author: akahl

Update of /cvs/pkgs/rpms/libzzub/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20798/F-7

Modified Files:
	libzzub-buildfix.patch libzzub.spec 
Log Message:
-10 fix for Bug 375201


libzzub-buildfix.patch:

Index: libzzub-buildfix.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libzzub/F-7/libzzub-buildfix.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libzzub-buildfix.patch	17 Sep 2007 07:53:27 -0000	1.1
+++ libzzub-buildfix.patch	20 Nov 2007 10:12:38 -0000	1.2
@@ -1,20 +1,7 @@
 diff -up libzzub-0.2.3/SConstruct.buildfix libzzub-0.2.3/SConstruct
---- libzzub-0.2.3/SConstruct.buildfix	2007-09-11 21:51:01.000000000 +0200
-+++ libzzub-0.2.3/SConstruct	2007-09-11 21:51:30.000000000 +0200
-@@ -70,6 +70,7 @@ opts.Add("LUNARTARGET", 'Target for Luna
- opts.Add("SSE", "Support SSE instructions", False, None, bool_converter)
- opts.Add("SSE2", "Support SSE2 instructions", False, None, bool_converter)
- opts.Add("MP3", "Support loading of MP3 samples", linux, None, bool_converter)
-+opts.Add("JOBS", "Number of threads to compile with", '2')
- 
- env = Environment(ENV = os.environ, options=opts)
- 
-@@ -105,9 +106,12 @@ env['ROOTPATH'] = os.getcwd()
- env.Append(CCFLAGS=['-D__SCONS__'])
- env.Append(LIBPATH=['${ROOTPATH}/lib'])
- 
-+SetOption('num_jobs', env['JOBS'].replace('-j', ''))
-+
+--- libzzub-0.2.3/SConstruct.buildfix	2007-11-20 10:29:55.000000000 +0100
++++ libzzub-0.2.3/SConstruct	2007-11-20 10:28:50.000000000 +0100
+@@ -108,6 +108,7 @@ env.Append(LIBPATH=['${ROOTPATH}/lib'])
  if posix:
  	env.Append(CCFLAGS=[
  		'-DPOSIX',
@@ -22,7 +9,7 @@
  	])
  	env.Append(LINKFLAGS=[
  		'--rpath%s' % str(env.Dir('${PREFIX}${LIBDIR}')),
-@@ -139,12 +143,8 @@ cl = env['CC'] == 'cl'
+@@ -139,37 +140,14 @@ cl = env['CC'] == 'cl'
  if gcc:
  	#env['CXXFLAGS'] += ['--no-rtti']
  	if env['DEBUG'] == False:
@@ -37,23 +24,28 @@
  	else:
  		env.Append(CCFLAGS=[
  			'-g',
-@@ -152,19 +152,11 @@ if gcc:
+ 			'-DDEBUG',
  			'-D_DEBUG',
  		])
- 	if env['SSE2'] == True:
+-	if env['SSE2'] == True:
 -		if not x86_64:
 -			env.Append(CCFLAGS=[
 -				'-march=i686',
 -			])
- 		env.Append(CCFLAGS=[
- 			'-mfpmath=sse',
- 			'-msse2',
- 		])
- 	elif env['SSE'] == True:
+-		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',
+-		env.Append(CCFLAGS=[
+-			'-mfpmath=sse',
+-			'-msse',
+-		])
+-
+ if cl:
+ 	env.Append(CCFLAGS=[
+ 		'-nologo',


Index: libzzub.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libzzub/F-7/libzzub.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libzzub.spec	25 Oct 2007 08:56:39 -0000	1.4
+++ libzzub.spec	20 Nov 2007 10:12:38 -0000	1.5
@@ -1,6 +1,6 @@
 Name:		libzzub
 Version:	0.2.3
-Release:	9%{?dist}
+Release:	10%{?dist}
 Summary:	Powerful music sequencing library
 
 Group:		System Environment/Libraries
@@ -85,10 +85,9 @@
 	PREFIX=$RPM_BUILD_ROOT%{_prefix} \
 	LIBDIR=/%{_lib} \
 	DEBUG=false \
-	JOBS=%{?_smp_mflags} \
-	MP3=false
+	MP3=false 
 
-scons CCFLAGS="%{optflags}"
+scons CCFLAGS="%{optflags}" %{?_smp_mflags}
 
 cd src/pyzzub
 %{__python} setup.py build
@@ -150,6 +149,10 @@
 %{python_sitelib}/zzub
 
 %changelog
+* 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