[mingw-libgnurx] Added win64 support
Erik van Pienbroek
epienbro at fedoraproject.org
Sun Apr 8 13:40:55 UTC 2012
commit 38eaade5c980daf24113d1405511d4dfdbe5a919
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date: Sun Apr 8 15:40:51 2012 +0200
Added win64 support
mingw-libgnurx.spec | 50 ++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 40 insertions(+), 10 deletions(-)
---
diff --git a/mingw-libgnurx.spec b/mingw-libgnurx.spec
index 8a0b98a..6493cb7 100644
--- a/mingw-libgnurx.spec
+++ b/mingw-libgnurx.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-libgnurx
Version: 2.5.1
-Release: 11%{?dist}
+Release: 12%{?dist}
Summary: MinGW Regex library
License: LGPLv2+
@@ -26,13 +24,13 @@ BuildRequires: mingw32-binutils
MinGW Windows regular expression library.
+# Win32
%package -n mingw32-libgnurx
Summary: MinGW Regex library
%description -n mingw32-libgnurx
MinGW Windows regular expression library.
-
%package -n mingw32-libgnurx-static
Summary: Static version of the MinGW Windows regular expression library
Requires: mingw32-libgnurx = %{version}-%{release}
@@ -41,8 +39,23 @@ Group: Development/Libraries
%description -n mingw32-libgnurx-static
Static version of the MinGW Windows regular expression library.
+# Win64
+%package -n mingw64-libgnurx
+Summary: MinGW Regex library
+
+%description -n mingw64-libgnurx
+MinGW Windows regular expression library.
+
+%package -n mingw64-libgnurx-static
+Summary: Static version of the MinGW Windows regular expression library
+Requires: mingw64-libgnurx = %{version}-%{release}
+Group: Development/Libraries
+
+%description -n mingw64-libgnurx-static
+Static version of the MinGW Windows regular expression library.
+
-%{?mingw32_debug_package}
+%?mingw_debug_package
%prep
@@ -62,29 +75,33 @@ autoconf
automake --add-missing
%build
-%{mingw32_configure} --enable-static --enable-shared
-make %{?_smp_mflags}
+%mingw_configure --enable-static --enable-shared
+%mingw_make %{?_smp_mflags}
%install
# make install expects %{mingw32_includedir} to exist
-mkdir -p $RPM_BUILD_ROOT%{mingw32_includedir}
+mkdir -p $RPM_BUILD_ROOT%{mingw32_includedir} $RPM_BUILD_ROOT%{mingw64_includedir}
-make DESTDIR=$RPM_BUILD_ROOT install
+%mingw_make DESTDIR=$RPM_BUILD_ROOT install
# make install installs two import libraries named libgnurx.a and
# libgnurx.dll.a. As most applications requiring regex functions
# try to perform 'gcc -lregex' we rename the import libraries for this to work
mv $RPM_BUILD_ROOT%{mingw32_libdir}/libgnurx.a $RPM_BUILD_ROOT%{mingw32_libdir}/libregex.a
+mv $RPM_BUILD_ROOT%{mingw64_libdir}/libgnurx.a $RPM_BUILD_ROOT%{mingw64_libdir}/libregex.a
mv $RPM_BUILD_ROOT%{mingw32_libdir}/libgnurx.dll.a $RPM_BUILD_ROOT%{mingw32_libdir}/libregex.dll.a
+mv $RPM_BUILD_ROOT%{mingw64_libdir}/libgnurx.dll.a $RPM_BUILD_ROOT%{mingw64_libdir}/libregex.dll.a
# Drop the man pages
rm -rf $RPM_BUILD_ROOT%{mingw32_datadir}/man
+rm -rf $RPM_BUILD_ROOT%{mingw64_datadir}/man
# Drop all .la files
find $RPM_BUILD_ROOT -name "*.la" -delete
+# Win32
%files -n mingw32-libgnurx
%doc COPYING.LIB
%{mingw32_bindir}/libgnurx-0.dll
@@ -94,8 +111,21 @@ find $RPM_BUILD_ROOT -name "*.la" -delete
%files -n mingw32-libgnurx-static
%{mingw32_libdir}/libregex.a
+# Win64
+%files -n mingw64-libgnurx
+%doc COPYING.LIB
+%{mingw64_bindir}/libgnurx-0.dll
+%{mingw64_includedir}/regex.h
+%{mingw64_libdir}/libregex.dll.a
+
+%files -n mingw64-libgnurx-static
+%{mingw64_libdir}/libregex.a
+
%changelog
+* Sun Apr 8 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.5.1-12
+- Added win64 support
+
* Fri Mar 09 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.5.1-11
- Dropped .la files
More information about the scm-commits
mailing list