From 78b4b65f316eac3868ff524a778e653eb93333d9 Mon Sep 17 00:00:00 2001
From: Erik van Pienbroek <epienbro@fedoraproject.org>
Date: Wed, 20 Nov 2013 21:05:41 +0100
Subject: [PATCH] Update to 1.12
---
.gitignore | 1 +
libgpg-error-1.11.tar.bz2.sig | Bin 287 -> 0 bytes
libgpg-error-1.12.tar.bz2.sig | Bin 0 -> 287 bytes
mingw-libgpg-error.spec | 21 +++++++++++++++++++--
sources | 2 +-
5 files changed, 21 insertions(+), 3 deletions(-)
delete mode 100644 libgpg-error-1.11.tar.bz2.sig
create mode 100644 libgpg-error-1.12.tar.bz2.sig
diff --git a/.gitignore b/.gitignore
index df16f35..b8f754a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
libgpg-error-1.6.tar.bz2
/libgpg-error-1.10.tar.bz2
/libgpg-error-1.11.tar.bz2
+/libgpg-error-1.12.tar.bz2
diff --git a/libgpg-error-1.11.tar.bz2.sig b/libgpg-error-1.11.tar.bz2.sig
deleted file mode 100644
index 0e78b7448eefb36e911923f3585cd4f4962be21d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 287
zcmV+)0pR|L0UQJX0SEvF1p-kkFVg@D2@oWkInqxh<F-XO2mKPdIlE6lf#}ZelXc&*
zOgwbO&jV<!f^vt(@crG;bg^tY!&vdn7A_+kG}s)1MKo?!dSMP^5w(caU9<|41{B?D
z{P8Yai84AlZa1d&+$9v){tm1|dhC7`>m5-~>+ni$re#(va_hboV(Mfso~E^cbQ)^2
zQoNvhIjS0^@%yPl8s*ca!a@@7zO<#hIVa;Y*8V6_b;-lFV+U5ABc*GDvkz5*@;V>Z
zYc-R33MufN|34URFTKva&qAf>9O2|I3N^l|`ZmOpFMwM8LEKu>ZH;T9!Aq51a6Ggo
lfcp-5?YO=ERw^??wU`x34R^9LS|3y&-zrc)Y8RBdR@qx%h8q9?
diff --git a/libgpg-error-1.12.tar.bz2.sig b/libgpg-error-1.12.tar.bz2.sig
new file mode 100644
index 0000000000000000000000000000000000000000..c8ee8ed33ccbeba1b1c485bec657fc7d53abd38f
GIT binary patch
literal 287
zcmV+)0pR|L0UQJX0SEvF1p-mW&`kge2@oWkInqxh<F=Gs2mA{)3%ghWuoccn3>=xp
zcnoGb+Vn@y_Kgj(7VcJf4QN=il%7L3YDI?8cd$iz9tD<1+0f`T52g+)Dl9G6OlQkT
zF;Sj57g8}USptx^&@Du@>_P9f%b`85wdf}496=g6)>_i3G_OGY9NAaBGyH!c5*T-n
zWNHgFQy|hr_|NK;Vp@VvE9l@j%Mw7|3IFJ%8G$Vba6`QLEs{xHdjl5<H?&1^r?a9R
zW-IjMlZ0}{zU%R$*JYb~sU=kOi{Pv8d`6+tUd3)+xFrzdss#gedZbn81$+_uI`?3}
l5v2&%3g1UiE`Kp1zWilXTH{n{2*}<+Db>5rCVnnYsT2)Ae_sFq
literal 0
HcmV?d00001
diff --git a/mingw-libgpg-error.spec b/mingw-libgpg-error.spec
index 182d712..09a2b42 100644
--- a/mingw-libgpg-error.spec
+++ b/mingw-libgpg-error.spec
@@ -1,8 +1,8 @@
%?mingw_package_header
Name: mingw-libgpg-error
-Version: 1.11
-Release: 2%{?dist}
+Version: 1.12
+Release: 1%{?dist}
Summary: MinGW Windows GnuPGP error library
License: LGPLv2+
@@ -27,6 +27,9 @@ BuildRequires: mingw64-gettext
BuildRequires: gettext
+# See comment in %%prep for details
+BuildRequires: libtool
+
%description
MinGW Windows GnuPGP error library.
@@ -65,6 +68,17 @@ Static library for mingw64-libgpg-error development.
%prep
%setup -q -n libgpg-error-%{version}
+# Upstream has applied a libtool hack in libgpg-error 1.12
+# which automatically gives the libgpg-error library a
+# different filename for the win64 target so that
+# the libgpg-error DLL's for both the win32 and win64
+# targets can be installed in the same folder.
+#
+# As installing both win32 and win64 libraries in the same
+# folder is bad practice and breaks earlier behavior undo
+# this libtool hack here by re-running libtoolize
+libtoolize --copy --force
+
%build
%mingw_configure --enable-shared --enable-static
@@ -114,6 +128,9 @@ find $RPM_BUILD_ROOT -name "*.la" -delete
%changelog
+* Wed Nov 20 2013 Erik van Pienbroek <epienbro@fedoraproject.org> - 1.12-1
+- Update to 1.12
+
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.11-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
diff --git a/sources b/sources
index 8ca7ad0..7dbf02b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b9fa55b71cae73cb2e44254c2acc4e2c libgpg-error-1.11.tar.bz2
+8f0eb41a344d19ac2aa9bd101dfb9ce6 libgpg-error-1.12.tar.bz2