mingw -> mingw32 rename and miscellanous related fixes.

[fedora-mingw.git] / libgcrypt / mingw32-libgcrypt.spec

diff --git a/libgcrypt/mingw-libgcrypt.spec b/libgcrypt/mingw32-libgcrypt.spec
similarity index 63%
rename from libgcrypt/mingw-libgcrypt.spec
rename to libgcrypt/mingw32-libgcrypt.spec
index 54655c9..b2e42ab 100644 (file)
--- a/libgcrypt/mingw-libgcrypt.spec
+++ b/libgcrypt/mingw32-libgcrypt.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-libgcrypt
+Name:           mingw32-libgcrypt
 Version:        1.4.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        MinGW Windows gcrypt encryption library
 
 License:        LGPLv2+
@@ -19,10 +19,10 @@ 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
+BuildRequires:  mingw32-filesystem >= 23
+BuildRequires:  mingw32-gcc
+BuildRequires:  mingw32-binutils
+BuildRequires:  mingw32-libgpg-error
 
 
 %description
@@ -34,8 +34,8 @@ MinGW Windows gcrypt encryption library.
 
 
 %build
-PATH="%{_mingw_bindir}:$PATH" \
-%{_mingw_configure}
+PATH="%{_mingw32_bindir}:$PATH" \
+%{_mingw32_configure}
 make
 
 
@@ -45,10 +45,10 @@ rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
 
 # Remove the static library.
-rm $RPM_BUILD_ROOT%{_mingw_libdir}/libgcrypt.a
+rm $RPM_BUILD_ROOT%{_mingw32_libdir}/libgcrypt.a
 
 # Remove info pages which duplicate what is in Fedora natively.
-rm -rf $RPM_BUILD_ROOT%{_mingw_infodir}
+rm -rf $RPM_BUILD_ROOT%{_mingw32_infodir}
 
 
 %clean
@@ -57,19 +57,22 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
-%{_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
+%{_mingw32_bindir}/dumpsexp.exe
+%{_mingw32_bindir}/hmac256.exe
+%{_mingw32_bindir}/libgcrypt-11.dll
+%{_mingw32_bindir}/libgcrypt-config
+%{_mingw32_libdir}/libgcrypt.def
+%{_mingw32_libdir}/libgcrypt.dll.a
+%{_mingw32_libdir}/libgcrypt.la
+%{_mingw32_includedir}/gcrypt-module.h
+%{_mingw32_includedir}/gcrypt.h
+%{_mingw32_datadir}/aclocal/libgcrypt.m4
 
 
 %changelog
+* Wed Sep 24 2008 Richard W.M. Jones <rjones@redhat.com> - 1.4.3-2
+- Rename mingw -> mingw32.
+
 * Mon Sep 22 2008 Daniel P. Berrange <berrange@redhat.com> - 1.4.3-1
 - Update to 1.4.3 release