[mingw-gdb] Update to 7.4 and added win64 support

[epienbro]

commit 0e1b648f4e1235c74ffec806ea7717f5ee740bc5
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date:   Sat Mar 10 20:35:14 2012 +0100

    Update to 7.4 and added win64 support
    
    - Update to 7.4
    - Added win64 support
    - Use mingw macros without leading underscore

 .gitignore     |    1 +
 mingw-gdb.spec |   71 +++++++++++++++++++++++++++++++++++++++++--------------
 sources        |    2 +-
 3 files changed, 55 insertions(+), 19 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index fee7795..dca9771 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /gdb-7.2.tar.bz2
 /gdb-7.3.tar.bz2
+/gdb-7.4.tar.bz2
diff --git a/mingw-gdb.spec b/mingw-gdb.spec
index 5285eb2..d1a73f3 100644
--- a/mingw-gdb.spec
+++ b/mingw-gdb.spec
@@ -1,10 +1,11 @@
-%global __strip %{_mingw32_strip}
-%global __objdump %{_mingw32_objdump}
-%define __debug_install_post %{_mingw32_debug_install_post}
+%?mingw_package_header
+
+%global mingw_build_win32 1
+%global mingw_build_win64 1
 
 Name:           mingw-gdb
-Version:        7.3
-Release:        3%{?dist}
+Version:        7.4
+Release:        1%{?dist}
 Summary:        MinGW Windows port of the GDB debugger
 
 # Same License tag as the native gdb package has:
@@ -17,15 +18,24 @@ BuildArch:      noarch
 
 BuildRequires:  mingw32-binutils
 BuildRequires:  mingw32-expat
-BuildRequires:  mingw32-filesystem >= 68
+BuildRequires:  mingw32-filesystem >= 95
 BuildRequires:  mingw32-gcc
 BuildRequires:  mingw32-win-iconv
 BuildRequires:  mingw32-zlib
 
+BuildRequires:  mingw64-binutils
+BuildRequires:  mingw64-expat
+BuildRequires:  mingw64-filesystem >= 95
+BuildRequires:  mingw64-gcc
+BuildRequires:  mingw64-win-iconv
+BuildRequires:  mingw64-zlib
+
+
 %description
 This is the MinGW Windows port of the GDB, the GNU debugger.
 
 
+# Win32
 %package -n mingw32-gdb
 Summary:        MinGW Windows port of the GDB debugger
 # Provide upgrade path for the gdb packages distributed at
@@ -35,8 +45,15 @@ Obsoletes:      mingw32-gdb-gdbserver < 6.8.50.20090302-2
 %description -n mingw32-gdb
 This is the MinGW Windows port of the GDB, the GNU debugger.
 
+# Win64
+%package -n mingw64-gdb
+Summary:        MinGW Windows port of the GDB debugger
+
+%description -n mingw64-gdb
+This is the MinGW Windows port of the GDB, the GNU debugger.
+
 
-%{?_mingw32_debug_package}
+%?mingw_debug_package
 
 
 %prep
@@ -44,31 +61,49 @@ This is the MinGW Windows port of the GDB, the GNU debugger.
 
 
 %build
-%{_mingw32_configure}
-make %{?_smp_mflags}
+%mingw_configure
+%mingw_make %{?_smp_mflags}
 
 
 %install
-make install DESTDIR=$RPM_BUILD_ROOT
+%mingw_make_install DESTDIR=$RPM_BUILD_ROOT
 
 # Remove bfd and opcodes libraries
-rm -rf $RPM_BUILD_ROOT%{_mingw32_datadir}/locale/
-rm -rf $RPM_BUILD_ROOT%{_mingw32_includedir}/
-rm -rf $RPM_BUILD_ROOT%{_mingw32_libdir}/
+rm -rf $RPM_BUILD_ROOT%{mingw32_datadir}/locale/
+rm -rf $RPM_BUILD_ROOT%{mingw32_includedir}/
+rm -rf $RPM_BUILD_ROOT%{mingw32_libdir}/
+
+rm -rf $RPM_BUILD_ROOT%{mingw64_datadir}/locale/
+rm -rf $RPM_BUILD_ROOT%{mingw64_includedir}/
+rm -rf $RPM_BUILD_ROOT%{mingw64_libdir}/
 
 # Remove documentation which is duplicate with native gdb package
-rm -rf $RPM_BUILD_ROOT%{_mingw32_datadir}/info/
-rm -rf $RPM_BUILD_ROOT%{_mingw32_mandir}/
+rm -rf $RPM_BUILD_ROOT%{mingw32_datadir}/info/
+rm -rf $RPM_BUILD_ROOT%{mingw32_mandir}/
+
+rm -rf $RPM_BUILD_ROOT%{mingw64_datadir}/info/
+rm -rf $RPM_BUILD_ROOT%{mingw64_mandir}/
 
 
 %files -n mingw32-gdb
 %doc COPYING3 COPYING COPYING.LIB
-%{_mingw32_bindir}/gdb.exe
-%{_mingw32_bindir}/gdbserver.exe
-%{_mingw32_datadir}/gdb/
+%{mingw32_bindir}/gdb.exe
+%{mingw32_bindir}/gdbserver.exe
+%{mingw32_datadir}/gdb/
+
+%files -n mingw64-gdb
+%doc COPYING3 COPYING COPYING.LIB
+%{mingw64_bindir}/gdb.exe
+%{mingw64_bindir}/gdbserver.exe
+%{mingw64_datadir}/gdb/
 
 
 %changelog
+* Sat Mar 10 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 7.4-1
+- Update to 7.4
+- Added win64 support
+- Use mingw macros without leading underscore
+
 * Mon Feb 27 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 7.3-3
 - Rebuild against the mingw-w64 toolchain
 
diff --git a/sources b/sources
index 4e5f643..12e778b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-485022b8df7ba2221f217e128f479fe7  gdb-7.3.tar.bz2
+95a9a8305fed4d30a30a6dc28ff9d060  gdb-7.4.tar.bz2