X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=libgcrypt%2Fmingw-libgcrypt.spec;h=7ecd67bcbaf3ed5ae768903d20fc3ead0e570e9a;hb=16ffcf3cdb53ca9c405ab173577a545ee74486d4;hp=483e6c85614ece78468f94d83e55d808da2b9fa8;hpb=ee51cb6cecf5b6c85fa4d3cd399c942306dc06ec;p=fedora-mingw.git

diff --git a/libgcrypt/mingw-libgcrypt.spec b/libgcrypt/mingw-libgcrypt.spec
index 483e6c8..7ecd67b 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:        4%{?dist}
+Release:        6%{?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,10 +42,12 @@ rm -rf $RPM_BUILD_ROOT
 
 make DESTDIR=$RPM_BUILD_ROOT install
 
-rm -f $RPM_BUILD_ROOT%{_mingw_datadir}/info/dir
-
+# Remove the static library.
 rm $RPM_BUILD_ROOT%{_mingw_libdir}/libgcrypt.a
 
+# Remove info pages which duplicate what is in Fedora natively.
+rm -rf $RPM_BUILD_ROOT%{_mingw_infodir}
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -57,9 +64,15 @@ rm -rf $RPM_BUILD_ROOT
 %{_mingw_includedir}/gcrypt-module.h
 %{_mingw_includedir}/gcrypt.h
 %{_mingw_datadir}/aclocal/libgcrypt.m4
-%{_mingw_datadir}/info/gcrypt.info
+
 
 %changelog
+* Sun Sep 21 2008 Richard W.M. Jones <rjones@redhat.com> - 1.4.1-6
+- Remove info pages.
+
+* 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.