X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=libgpg-error%2Fmingw32-libgpg-error.spec;fp=libgpg-error%2Fmingw-libgpg-error.spec;h=0523f05ab82273ab0c5e4cd5eada50b5b8d4d8b4;hb=14bb5f7a7a8110b0c21eef08c532bd7f18c42e8e;hp=8ad9b19fd2f44b767f865c9e6cf4cf9a93437390;hpb=bfb2581bd208d7f921e65ea388bf6f4f3f90adfb;p=fedora-mingw.git

diff --git a/libgpg-error/mingw-libgpg-error.spec b/libgpg-error/mingw32-libgpg-error.spec
similarity index 61%
rename from libgpg-error/mingw-libgpg-error.spec
rename to libgpg-error/mingw32-libgpg-error.spec
index 8ad9b19..0523f05 100644
--- a/libgpg-error/mingw-libgpg-error.spec
+++ b/libgpg-error/mingw32-libgpg-error.spec
@@ -1,12 +1,12 @@
-%define __strip %{_mingw_strip}
-%define __objdump %{_mingw_objdump}
+%define __strip %{_mingw32_strip}
+%define __objdump %{_mingw32_objdump}
 %define _use_internal_dependency_generator 0
-%define __find_requires %{_mingw_findrequires}
-%define __find_provides %{_mingw_findprovides}
+%define __find_requires %{_mingw32_findrequires}
+%define __find_provides %{_mingw32_findprovides}
 
-Name:           mingw-libgpg-error
+Name:           mingw32-libgpg-error
 Version:        1.6
-Release:        6%{?dist}
+Release:        8%{?dist}
 Summary:        MinGW Windows GnuPGP error library
 
 License:        LGPLv2+
@@ -18,10 +18,10 @@ 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-gettext
+BuildRequires:  mingw32-filesystem >= 27
+BuildRequires:  mingw32-gcc
+BuildRequires:  mingw32-binutils
+BuildRequires:  mingw32-gettext
 
 %description
 MinGW Windows GnuPGP error library.
@@ -32,7 +32,7 @@ MinGW Windows GnuPGP error library.
 
 
 %build
-%{_mingw_configure}
+%{_mingw32_configure}
 make
 
 
@@ -41,7 +41,7 @@ rm -rf $RPM_BUILD_ROOT
 
 make DESTDIR=$RPM_BUILD_ROOT install
 
-rm $RPM_BUILD_ROOT%{_mingw_libdir}/libgpg-error.a
+rm $RPM_BUILD_ROOT%{_mingw32_libdir}/libgpg-error.a
 
 
 %clean
@@ -50,17 +50,21 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
-%{_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/*
+%{_mingw32_bindir}/gpg-error-config
+%{_mingw32_bindir}/gpg-error.exe
+%{_mingw32_bindir}/libgpg-error-0.dll
+%{_mingw32_libdir}/libgpg-error.dll.a
+%{_mingw32_libdir}/libgpg-error.la
+%{_mingw32_includedir}/gpg-error.h
+%{_mingw32_datadir}/locale/*/LC_MESSAGES/libgpg-error.mo
+%{_mingw32_datadir}/aclocal/gpg-error.m4
+%{_mingw32_datadir}/common-lisp/source/gpg-error/*
 
 %changelog
+* Mon Sep 22 2008 Richard W.M. Jones <rjones@redhat.com> - 1.6-8
+- Rename mingw -> mingw32.
+- Depends on mingw-filesystem 27.
+
 * Mon Sep 22 2008 Daniel P. Berrange <berrange@redhat.com> - 1.6-6
 - Added signature source file & correct URLs