[mingw-expat] Added win64 support
epienbro
epienbro at fedoraproject.org
Sat Mar 10 20:27:22 UTC 2012
commit c99bda1084b25dfc876883240879c73a1a9482c1
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date: Sat Mar 10 21:27:07 2012 +0100
Added win64 support
- Added win64 support
- Dropped unneeded RPM tags
mingw-expat.spec | 60 ++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 43 insertions(+), 17 deletions(-)
---
diff --git a/mingw-expat.spec b/mingw-expat.spec
index 4f6e010..251e38b 100644
--- a/mingw-expat.spec
+++ b/mingw-expat.spec
@@ -1,23 +1,28 @@
-%define __strip %{mingw32_strip}
-%define __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-expat
Version: 2.0.1
-Release: 11%{?dist}
+Release: 12%{?dist}
Summary: MinGW Windows port of expat XML parser library
License: MIT
Group: Development/Libraries
URL: http://www.libexpat.org/
Source0: http://downloads.sourceforge.net/expat/expat-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
-BuildRequires: mingw32-filesystem >= 33
+BuildRequires: mingw32-filesystem >= 95
BuildRequires: mingw32-gcc
BuildRequires: mingw32-binutils
+
+BuildRequires: mingw64-filesystem >= 95
+BuildRequires: mingw64-gcc
+BuildRequires: mingw64-binutils
+
BuildRequires: autoconf, automake, libtool
@@ -29,7 +34,7 @@ parser discovers the associated structures in the document being parsed. A
start tag is an example of the kind of structures for which you may
register handlers.
-
+# Win32
%package -n mingw32-expat
Summary: MinGW Windows port of expat XML parser library
@@ -41,8 +46,20 @@ parser discovers the associated structures in the document being parsed. A
start tag is an example of the kind of structures for which you may
register handlers.
+# Win64
+%package -n mingw64-expat
+Summary: MinGW Windows port of expat XML parser library
-%{?_mingw32_debug_package}
+%description -n mingw64-expat
+This is expat, the C library for parsing XML, written by James Clark. Expat
+is a stream oriented XML parser. This means that you register handlers with
+the parser prior to starting the parse. These handlers are called when the
+parser discovers the associated structures in the document being parsed. A
+start tag is an example of the kind of structures for which you may
+register handlers.
+
+
+%?mingw_debug_package
%prep
@@ -56,29 +73,26 @@ chmod -x COPYING
%build
-%{mingw32_configure}
-make %{?_smp_mflags}
+%mingw_configure
+%mingw_make %{?_smp_mflags}
%install
-rm -rf $RPM_BUILD_ROOT
-make DESTDIR=$RPM_BUILD_ROOT install
+%mingw_make_install DESTDIR=$RPM_BUILD_ROOT
# Remove static libraries
rm $RPM_BUILD_ROOT%{mingw32_libdir}/libexpat.a
+rm $RPM_BUILD_ROOT%{mingw64_libdir}/libexpat.a
# Remove .la files
-rm $RPM_BUILD_ROOT%{mingw32_libdir}/*.la
+find $RPM_BUILD_ROOT -name "*.la" -delete
# Remove documentation which duplicates that found in the native package.
rm -r $RPM_BUILD_ROOT%{mingw32_mandir}/man1
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+rm -r $RPM_BUILD_ROOT%{mingw64_mandir}/man1
%files -n mingw32-expat
-%defattr(-,root,root)
%doc COPYING
%{mingw32_bindir}/libexpat-1.dll
%{mingw32_bindir}/xmlwf
@@ -86,8 +100,20 @@ rm -rf $RPM_BUILD_ROOT
%{mingw32_includedir}/expat.h
%{mingw32_includedir}/expat_external.h
+%files -n mingw64-expat
+%doc COPYING
+%{mingw64_bindir}/libexpat-1.dll
+%{mingw64_bindir}/xmlwf
+%{mingw64_libdir}/libexpat.dll.a
+%{mingw64_includedir}/expat.h
+%{mingw64_includedir}/expat_external.h
+
%changelog
+* Sat Mar 10 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.0.1-12
+- Added win64 support
+- Dropped unneeded RPM tags
+
* Fri Mar 09 2012 Kalev Lember <kalevlember at gmail.com> - 2.0.1-11
- Remove .la files
More information about the scm-commits
mailing list