[mingw-zfstream] enable 64bit build

sailer sailer at fedoraproject.org
Mon Aug 13 20:39:05 UTC 2012


commit e2c1ea6754ce26f8ad1bf9f88bb4c433b7942a87
Author: Thomas Sailer <t.sailer at alumni.ethz.ch>
Date:   Mon Aug 13 22:38:54 2012 +0200

    enable 64bit build

 mingw-zfstream.spec |   38 ++++++++++++++++++++++++++++----------
 1 files changed, 28 insertions(+), 10 deletions(-)
---
diff --git a/mingw-zfstream.spec b/mingw-zfstream.spec
index 55f1b94..16ba6bd 100644
--- a/mingw-zfstream.spec
+++ b/mingw-zfstream.spec
@@ -1,6 +1,4 @@
-%global __strip %{mingw32_strip}
-%global __objdump %{mingw32_objdump}
-%define __debug_install_post %{mingw32_debug_install_post}
+%{?mingw_package_header}
 
 %global vday 02
 %global vmonth 12
@@ -9,7 +7,7 @@
 
 Name:           mingw-%{name1}
 Version:        %{vyear}%{vmonth}%{vday}
-Release:        14%{?dist}
+Release:        15%{?dist}
 Summary:        MinGW Windows abstraction API for reading and writing compressed files
 
 Group:          System Environment/Libraries
@@ -28,28 +26,38 @@ Patch1:         %{name1}-zip.patch
 BuildArch:      noarch
 
 BuildRequires:  mingw32-bzip2
+BuildRequires:  mingw64-bzip2
 BuildRequires:  mingw32-zlib
+BuildRequires:  mingw64-zlib
 BuildRequires:  mingw32-minizip
+BuildRequires:  mingw64-minizip
 BuildRequires:  libtool
 BuildRequires:  automake
 BuildRequires:  mingw32-filesystem
+BuildRequires:  mingw64-filesystem
 BuildRequires:  mingw32-gcc
+BuildRequires:  mingw64-gcc
 BuildRequires:  mingw32-binutils
-BuildRequires:  mingw32-gcc-c++
+BuildRequires:  mingw64-gcc-c++
 
 %description
 MinGW zfstream C++ compressed I/O abstraction library
 
-
+#Mingw32
 %package -n mingw32-%{name1}
 Summary:        MinGW Windows abstraction API for reading and writing compressed files
 
 %description -n mingw32-%{name1}
 MinGW zfstream C++ compressed I/O abstraction library
 
+#Mingw64
+%package -n mingw64-%{name1}
+Summary:        MinGW Windows abstraction API for reading and writing compressed files
 
-%{?mingw32_debug_package}
+%description -n mingw64-%{name1}
+MinGW zfstream C++ compressed I/O abstraction library
 
+%{?mingw_debug_package}
 
 %prep
 %setup -q -n libs11n_%{name1}-%{vyear}.%{vmonth}.%{vday} -a 1
@@ -62,12 +70,12 @@ libtoolize -f
 automake -a -c
 
 %build
-%{mingw32_configure} --disable-static
-make %{?_smp_mflags}
+%{mingw_configure} --disable-static
+%{mingw_make} %{?_smp_mflags}
 
 
 %install
-make install DESTDIR=$RPM_BUILD_ROOT
+%{mingw_make} install DESTDIR=$RPM_BUILD_ROOT
 
 # Drop all .la files
 find $RPM_BUILD_ROOT -name "*.la" -delete
@@ -80,7 +88,17 @@ find $RPM_BUILD_ROOT -name "*.la" -delete
 %{mingw32_libdir}/libzfstream.dll.a
 %{mingw32_libdir}/pkgconfig/zfstream.pc
 
+%files -n mingw64-%{name1}
+%doc LICENSE
+%{mingw64_bindir}/libzfstream-0.dll
+%{mingw64_includedir}/*
+%{mingw64_libdir}/libzfstream.dll.a
+%{mingw64_libdir}/pkgconfig/zfstream.pc
+
 %changelog
+* Mon Aug 13 2012 Thomas Sailer <t.sailer at alumni.ethz.ch> - 20041202-15
+- enable mingw64 build
+
 * Fri Jul 20 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 20041202-14
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 


More information about the scm-commits mailing list