[mingw-nsis: 10/27] - Don't build the MinGW parts with debugging information, NSIS corrupts the debugging informatio

[Kalev Lember]

commit 5880714a4ccfadac2d772205948fa64e88738aca
Author: Kevin Kofler <kkofler at fedoraproject.org>
Date:   Tue Mar 3 21:37:54 2009 +0000

    - Don't build the MinGW parts with debugging information, NSIS corrupts the
        debugging information in the stubs when building installers from them
    - Drop debian-debug-opt patch, all its changes are either taken care of by
        our rpm-opt patch, unwanted (see above) or unneeded.

 mingw32-nsis.spec                |   27 +++++----
 nsis-2.43-debian-debug-opt.patch |  115 --------------------------------------
 nsis-2.43-rpm-opt.patch          |   22 ++++----
 3 files changed, 26 insertions(+), 138 deletions(-)
---
diff --git a/mingw32-nsis.spec b/mingw32-nsis.spec
index 4358d08..369bd58 100644
--- a/mingw32-nsis.spec
+++ b/mingw32-nsis.spec
@@ -1,9 +1,9 @@
-%define sconsopts VERSION=%{version} PREFIX=%{_prefix} PREFIX_CONF=%{_sysconfdir} SKIPPLUGINS=System SKIPUTILS='NSIS Menu' DEBUG_SYMBOLS=1 OPTS=1
+%define sconsopts VERSION=%{version} PREFIX=%{_prefix} PREFIX_CONF=%{_sysconfdir} SKIPPLUGINS=System SKIPUTILS='NSIS Menu' STRIP_CP=false
 %define _default_patch_fuzz 2
 
 Name:           mingw32-nsis
 Version:        2.43
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Nullsoft Scriptable Install System
 
 License:        zlib and CPL
@@ -15,10 +15,8 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # This patch fixes NSIS to actually build 64-bit versions.
 # Originally from Debian, updated by Kevin Kofler.
 Patch0:         nsis-2.43-64bit-fixes.patch
-# Patches from Debian (mainly by Paul Wise).
-Patch1:         nsis-2.43-debian-debug-opt.patch
 # Use RPM_OPT_FLAGS for the natively-built parts
-Patch2:         nsis-2.43-rpm-opt.patch
+Patch1:         nsis-2.43-rpm-opt.patch
 
 BuildRequires:  mingw32-filesystem >= 40
 BuildRequires:  mingw32-gcc
@@ -61,8 +59,7 @@ assembler code.
 %setup -q -n nsis-%{version}-src
 
 %patch0 -p1 -b .64bit
-%patch1 -p1 -b .debug
-%patch2 -p1 -b .rpmopt
+%patch1 -p1 -b .rpmopt
 
 
 %build
@@ -92,15 +89,21 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Mar  3 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 2.43-6
+- Don't build the MinGW parts with debugging information, NSIS corrupts the
+  debugging information in the stubs when building installers from them
+- Drop debian-debug-opt patch, all its changes are either taken care of by our
+  rpm-opt patch, unwanted (see above) or unneeded.
+
 * Wed Feb 25 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 2.43-5
 - Use RPM_OPT_FLAGS for the natively-built parts
 
 * Wed Feb 25 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 2.43-4
-- Updated 64bit-fixes patch (remove some more -m32 use).
-- Drop ExclusiveArch, not needed with the above.
-- Obsoletes/Provides nsis and nsis-data for migration path from CalcForge.
-- Disable NSIS Menu (does not work on *nix, see specfile comment for details).
-- Drop BR wxGTK-devel.
+- Updated 64bit-fixes patch (remove some more -m32 use)
+- Drop ExclusiveArch, not needed with the above
+- Obsoletes/Provides nsis and nsis-data for migration path from CalcForge
+- Disable NSIS Menu (does not work on *nix, see specfile comment for details)
+- Drop BR wxGTK-devel
 
 * Sat Feb 21 2009 Richard W.M. Jones <rjones at redhat.com> - 2.43-3
 - Restore ExclusiveArch line (Levente Farkas).
diff --git a/nsis-2.43-rpm-opt.patch b/nsis-2.43-rpm-opt.patch
index 129d9ed..a3fa718 100644
--- a/nsis-2.43-rpm-opt.patch
+++ b/nsis-2.43-rpm-opt.patch
@@ -1,6 +1,6 @@
-diff -ur nsis-2.43-src-debian-debug-opt/SCons/Config/gnu nsis-2.43-src-rpm-opt/SCons/Config/gnu
---- nsis-2.43-src-debian-debug-opt/SCons/Config/gnu	2009-02-25 08:35:01.000000000 +0100
-+++ nsis-2.43-src-rpm-opt/SCons/Config/gnu	2009-02-25 14:09:34.000000000 +0100
+diff -ur nsis-2.43-src-64bit-fixes/SCons/Config/gnu nsis-2.43-src-rpm-opt/SCons/Config/gnu
+--- nsis-2.43-src-64bit-fixes/SCons/Config/gnu	2009-02-25 08:33:39.000000000 +0100
++++ nsis-2.43-src-rpm-opt/SCons/Config/gnu	2009-03-03 22:24:49.000000000 +0100
 @@ -1,5 +1,7 @@
  print "Using GNU tools configuration"
  
@@ -9,20 +9,20 @@ diff -ur nsis-2.43-src-debian-debug-opt/SCons/Config/gnu nsis-2.43-src-rpm-opt/S
  Import('defenv')
  
  ### imports
-@@ -95,7 +97,7 @@
- 	makensis_env.Append(LINKFLAGS = '-g')             # debugging
- 	makensis_env.Append(CCFLAGS = '-g')               # debugging
- if not defenv['DEBUG'] and defenv['OPT']:
--	makensis_env.Append(CCFLAGS = ['-O2'])            # optimize
-+	makensis_env.Append(CCFLAGS = os.getenv('RPM_OPT_FLAGS'))            # optimize
+@@ -89,7 +91,7 @@
+ makensis_env.Append(CPPPATH = ['#$BUILD_CONFIG'])
+ 
+ if not defenv['DEBUG']:
+-	makensis_env.Append(CCFLAGS = ['-O2'])                  # optimize
++	makensis_env.Append(CCFLAGS = os.getenv('RPM_OPT_FLAGS'))                  # optimize
  makensis_env.Append(CFLAGS = ['-Wall'])                   # all warnings
  makensis_env.Append(CXXFLAGS = ['-Wno-non-virtual-dtor']) # ignore virtual dtor warnings
  makensis_env.Append(CXXFLAGS = ['-Wall'])                 # all warnings
-@@ -158,6 +160,7 @@
+@@ -146,6 +148,7 @@
  
  ### cross-platform util environment adjustments
  
 +cp_util_env.Append(CCFLAGS = os.getenv('RPM_OPT_FLAGS'))
  conf = FlagsConfigure(cp_util_env)
- if not defenv['DEBUG'] and not defenv['DEBUG_SYMBOLS'] and defenv['STRIP'] and defenv['STRIP_CP']:
+ if not defenv['DEBUG'] and defenv['STRIP'] and defenv['STRIP_CP']:
  	TestStrip(conf)                                 # strip