[btanks] Need to correctly add the patch.

Bruno Wolff III bruno at fedoraproject.org
Sun Jun 26 19:15:55 UTC 2011


commit 9ad33eeeb92f32917203a0df6a218923158c7712
Author: Bruno Wolff III <bruno at wolff.to>
Date:   Sat Jun 25 10:46:03 2011 -0500

    Need to correctly add the patch.

 btanks-excessopts.patch |   25 +++++++++++++++++++++++++
 btanks.spec             |    2 +-
 2 files changed, 26 insertions(+), 1 deletions(-)
---
diff --git a/btanks-excessopts.patch b/btanks-excessopts.patch
new file mode 100644
index 0000000..5d4ff6f
--- /dev/null
+++ b/btanks-excessopts.patch
@@ -0,0 +1,25 @@
+--- SConstruct.orig	2011-06-25 10:38:50.000000000 -0500
++++ SConstruct	2011-06-25 10:41:52.000000000 -0500
+@@ -60,7 +60,7 @@
+ 
+ if (sys.platform != "win32" and env['gcc_visibility']): 
+ 	env.Append(CCFLAGS=['-fvisibility=hidden', '-DGCC_HASCLASSVISIBILITY'])
+-	env.Append(CXXFLAGS=['-fvisibility-inlines-hidden', '-fvisibility=hidden', '-DGCC_HASCLASSVISIBILITY'])
++	env.Append(CXXFLAGS=['-fvisibility-inlines-hidden'])
+ 
+ if sys.platform == "win32" and debug:
+ 	stl_port_debug = True
+@@ -98,13 +98,6 @@
+ 	if debug:
+ 		env.Append(CCFLAGS=['-ggdb', '-D_FORTIFY_SOURCE=2'])
+ 		env.Append(CPPFLAGS=['-ggdb', '-D_FORTIFY_SOURCE=2'])
+-	else: 
+-		env.Append(CCFLAGS=['-O3'])
+-		env.Append(CPPFLAGS=['-O3'])
+-		
+-	env.Append(CPPFLAGS=['-Wall', '-Wno-deprecated', '-pedantic', '-Wno-long-long', '-pipe', '-pthread'])
+-	env.Append(CCFLAGS=['-Wall', '-Wno-deprecated', '-pedantic', '-Wno-long-long', '-pipe', '-pthread'])
+-
+ 
+ conf_env = env.Clone()
+ conf = Configure(conf_env)
diff --git a/btanks.spec b/btanks.spec
index 6e20648..d557e6b 100644
--- a/btanks.spec
+++ b/btanks.spec
@@ -15,7 +15,7 @@ Patch1:         %{name}-disable-smpeg.patch
 # Avoid problem with lib checks using c++ instead of c.
 Patch2:         %{name}-libcheck.patch
 # Don't override Fedora's options
-Patch3:         %{name}--excessopts.patch
+Patch3:         %{name}-excessopts.patch
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
 Source1:        %{name}.desktop
 Source2:        bted.desktop


More information about the scm-commits mailing list