Update to 1.22

.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

mingw-libgpg-error.spec

@@ -1,8 +1,8 @@
 %?mingw_package_header
 
 Name:           mingw-libgpg-error
-Version:        1.12
+Version:        1.22
-Release:        4%{?dist}
+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
 

sources

@@ -1 +1 @@
-8f0eb41a344d19ac2aa9bd101dfb9ce6  libgpg-error-1.12.tar.bz2
+83c686abe3fa223ec89f3b51da830770  libgpg-error-1.22.tar.bz2