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 0e78b74..0000000 Binary files a/libgpg-error-1.11.tar.bz2.sig and /dev/null differ diff --git a/libgpg-error-1.12.tar.bz2.sig b/libgpg-error-1.12.tar.bz2.sig new file mode 100644 index 0000000..c8ee8ed Binary files /dev/null and b/libgpg-error-1.12.tar.bz2.sig differ 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 - 1.12-1 +- Update to 1.12 + * Sat Aug 03 2013 Fedora Release Engineering - 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