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

[epienbro]

commit 21f07877532c629f08d5aeecf3d23950634c789a
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date:   Sun Mar 18 16:52:16 2012 +0100

    Added win64 support (contributed by Marc-André Lureau)
    
    - Added win64 support (contributed by Marc-André Lureau)
    - Use mingw macros without leading underscore

 mingw-libvorbis.spec |   82 ++++++++++++++++++++++++++++++++++++-------------
 1 files changed, 60 insertions(+), 22 deletions(-)
---
diff --git a/mingw-libvorbis.spec b/mingw-libvorbis.spec
index 88e6edc..dcb9d2b 100644
--- a/mingw-libvorbis.spec
+++ b/mingw-libvorbis.spec
@@ -1,10 +1,8 @@
-%global __strip %{_mingw32_strip}
-%global __objdump %{_mingw32_objdump}
-%define __debug_install_post %{_mingw32_debug_install_post}
+%?mingw_package_header
 
 Name:           mingw-libvorbis
 Version:        1.3.2
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        MinGW Windows libvorbis library
 
 License:        BSD
@@ -14,11 +12,17 @@ Source0:        http://downloads.xiph.org/releases/vorbis/libvorbis-%{version}.t
 
 BuildArch:      noarch
 
-BuildRequires:  mingw32-filesystem >= 68
+BuildRequires:  mingw32-filesystem >= 95
 BuildRequires:  mingw32-gcc
 BuildRequires:  mingw32-binutils
 BuildRequires:  mingw32-libogg
 
+BuildRequires:  mingw64-filesystem >= 95
+BuildRequires:  mingw64-gcc
+BuildRequires:  mingw64-binutils
+BuildRequires:  mingw64-libogg
+
+
 %description
 Ogg Vorbis is a fully open, non-proprietary, patent- and royalty-free,
 general-purpose compressed audio format for audio and music at fixed
@@ -27,6 +31,7 @@ and variable bitrates from 16 to 128 kbps/channel.
 This package contains the MinGW Windows cross compiled libvorbis library.
 
 
+# Win32
 %package -n mingw32-libvorbis
 Summary:        MinGW Windows libvorbis library
 
@@ -37,8 +42,19 @@ and variable bitrates from 16 to 128 kbps/channel.
 
 This package contains the MinGW Windows cross compiled libvorbis library.
 
+# Win64
+%package -n mingw64-libvorbis
+Summary:        MinGW Windows libvorbis library
+
+%description -n mingw64-libvorbis
+Ogg Vorbis is a fully open, non-proprietary, patent- and royalty-free,
+general-purpose compressed audio format for audio and music at fixed
+and variable bitrates from 16 to 128 kbps/channel.
+
+This package contains the MinGW Windows cross compiled libvorbis library.
+
 
-%{?_mingw32_debug_package}
+%?mingw_debug_package
 
 
 %prep
@@ -47,34 +63,56 @@ This package contains the MinGW Windows cross compiled libvorbis library.
 
 %build
 sed -i 's/-O20//' configure
-%{_mingw32_configure} --disable-static
+%mingw_configure --disable-static
 
-make %{?_smp_mflags} V=1
+%mingw_make %{?_smp_mflags} V=1
 
 
 %install
-make install DESTDIR=$RPM_BUILD_ROOT
+%mingw_make install DESTDIR=$RPM_BUILD_ROOT
 
-rm -rf $RPM_BUILD_ROOT%{_mingw32_libdir}/*.la
-rm -rf $RPM_BUILD_ROOT%{_mingw32_datadir}/doc/
+rm -rf $RPM_BUILD_ROOT%{mingw32_libdir}/*.la
+rm -rf $RPM_BUILD_ROOT%{mingw64_libdir}/*.la
+rm -rf $RPM_BUILD_ROOT%{mingw32_datadir}/doc/
+rm -rf $RPM_BUILD_ROOT%{mingw64_datadir}/doc/
 
 
+# Win32
 %files -n mingw32-libvorbis
 %doc COPYING
-%{_mingw32_bindir}/libvorbis-0.dll
-%{_mingw32_bindir}/libvorbisenc-2.dll
-%{_mingw32_bindir}/libvorbisfile-3.dll
-%{_mingw32_includedir}/vorbis/
-%{_mingw32_libdir}/libvorbis.dll.a
-%{_mingw32_libdir}/libvorbisenc.dll.a
-%{_mingw32_libdir}/libvorbisfile.dll.a
-%{_mingw32_libdir}/pkgconfig/vorbis.pc
-%{_mingw32_libdir}/pkgconfig/vorbisenc.pc
-%{_mingw32_libdir}/pkgconfig/vorbisfile.pc
-%{_mingw32_datadir}/aclocal/vorbis.m4
+%{mingw32_bindir}/libvorbis-0.dll
+%{mingw32_bindir}/libvorbisenc-2.dll
+%{mingw32_bindir}/libvorbisfile-3.dll
+%{mingw32_includedir}/vorbis/
+%{mingw32_libdir}/libvorbis.dll.a
+%{mingw32_libdir}/libvorbisenc.dll.a
+%{mingw32_libdir}/libvorbisfile.dll.a
+%{mingw32_libdir}/pkgconfig/vorbis.pc
+%{mingw32_libdir}/pkgconfig/vorbisenc.pc
+%{mingw32_libdir}/pkgconfig/vorbisfile.pc
+%{mingw32_datadir}/aclocal/vorbis.m4
+
+# Win64
+%files -n mingw64-libvorbis
+%doc COPYING
+%{mingw64_bindir}/libvorbis-0.dll
+%{mingw64_bindir}/libvorbisenc-2.dll
+%{mingw64_bindir}/libvorbisfile-3.dll
+%{mingw64_includedir}/vorbis/
+%{mingw64_libdir}/libvorbis.dll.a
+%{mingw64_libdir}/libvorbisenc.dll.a
+%{mingw64_libdir}/libvorbisfile.dll.a
+%{mingw64_libdir}/pkgconfig/vorbis.pc
+%{mingw64_libdir}/pkgconfig/vorbisenc.pc
+%{mingw64_libdir}/pkgconfig/vorbisfile.pc
+%{mingw64_datadir}/aclocal/vorbis.m4
 
 
 %changelog
+* Sun Mar 18 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 1.3.2-5
+- Added win64 support (contributed by Marc-André Lureau)
+- Use mingw macros without leading underscore
+
 * Tue Feb 28 2012 Kalev Lember <kalevlember at gmail.com> - 1.3.2-4
 - Remove the .la files