X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;ds=sidebyside;f=libgcrypt%2Fmingw-libgcrypt.spec;h=eab76c7f97f37d36399020a4913a73eaa40d4fdd;hb=890e0586a07f6bb7e4df8956324e744d19f0de05;hp=85e78377780c08e3c0f8d99629ed6292792b8a34;hpb=fb69ab8f17fd385a78248724047780ee706fac0f;p=fedora-mingw.git

diff --git a/libgcrypt/mingw-libgcrypt.spec b/libgcrypt/mingw-libgcrypt.spec
index 85e7837..eab76c7 100644
--- a/libgcrypt/mingw-libgcrypt.spec
+++ b/libgcrypt/mingw-libgcrypt.spec
@@ -1,8 +1,12 @@
-%define __os_install_post /usr/lib/rpm/brp-compress %{nil}
+%define __strip %{_mingw_strip}
+%define __objdump %{_mingw_objdump}
+%define _use_internal_dependency_generator 0
+%define __find_requires %{_mingw_findrequires}
+%define __find_provides %{_mingw_findprovides}
 
 Name:           mingw-libgcrypt
 Version:        1.4.1
-Release:        1%{?dist}
+Release:        5%{?dist}
 Summary:        MinGW Windows gcrypt encryption library
 
 License:        LGPLv2+
@@ -11,12 +15,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 >= 23
 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 +32,8 @@ MinGW Windows gcrypt encryption library.
 
 
 %build
-CFLAGS="$RPM_OPT_FLAGS -fno-stack-protector" \
-./configure \
-  --build=%_build \
-  --host=i686-pc-mingw32 \
-  --prefix=%{_prefix}/i686-pc-mingw32/sys-root/mingw
-
+PATH="%{_mingw_bindir}:$PATH" \
+%{_mingw_configure}
 make
 
 
@@ -41,6 +42,10 @@ rm -rf $RPM_BUILD_ROOT
 
 make DESTDIR=$RPM_BUILD_ROOT install
 
+rm -f $RPM_BUILD_ROOT%{_mingw_datadir}/info/dir
+
+rm $RPM_BUILD_ROOT%{_mingw_libdir}/libgcrypt.a
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -48,13 +53,29 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
-%{_prefix}/i686-pc-mingw32/sys-root/mingw/bin/*
-%{_prefix}/i686-pc-mingw32/sys-root/mingw/lib/*
-%{_prefix}/i686-pc-mingw32/sys-root/mingw/include/*
-%{_prefix}/i686-pc-mingw32/sys-root/mingw/share/aclocal/*
-%{_prefix}/i686-pc-mingw32/sys-root/mingw/share/info/*
-
+%{_mingw_bindir}/dumpsexp.exe
+%{_mingw_bindir}/libgcrypt-11.dll
+%{_mingw_bindir}/libgcrypt-config
+%{_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 11 2008 Daniel P. Berrange <berrange@redhat.com> - 1.4.1-5
+- Set PATH so it finds gpg-error-config
+
+* Wed Sep 10 2008 Richard W.M. Jones <rjones@redhat.com> - 1.4.1-4
+- Remove static library.
+
+* 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
+
 * Mon Jul  7 2008 Richard W.M. Jones <rjones@redhat.com> - 1.4.1-1
 - Initial RPM release, largely based on earlier work from several sources.