From cb1fb41774aae34913334c2c75847fd851f005ab Mon Sep 17 00:00:00 2001 From: Erik van Pienbroek Date: Feb 27 2012 23:20:33 +0000 Subject: Use correct .def file --- diff --git a/libgcrypt-use-correct-def-file.patch b/libgcrypt-use-correct-def-file.patch new file mode 100644 index 0000000..7248025 --- /dev/null +++ b/libgcrypt-use-correct-def-file.patch @@ -0,0 +1,16 @@ +--- src/libgcrypt.def.orig 2012-02-28 00:16:33.422552508 +0100 ++++ src/libgcrypt.def 2012-02-28 00:16:59.188018940 +0100 +@@ -1,3 +1,4 @@ ++EXPORTS + ;; libgcrypt.defs - Exported symbols for W32 + ;; Copyright (C) 2003, 2007 Free Software Foundation, Inc. + ;; +@@ -21,8 +22,6 @@ + ;; Note: This file should be updated manually and the ordinals shall + ;; never be changed. Also check libgcrypt.vers and visibility.h. + +- +-EXPORTS + gcry_check_version @1 + gcry_control @2 + diff --git a/mingw32-libgcrypt.spec b/mingw32-libgcrypt.spec index d6ae3c3..e187f43 100644 --- a/mingw32-libgcrypt.spec +++ b/mingw32-libgcrypt.spec @@ -25,6 +25,10 @@ Source3: hobble-libgcrypt Patch1: libgcrypt-1.4.4-fips-no-access.patch +# Workaround a bug in libtool: +# libgcrypt-use-correct-def-file.patch +Patch2: libgcrypt-use-correct-def-file.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -51,6 +55,7 @@ This is a Windows cross-compiled version of the library. %setup -q -n libgcrypt-%{version} %{SOURCE3} %patch1 -p1 -b .no-access +%patch2 -p0 -b .def %build @@ -106,6 +111,7 @@ rm -rf $RPM_BUILD_ROOT %changelog * Mon Feb 27 2012 Erik van Pienbroek - 1.4.4-7 - Rebuild against the mingw-w64 toolchain +- Use correct .def file * Fri Jan 13 2012 Fedora Release Engineering - 1.4.4-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild