From: Richard W.M. Jones <"Richard W.M. Jones "> Date: Thu, 4 Sep 2008 18:56:43 +0000 (+0100) Subject: MinGW filesystem version 19: X-Git-Url: http://git.annexia.org/?a=commitdiff_plain;ds=sidebyside;h=884e4ad1b8b9ad920e0a08b9822feb617b934aac;p=fedora-mingw.git MinGW filesystem version 19: * Mon Sep 4 2008 Richard W.M. Jones - 19-1 - 'user32.dll' is provided by Windows. - Allow '-' in DLL names. - More accurate detection of DLLs in requires/provides scripts. --- diff --git a/filesystem/mingw-filesystem.spec b/filesystem/mingw-filesystem.spec index 43e3900..238a44f 100644 --- a/filesystem/mingw-filesystem.spec +++ b/filesystem/mingw-filesystem.spec @@ -1,7 +1,7 @@ %define debug_package %{nil} Name: mingw-filesystem -Version: 17 +Version: 19 Release: 1%{?dist} Summary: MinGW base filesystem and environment @@ -25,6 +25,7 @@ Requires: rpm # These are actually provided by Windows itself, or Wine. Provides: mingw(msvcrt.dll) Provides: mingw(kernel32.dll) +Provides: mingw(user32.dll) %description @@ -105,6 +106,11 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Sep 4 2008 Richard W.M. Jones - 19-1 +- 'user32.dll' is provided by Windows. +- Allow '-' in DLL names. +- More accurate detection of DLLs in requires/provides scripts. + * Mon Sep 4 2008 Richard W.M. Jones - 17-1 - Automatically add mingw-filesystem and mingw-runtime requires. - Add --prefix to _mingw_configure macro. diff --git a/filesystem/mingw-find-provides.sh b/filesystem/mingw-find-provides.sh index 2815896..eba2243 100755 --- a/filesystem/mingw-find-provides.sh +++ b/filesystem/mingw-find-provides.sh @@ -12,7 +12,7 @@ fi filelist=`sed "s/['\"]/\\\&/g"` -dlls=$(echo $filelist | tr [:blank:] '\n' | grep '\.dll') +dlls=$(echo $filelist | tr [:blank:] '\n' | grep '\.dll$') for f in $dlls; do basename=`basename $f | tr [:upper:] [:lower:]` diff --git a/filesystem/mingw-find-requires.sh b/filesystem/mingw-find-requires.sh index 66ac46f..6516500 100755 --- a/filesystem/mingw-find-requires.sh +++ b/filesystem/mingw-find-requires.sh @@ -19,10 +19,10 @@ filelist=`sed "s/['\"]/\\\&/g"` echo 'mingw-filesystem >= @VERSION@' echo 'mingw-runtime' -dlls=$(echo $filelist | tr [:blank:] '\n' | grep '\.dll') +dlls=$(echo $filelist | tr [:blank:] '\n' | grep '\.dll$') for f in $dlls; do - $OBJDUMP -p $f | grep 'DLL Name' | grep -Eo '[[:alnum:]_]+\.dll' | + $OBJDUMP -p $f | grep 'DLL Name' | grep -Eo '[-_[:alnum:]]+\.dll' | tr [:upper:] [:lower:] | sed 's/\(.*\)/mingw(\1)/' done | sort -u diff --git a/libgcrypt/mingw-libgcrypt.spec b/libgcrypt/mingw-libgcrypt.spec index 1626046..c502734 100644 --- a/libgcrypt/mingw-libgcrypt.spec +++ b/libgcrypt/mingw-libgcrypt.spec @@ -1,8 +1,8 @@ -%define __os_install_post /usr/lib/rpm/brp-compress %{nil} +%include /usr/lib/rpm/mingw-defs Name: mingw-libgcrypt Version: 1.4.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: MinGW Windows gcrypt encryption library License: LGPLv2+ @@ -11,12 +11,13 @@ URL: ftp://ftp.gnupg.org/gcrypt/libgcrypt/ Source0: ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildArch: noarch + +BuildRequires: mingw-filesystem >= 19 BuildRequires: mingw-gcc BuildRequires: mingw-binutils BuildRequires: mingw-libgpg-error -Requires: mingw-runtime -Requires: mingw-libgpg-error %description MinGW Windows gcrypt encryption library. @@ -27,12 +28,7 @@ MinGW Windows gcrypt encryption library. %build -CFLAGS="-O2 -g -Wall -pipe" \ -./configure \ - --build=%_build \ - --host=i686-pc-mingw32 \ - --prefix=%{_prefix}/i686-pc-mingw32/sys-root/mingw - +%{_mingw_configure} make @@ -48,19 +44,22 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) -%{_prefix}/i686-pc-mingw32/sys-root/mingw/bin/dumpsexp.exe -%{_prefix}/i686-pc-mingw32/sys-root/mingw/bin/libgcrypt-11.dll -%{_prefix}/i686-pc-mingw32/sys-root/mingw/bin/libgcrypt-config -%{_prefix}/i686-pc-mingw32/sys-root/mingw/lib/libgcrypt.a -%{_prefix}/i686-pc-mingw32/sys-root/mingw/lib/libgcrypt.def -%{_prefix}/i686-pc-mingw32/sys-root/mingw/lib/libgcrypt.dll.a -%{_prefix}/i686-pc-mingw32/sys-root/mingw/lib/libgcrypt.la -%{_prefix}/i686-pc-mingw32/sys-root/mingw/include/gcrypt-module.h -%{_prefix}/i686-pc-mingw32/sys-root/mingw/include/gcrypt.h -%{_prefix}/i686-pc-mingw32/sys-root/mingw/share/aclocal/libgcrypt.m4 -%{_prefix}/i686-pc-mingw32/sys-root/mingw/share/info/gcrypt.info +%{_mingw_bindir}/dumpsexp.exe +%{_mingw_bindir}/libgcrypt-11.dll +%{_mingw_bindir}/libgcrypt-config +%{_mingw_libdir}/libgcrypt.a +%{_mingw_libdir}/libgcrypt.def +%{_mingw_libdir}/libgcrypt.dll.a +%{_mingw_libdir}/libgcrypt.la +%{_mingw_includedir}/gcrypt-module.h +%{_mingw_includedir}/gcrypt.h +%{_mingw_datadir}/aclocal/libgcrypt.m4 +%{_mingw_datadir}/info/gcrypt.info %changelog +* Thu Sep 4 2008 Richard W.M. Jones - 1.4.1-3 +- Use RPM macros from mingw-filesystem. + * Tue Sep 2 2008 Daniel P. Berrange - 1.4.1-2 - List files explicitly and use custom CFLAGS