From 7ff6bd18c89e1f5809902740ac9bb96195ae006a Mon Sep 17 00:00:00 2001
From: Erik van Pienbroek <epienbro@fedoraproject.org>
Date: Sat, 7 May 2016 15:57:32 +0200
Subject: [PATCH] Update to 1.22

---
 .gitignore                    |   1 +
 libgpg-error-1.12.tar.bz2.sig | Bin 287 -> 0 bytes
 libgpg-error-1.22.tar.bz2.sig | Bin 0 -> 287 bytes
 mingw-libgpg-error.spec       |  24 ++++++++++++------------
 sources                       |   2 +-
 5 files changed, 14 insertions(+), 13 deletions(-)
 delete mode 100644 libgpg-error-1.12.tar.bz2.sig
 create mode 100644 libgpg-error-1.22.tar.bz2.sig

diff --git a/.gitignore b/.gitignore
index b8f754a..42c1bdf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,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
+/libgpg-error-1.22.tar.bz2
diff --git a/libgpg-error-1.12.tar.bz2.sig b/libgpg-error-1.12.tar.bz2.sig
deleted file mode 100644
index c8ee8ed33ccbeba1b1c485bec657fc7d53abd38f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

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

diff --git a/libgpg-error-1.22.tar.bz2.sig b/libgpg-error-1.22.tar.bz2.sig
new file mode 100644
index 0000000000000000000000000000000000000000..aa1fc30f95672167758851d997091b8127a9c5e6
GIT binary patch
literal 287
zcmV+)0pR|L0UQJX0SEvF1p-$c-rxWV2@oWkInqxh<F>Ls2mUQjIuaX>*Fa8$*R(MF
zqqY)L_{u(3@KHIQK3t_}wOKXOwc_Oy07>HNy@F3ZqmO3oLiIc785KE<V5Hr5P8}PI
zX9&L?Ci4hM-HyttE(uIY5ux1micqSAzyBzo&=HSrV6ro?Xg0uHoEd$S3$>qzwGO=l
zLF0(+NQ&EhhaS)13m#)=W8oP8Tr|9&jkC+NML&QdI6;8Vu8_J9X6G-5ZeOCEB37iK
zQtvn@)O%8KZBn<TvCsOs_!3o}`q)sOY7;!=GBR+k!^CJZ44$%lbYTLl&TYG;dh9Hf
lM$41mA3Pc4744SHO2k{{$E%poSd6=_`%^;KB|>D6&rgJPh%o>F

literal 0
HcmV?d00001

diff --git a/mingw-libgpg-error.spec b/mingw-libgpg-error.spec
index d363ede..842daff 100644
--- a/mingw-libgpg-error.spec
+++ b/mingw-libgpg-error.spec
@@ -1,8 +1,8 @@
 %?mingw_package_header
 
 Name:           mingw-libgpg-error
-Version:        1.12
-Release:        4%{?dist}
+Version:        1.22
+Release:        1%{?dist}
 Summary:        MinGW Windows GnuPGP error library
 
 License:        LGPLv2+
@@ -28,7 +28,7 @@ BuildRequires:  mingw64-gettext
 BuildRequires:  gettext
 
 # See comment in %%prep for details
-BuildRequires:  libtool
+BuildRequires:  libtool autoconf automake
 
 
 %description
@@ -77,19 +77,11 @@ Static library for mingw64-libgpg-error development.
 # 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
+autoreconf -i --force
 
 
 %build
 %mingw_configure --enable-shared --enable-static
-
-# Workaround a bug in libtool: http://savannah.gnu.org/support/?107959
-make -C build_win32/src gpg-error.def
-sed -i '/^$/d' build_win32/src/gpg-error.def
-
-make -C build_win64/src gpg-error.def
-sed -i '/^$/d' build_win64/src/gpg-error.def
-
 %mingw_make %{?_smp_mflags}
 
 
@@ -99,6 +91,10 @@ sed -i '/^$/d' build_win64/src/gpg-error.def
 # Drop all .la files
 find $RPM_BUILD_ROOT -name "*.la" -delete
 
+# Drop info and man pages as they're already provided by the native package
+rm -rf $RPM_BUILD_ROOT%{mingw32_infodir} $RPM_BUILD_ROOT%{mingw32_mandir}
+rm -rf $RPM_BUILD_ROOT%{mingw64_infodir} $RPM_BUILD_ROOT%{mingw64_mandir}
+
 %mingw_find_lang libgpg-error
 
 
@@ -128,6 +124,10 @@ find $RPM_BUILD_ROOT -name "*.la" -delete
 
 
 %changelog
+* Sat May 07 2016 Erik van Pienbroek <epienbro@fedoraproject.org> - 1.22-1
+- Update to 1.22
+- Fixes FTBFS
+
 * Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.12-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
 
diff --git a/sources b/sources
index 7dbf02b..debc8c3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8f0eb41a344d19ac2aa9bd101dfb9ce6  libgpg-error-1.12.tar.bz2
+83c686abe3fa223ec89f3b51da830770  libgpg-error-1.22.tar.bz2