commit a8dbd482315185a2b11f9603b0310dde52c53e23
Author: Erik van Pienbroek <epienbro(a)fedoraproject.org>
Date: Sat Mar 31 21:56:20 2012 +0200
Simplify the use of mingw macros
- Simplify the use of mingw macros
- Improved the win64 patch a bit (shouldn't have any visible effects)
...correct-datatype-for-GetProcessWorkingSet.patch | 2 +-
mingw-libgcrypt.spec | 13 ++++++++-----
2 files changed, 9 insertions(+), 6 deletions(-)
---
diff --git a/libgcrypt-mingw64-use-correct-datatype-for-GetProcessWorkingSet.patch
b/libgcrypt-mingw64-use-correct-datatype-for-GetProcessWorkingSet.patch
index 7d0c9fb..86924eb 100644
--- a/libgcrypt-mingw64-use-correct-datatype-for-GetProcessWorkingSet.patch
+++ b/libgcrypt-mingw64-use-correct-datatype-for-GetProcessWorkingSet.patch
@@ -5,7 +5,7 @@
HANDLE handle;
FILETIME creationTime, exitTime, kernelTime, userTime;
- DWORD minimumWorkingSetSize, maximumWorkingSetSize;
-+ PSIZE_T minimumWorkingSetSize, maximumWorkingSetSize;
++ SIZE_T minimumWorkingSetSize, maximumWorkingSetSize;
handle = GetCurrentThread ();
GetThreadTimes (handle, &creationTime, &exitTime,
diff --git a/mingw-libgcrypt.spec b/mingw-libgcrypt.spec
index f4516e3..d9470cb 100644
--- a/mingw-libgcrypt.spec
+++ b/mingw-libgcrypt.spec
@@ -1,13 +1,10 @@
%?mingw_package_header
-%global mingw_build_win32 1
-%global mingw_build_win64 1
-
%define run_tests 0
Name: mingw-libgcrypt
Version: 1.5.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: MinGW Windows gcrypt encryption library
License: LGPLv2+ and GPLv2+
@@ -23,6 +20,8 @@ Source0: libgcrypt-%{version}-hobbled.tar.bz2
Source2: wk(a)g10code.com
Source3: hobble-libgcrypt
+# Upstream is unwilling to accept this patch...
+#
https://bugs.g10code.com/gnupg/issue1360
Patch0: libgcrypt-mingw64-use-correct-datatype-for-GetProcessWorkingSet.patch
# Workaround a bug in libtool:
@@ -105,7 +104,7 @@ popd
%install
-%mingw_make_install DESTDIR=$RPM_BUILD_ROOT
+%mingw_make install DESTDIR=$RPM_BUILD_ROOT
# Remove info pages which duplicate what is in Fedora natively.
rm -rf $RPM_BUILD_ROOT%{mingw32_infodir}
@@ -142,6 +141,10 @@ rm $RPM_BUILD_ROOT%{mingw64_libdir}/libgcrypt.la
%changelog
+* Sat Mar 31 2012 Erik van Pienbroek <epienbro(a)fedoraproject.org> - 1.5.0-2
+- Simplify the use of mingw macros
+- Improved the win64 patch a bit (shouldn't have any visible effects)
+
* Sun Mar 11 2012 Erik van Pienbroek <epienbro(a)fedoraproject.org> - 1.5.0-1
- Update to 1.5.0
- Added win64 support