X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=libgpg-error%2Fmingw-libgpg-error.spec;h=f10adcdd2d4f02a48e38b979d5c3102adc73da3a;hb=1eb03aa41e8de77677dc7ea0b8e66d06001c901b;hp=5eac3e7bb2d26bf470223f3028e696f78535353b;hpb=e0a0296e132f4b0201da0d5d8cb8aa3026a0273b;p=fedora-mingw.git

diff --git a/libgpg-error/mingw-libgpg-error.spec b/libgpg-error/mingw-libgpg-error.spec
index 5eac3e7..f10adcd 100644
--- a/libgpg-error/mingw-libgpg-error.spec
+++ b/libgpg-error/mingw-libgpg-error.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-libgpg-error
 Version:        1.6
-Release:        2%{?dist}
+Release:        5%{?dist}
 Summary:        MinGW Windows GnuPGP error library
 
 License:        LGPLv2+
@@ -10,11 +14,12 @@ Group:          Development/Libraries
 URL:            ftp://ftp.gnupg.org/GnuPG/libgpg-error
 Source0:        ftp://ftp.gnupg.org/GnuPG/libgpg-error/libgpg-error-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildArch:      noarch
 
+BuildRequires:  mingw-filesystem >= 23
 BuildRequires:  mingw-gcc
 BuildRequires:  mingw-binutils
-
-Requires:       mingw-runtime
+BuildRequires:  mingw-gettext
 
 %description
 MinGW Windows GnuPGP error library.
@@ -25,12 +30,7 @@ MinGW Windows GnuPGP error 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
 
 
@@ -39,6 +39,8 @@ rm -rf $RPM_BUILD_ROOT
 
 make DESTDIR=$RPM_BUILD_ROOT install
 
+rm $RPM_BUILD_ROOT%{_mingw_libdir}/libgpg-error.a
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -46,17 +48,27 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
-%{_prefix}/i686-pc-mingw32/sys-root/mingw/bin/gpg-error-config
-%{_prefix}/i686-pc-mingw32/sys-root/mingw/bin/gpg-error.exe
-%{_prefix}/i686-pc-mingw32/sys-root/mingw/bin/libgpg-error-0.dll
-%{_prefix}/i686-pc-mingw32/sys-root/mingw/lib/libgpg-error.a
-%{_prefix}/i686-pc-mingw32/sys-root/mingw/lib/libgpg-error.dll.a
-%{_prefix}/i686-pc-mingw32/sys-root/mingw/lib/libgpg-error.la
-%{_prefix}/i686-pc-mingw32/sys-root/mingw/include/gpg-error.h
-%{_prefix}/i686-pc-mingw32/sys-root/mingw/share/aclocal/gpg-error.m4
-%{_prefix}/i686-pc-mingw32/sys-root/mingw/share/common-lisp/source/gpg-error/*
+%{_mingw_bindir}/gpg-error-config
+%{_mingw_bindir}/gpg-error.exe
+%{_mingw_bindir}/libgpg-error-0.dll
+%{_mingw_libdir}/libgpg-error.dll.a
+%{_mingw_libdir}/libgpg-error.la
+%{_mingw_includedir}/gpg-error.h
+%{_mingw_datadir}/locale/*/LC_MESSAGES/libgpg-error.mo
+%{_mingw_datadir}/aclocal/gpg-error.m4
+%{_mingw_datadir}/common-lisp/source/gpg-error/*
 
 %changelog
+* Wed Sep 10 2008 Richard W.M. Jones <rjones@redhat.com> - 1.6-5
+- Remove static libraries.
+
+* Fri Sep  5 2008 Daniel P. Berrange <berrange@redhat.com> - 1.6-4
+- Add gettext support
+
+* Thu Sep  4 2008 Richard W.M. Jones <rjones@redhat.com> - 1.6-3
+- Use mingw-filesystem RPM macros.
+- BuildArch is noarch.
+
 * Tue Sep  2 2008 Daniel P. Berrange <berrange@redhat.com> - 1.6-2
 - List files explicitly and use custom CFLAGS