Add mingw(ole32.dll) fake provide

[fedora-mingw.git] / libgcrypt / mingw-libgcrypt.spec

diff --git a/libgcrypt/mingw-libgcrypt.spec b/libgcrypt/mingw-libgcrypt.spec
index 1626046..c502734 100644 (file)
--- 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 <rjones@redhat.com> - 1.4.1-3
+- Use RPM macros from mingw-filesystem.
+
 * Tue Sep  2 2008 Daniel P. Berrange <berrange@redhat.com> - 1.4.1-2
 - List files explicitly and use custom CFLAGS