[mingw-libgcrypt: 15/15] Use mingw macros without leading underscore

Kalev Lember kalev at fedoraproject.org
Tue Mar 6 19:13:17 UTC 2012


commit 26aad1f5cdb69afc83c2c925e27ea33a335ba62f
Author: Kalev Lember <kalevlember at gmail.com>
Date:   Tue Mar 6 21:10:24 2012 +0200

    Use mingw macros without leading underscore

 mingw-libgcrypt.spec |   28 ++++++++++++++--------------
 1 files changed, 14 insertions(+), 14 deletions(-)
---
diff --git a/mingw-libgcrypt.spec b/mingw-libgcrypt.spec
index ea93b90..e5edd6a 100644
--- a/mingw-libgcrypt.spec
+++ b/mingw-libgcrypt.spec
@@ -1,5 +1,5 @@
-%define __strip %{_mingw32_strip}
-%define __objdump %{_mingw32_objdump}
+%define __strip %{mingw32_strip}
+%define __objdump %{mingw32_objdump}
 
 %define run_tests 0
 
@@ -64,7 +64,7 @@ This is a Windows cross-compiled version of the library.
 
 
 %build
-%{_mingw32_configure} \
+%{mingw32_configure} \
   --disable-static \
   --enable-pubkey-ciphers='dsa elgamal rsa'
 make %{?_smp_mflags}
@@ -88,22 +88,22 @@ popd
 make DESTDIR=$RPM_BUILD_ROOT install
 
 # Remove info pages which duplicate what is in Fedora natively.
-rm -rf $RPM_BUILD_ROOT%{_mingw32_infodir}
+rm -rf $RPM_BUILD_ROOT%{mingw32_infodir}
 
-rm $RPM_BUILD_ROOT%{_mingw32_libdir}/libgcrypt.def
+rm $RPM_BUILD_ROOT%{mingw32_libdir}/libgcrypt.def
 
 
 %files -n mingw32-libgcrypt
 %doc COPYING COPYING.LIB
-%{_mingw32_bindir}/dumpsexp.exe
-%{_mingw32_bindir}/hmac256.exe
-%{_mingw32_bindir}/libgcrypt-11.dll
-%{_mingw32_bindir}/libgcrypt-config
-%{_mingw32_libdir}/libgcrypt.dll.a
-%{_mingw32_libdir}/libgcrypt.la
-%{_mingw32_includedir}/gcrypt-module.h
-%{_mingw32_includedir}/gcrypt.h
-%{_mingw32_datadir}/aclocal/libgcrypt.m4
+%{mingw32_bindir}/dumpsexp.exe
+%{mingw32_bindir}/hmac256.exe
+%{mingw32_bindir}/libgcrypt-11.dll
+%{mingw32_bindir}/libgcrypt-config
+%{mingw32_libdir}/libgcrypt.dll.a
+%{mingw32_libdir}/libgcrypt.la
+%{mingw32_includedir}/gcrypt-module.h
+%{mingw32_includedir}/gcrypt.h
+%{mingw32_datadir}/aclocal/libgcrypt.m4
 
 
 %changelog


More information about the scm-commits mailing list