[mingw-libogg] Added win64 support (contributed by Marc-André Lureau)

[epienbro]

commit 7ff28eba4230fa83b3819adb11005a90635fb76e
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date:   Sun Mar 18 16:43:45 2012 +0100

    Added win64 support (contributed by Marc-André Lureau)
    
    - Added win64 support (contributed by Marc-André Lureau)
    - Automatically generate debuginfo package

 mingw-libogg.spec |   52 +++++++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 45 insertions(+), 7 deletions(-)
---
diff --git a/mingw-libogg.spec b/mingw-libogg.spec
index 3bfa864..9d6bbe0 100644
--- a/mingw-libogg.spec
+++ b/mingw-libogg.spec
@@ -1,26 +1,31 @@
-%define __strip %{mingw32_strip}
-%define __objdump %{mingw32_objdump}
+%?mingw_package_header
 
 Summary:        The Ogg bitstream file format library
 Name:           mingw-libogg
 Version:        1.1.4
-Release:        6%{?dist}
+Release:        7%{?dist}
 Group:          System Environment/Libraries
 License:        BSD
 URL:            http://www.xiph.org/
 Source:         http://downloads.xiph.org/releases/ogg/libogg-%{version}.tar.gz
 
 BuildArch:      noarch
-BuildRequires:  mingw32-filesystem >= 49
+BuildRequires:  mingw32-filesystem >= 95
 BuildRequires:  mingw32-gcc
 BuildRequires:  mingw32-binutils
 
+BuildRequires:  mingw64-filesystem >= 95
+BuildRequires:  mingw64-gcc
+BuildRequires:  mingw64-binutils
+
+
 %description
 Libogg is a library for manipulating Ogg bitstream file formats.
 Libogg supports both making Ogg bitstreams and getting packets from
 Ogg bitstreams.
 
 
+# Win32
 %package -n mingw32-libogg
 Summary:        The Ogg bitstream file format library
 Requires:       pkgconfig
@@ -30,6 +35,19 @@ Libogg is a library for manipulating Ogg bitstream file formats.
 Libogg supports both making Ogg bitstreams and getting packets from
 Ogg bitstreams.
 
+# Win64
+%package -n mingw64-libogg
+Summary:        The Ogg bitstream file format library
+Requires:       pkgconfig
+
+%description -n mingw64-libogg
+Libogg is a library for manipulating Ogg bitstream file formats.
+Libogg supports both making Ogg bitstreams and getting packets from
+Ogg bitstreams.
+
+
+%?mingw_debug_package
+
 
 %prep
 %setup -q -n libogg-%{version}
@@ -37,18 +55,21 @@ Ogg bitstreams.
 %build
 sed -i "s/-O20/-O2/" configure
 sed -i "s/-ffast-math//" configure
-%{mingw32_configure} --disable-static
-make %{?_smp_mflags}
+%mingw_configure --disable-static
+%mingw_make %{?_smp_mflags}
 
 %install
-make DESTDIR=$RPM_BUILD_ROOT install
+%mingw_make DESTDIR=$RPM_BUILD_ROOT install
+
 # zap docs, redundant with native package
 rm -rf $RPM_BUILD_ROOT%{mingw32_docdir}
+rm -rf $RPM_BUILD_ROOT%{mingw64_docdir}
 
 # Drop all .la files
 find $RPM_BUILD_ROOT -name "*.la" -delete
 
 
+# Win32
 %files -n mingw32-libogg
 %doc AUTHORS CHANGES COPYING README
 %{mingw32_bindir}/libogg*
@@ -60,7 +81,24 @@ find $RPM_BUILD_ROOT -name "*.la" -delete
 %{mingw32_includedir}/ogg/config_types.h
 %{mingw32_datadir}/aclocal/ogg.m4
 
+# Win64
+%files -n mingw64-libogg
+%doc AUTHORS CHANGES COPYING README
+%{mingw64_bindir}/libogg*
+%{mingw64_libdir}/libogg.dll.a
+%{mingw64_libdir}/pkgconfig/ogg.pc
+%dir %{mingw64_includedir}/ogg
+%{mingw64_includedir}/ogg/ogg.h
+%{mingw64_includedir}/ogg/os_types.h
+%{mingw64_includedir}/ogg/config_types.h
+%{mingw64_datadir}/aclocal/ogg.m4
+
+
 %changelog
+* Sun Mar 18 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 1.1.4-7
+- Added win64 support (contributed by Marc-André Lureau)
+- Automatically generate debuginfo package
+
 * Wed Mar 07 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 1.1.4-6
 - Renamed the source package to mingw-libogg (RHBZ #800918)
 - Use mingw macros without leading underscore