X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=libgcrypt%2Fmingw-libgcrypt.spec;h=eab76c7f97f37d36399020a4913a73eaa40d4fdd;hb=953796ee56dce98b99edc8ccfb6a4527653de4f7;hp=c5027347b98190f8e3de4364b217e19257f650e6;hpb=884e4ad1b8b9ad920e0a08b9822feb617b934aac;p=fedora-mingw.git

diff --git a/libgcrypt/mingw-libgcrypt.spec b/libgcrypt/mingw-libgcrypt.spec
index c502734..eab76c7 100644
--- a/libgcrypt/mingw-libgcrypt.spec
+++ b/libgcrypt/mingw-libgcrypt.spec
@@ -1,8 +1,12 @@
-%include /usr/lib/rpm/mingw-defs
+%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:        3%{?dist}
+Release:        5%{?dist}
 Summary:        MinGW Windows gcrypt encryption library
 
 License:        LGPLv2+
@@ -13,7 +17,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 
-BuildRequires:  mingw-filesystem >= 19
+BuildRequires:  mingw-filesystem >= 23
 BuildRequires:  mingw-gcc
 BuildRequires:  mingw-binutils
 BuildRequires:  mingw-libgpg-error
@@ -28,6 +32,7 @@ MinGW Windows gcrypt encryption library.
 
 
 %build
+PATH="%{_mingw_bindir}:$PATH" \
 %{_mingw_configure}
 make
 
@@ -37,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
@@ -47,7 +56,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_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
@@ -57,6 +65,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_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.