X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=libgpg-error%2Fmingw-libgpg-error.spec;h=3110408edc828df82150f1b4a89773f3cac2656c;hb=ee51cb6cecf5b6c85fa4d3cd399c942306dc06ec;hp=a3249bdc74931863c8c8bdf8b151be64ab1936d5;hpb=82bf3575ecad29001d64245ea3e960e9b217c3e0;p=fedora-mingw.git

diff --git a/libgpg-error/mingw-libgpg-error.spec b/libgpg-error/mingw-libgpg-error.spec
index a3249bd..3110408 100644
--- a/libgpg-error/mingw-libgpg-error.spec
+++ b/libgpg-error/mingw-libgpg-error.spec
@@ -1,8 +1,8 @@
-%define __os_install_post /usr/lib/rpm/brp-compress %{nil}
+%include /usr/lib/rpm/mingw-defs
 
 Name:           mingw-libgpg-error
 Version:        1.6
-Release:        1%{?dist}
+Release:        5%{?dist}
 Summary:        MinGW Windows GnuPGP error library
 
 License:        LGPLv2+
@@ -10,11 +10,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 >= 17
 BuildRequires:  mingw-gcc
 BuildRequires:  mingw-binutils
-
-Requires:       mingw-runtime
+BuildRequires:  mingw-gettext
 
 %description
 MinGW Windows GnuPGP error library.
@@ -25,12 +26,7 @@ MinGW Windows GnuPGP error library.
 
 
 %build
-CFLAGS="$RPM_OPT_FLAGS" \
-./configure \
-  --build=%_build \
-  --host=i686-pc-mingw32 \
-  --prefix=%{_prefix}/i686-pc-mingw32/sys-root/mingw
-
+%{_mingw_configure}
 make
 
 
@@ -39,6 +35,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,13 +44,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/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
-* Mon Jul  7 2008 Richard W.M. Jones <rjones@redhat.com> - 2.18.50_20080109_2-5
+* 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
+
+* Mon Jul  7 2008 Richard W.M. Jones <rjones@redhat.com> - 1.6-1
 - Initial RPM release, largely based on earlier work from several sources.