[mingw-win-iconv] Added win64 support
epienbro
epienbro at fedoraproject.org
Sat Mar 10 14:36:08 UTC 2012
commit 968b1949c9c72588aaa77d419ebd166126ab862a
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date: Sat Mar 10 15:36:05 2012 +0100
Added win64 support
mingw-win-iconv.spec | 106 +++++++++++++++++++++++++++++++++----------------
1 files changed, 71 insertions(+), 35 deletions(-)
---
diff --git a/mingw-win-iconv.spec b/mingw-win-iconv.spec
index b9c6db4..5388dc1 100644
--- a/mingw-win-iconv.spec
+++ b/mingw-win-iconv.spec
@@ -1,25 +1,30 @@
-%global __strip %{_mingw32_strip}
-%global __objdump %{_mingw32_objdump}
-%define __debug_install_post %{_mingw32_debug_install_post}
-
-Name: mingw-win-iconv
-Version: 0.0.3
-Release: 6%{?dist}
-Summary: Iconv implementation using Win32 API
-
-License: Public Domain
-Group: Development/Libraries
-URL: http://code.google.com/p/win-iconv
-Source0: http://win-iconv.googlecode.com/files/win-iconv-%{version}.tar.bz2
+%?mingw_package_header
+
+%global mingw_build_win32 1
+%global mingw_build_win64 1
+
+Name: mingw-win-iconv
+Version: 0.0.3
+Release: 7%{?dist}
+Summary: Iconv implementation using Win32 API
+
+License: Public Domain
+Group: Development/Libraries
+URL: http://code.google.com/p/win-iconv
+Source0: http://win-iconv.googlecode.com/files/win-iconv-%{version}.tar.bz2
# rename libiconv.dll -> iconv.dll to match the .def file
-Patch0: win-iconv-0.0.3-dllname.patch
-BuildArch: noarch
+Patch0: win-iconv-0.0.3-dllname.patch
+BuildArch: noarch
-BuildRequires: mingw32-filesystem >= 68
+BuildRequires: mingw32-filesystem >= 95
BuildRequires: mingw32-gcc
BuildRequires: mingw32-gcc-c++
BuildRequires: mingw32-binutils
-BuildRequires: mingw32-runtime
+
+BuildRequires: mingw64-filesystem >= 95
+BuildRequires: mingw64-gcc
+BuildRequires: mingw64-gcc-c++
+BuildRequires: mingw64-binutils
BuildRequires: cmake >= 2.8.0
BuildRequires: dos2unix
@@ -29,26 +34,44 @@ BuildRequires: dos2unix
MinGW Windows Iconv library
-%package -n %{_mingw32_pkg_name}
-Summary: MinGW Windows Iconv library
-Obsoletes: mingw32-iconv < 1.12-14
-Provides: mingw32-iconv = 1.12-14
+%?mingw_debug_package
-%description -n %{_mingw32_pkg_name}
-MinGW Windows cross compiled Iconv library.
+# Win32
+%package -n mingw32-win-iconv
+Summary: MinGW Windows Iconv library
+Obsoletes: mingw32-iconv < 1.12-14
+Provides: mingw32-iconv = 1.12-14
+
+%description -n mingw32-win-iconv
+MinGW Windows cross compiled Iconv library.
-%package -n %{_mingw32_pkg_name}-static
-Summary: Static version of the MinGW Windows Iconv library
-Requires: mingw32-win-iconv = %{version}-%{release}
-Obsoletes: mingw32-iconv-static < 1.12-14
-Provides: mingw32-iconv-static = 1.12-14
+%package -n mingw32-win-iconv-static
+Summary: Static version of the MinGW Windows Iconv library
+Requires: mingw32-win-iconv = %{version}-%{release}
+Obsoletes: mingw32-iconv-static < 1.12-14
+Provides: mingw32-iconv-static = 1.12-14
-%description -n %{_mingw32_pkg_name}-static
+%description -n mingw32-win-iconv-static
Static version of the MinGW Windows Iconv library.
+# Win64
+%package -n mingw64-win-iconv
+Summary: MinGW Windows Iconv library
+Obsoletes: mingw64-iconv < 1.13.1-2%{?dist}
+Provides: mingw64-iconv = 1.13.1-2%{?dist}
-%{?_mingw32_debug_package}
+%description -n mingw64-win-iconv
+MinGW Windows Iconv library
+
+%package -n mingw64-win-iconv-static
+Summary: Static version of the MinGW Windows Iconv library
+Requires: mingw64-win-iconv = %{version}-%{release}
+Obsoletes: mingw64-iconv-static < 1.13.1-2%{?dist}
+Provides: mingw64-iconv-static = 1.13.1-2%{?dist}
+
+%description -n mingw64-win-iconv-static
+Static version of the MinGW Windows Iconv library.
%prep
@@ -62,26 +85,39 @@ chmod -x ChangeLog
%build
-%{_mingw32_cmake} -DBUILD_STATIC=1
+%mingw_cmake -DBUILD_STATIC=1
%install
-make install DESTDIR=$RPM_BUILD_ROOT
+%mingw_make_install DESTDIR=$RPM_BUILD_ROOT
-rm -rf $RPM_BUILD_ROOT%{_mingw32_bindir}/*.exe
+rm -rf $RPM_BUILD_ROOT%{mingw32_bindir}/*.exe
+rm -rf $RPM_BUILD_ROOT%{mingw64_bindir}/*.exe
-%files -n %{_mingw32_pkg_name}
+%files -n mingw32-win-iconv
%doc ChangeLog readme.txt
%{_mingw32_bindir}/iconv.dll
%{_mingw32_includedir}/iconv.h
%{_mingw32_libdir}/libiconv.dll.a
-%files -n %{_mingw32_pkg_name}-static
+%files -n mingw32-win-iconv-static
%{_mingw32_libdir}/libiconv.a
+%files -n mingw64-win-iconv
+%doc ChangeLog readme.txt
+%{mingw64_bindir}/iconv.dll
+%{mingw64_includedir}/iconv.h
+%{mingw64_libdir}/libiconv.dll.a
+
+%files -n mingw64-win-iconv-static
+%{mingw64_libdir}/libiconv.a
+
%changelog
+* Sat Mar 10 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 0.0-3-7
+- Added win64 support
+
* Mon Feb 27 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 0.0.3-6
- Rebuild against the mingw-w64 toolchain
More information about the scm-commits
mailing list