X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;ds=sidebyside;f=libgcrypt%2Fmingw-libgcrypt.spec;h=54655c9ea1f5cf7a144b6f7470f6bd87faac0c0b;hb=8e6f1295d0f6b1fc41367e700811dd05f638ab83;hp=16260465950010163824a9657cef9df32239e928;hpb=e0a0296e132f4b0201da0d5d8cb8aa3026a0273b;p=fedora-mingw.git

diff --git a/libgcrypt/mingw-libgcrypt.spec b/libgcrypt/mingw-libgcrypt.spec
index 1626046..54655c9 100644
--- a/libgcrypt/mingw-libgcrypt.spec
+++ b/libgcrypt/mingw-libgcrypt.spec
@@ -1,22 +1,29 @@
-%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:        2%{?dist}
+Version:        1.4.3
+Release:        1%{?dist}
 Summary:        MinGW Windows gcrypt encryption library
 
 License:        LGPLv2+
 Group:          Development/Libraries
 URL:            ftp://ftp.gnupg.org/gcrypt/libgcrypt/
 Source0:        ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-%{version}.tar.bz2
+Source1:        ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-%{version}.tar.bz2.sig
+Source2:        wk@g10code.com
 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 +34,8 @@ 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
-
+PATH="%{_mingw_bindir}:$PATH" \
+%{_mingw_configure}
 make
 
 
@@ -41,6 +44,12 @@ rm -rf $RPM_BUILD_ROOT
 
 make DESTDIR=$RPM_BUILD_ROOT install
 
+# 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
@@ -48,19 +57,34 @@ 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}/hmac256.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
+
 
 %changelog
+* Mon Sep 22 2008 Daniel P. Berrange <berrange@redhat.com> - 1.4.3-1
+- Update to 1.4.3 release
+
+* 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.
+
+* 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