[mingw-libtasn1] Use mingw macros without leading underscore

Kalev Lember kalev at fedoraproject.org
Tue Mar 20 09:02:52 UTC 2012


commit f3f6fff4e455ff24963d46f863ce600d311fd8c6
Author: Kalev Lember <kalevlember at gmail.com>
Date:   Tue Mar 20 10:11:55 2012 +0200

    Use mingw macros without leading underscore

 mingw-libtasn1.spec |   26 +++++++++++++-------------
 1 files changed, 13 insertions(+), 13 deletions(-)
---
diff --git a/mingw-libtasn1.spec b/mingw-libtasn1.spec
index cd6d4ec..1e63d22 100644
--- a/mingw-libtasn1.spec
+++ b/mingw-libtasn1.spec
@@ -1,6 +1,6 @@
-%global __strip %{_mingw32_strip}
-%global __objdump %{_mingw32_objdump}
-%define __debug_install_post %{_mingw32_debug_install_post}
+%global __strip %{mingw32_strip}
+%global __objdump %{mingw32_objdump}
+%define __debug_install_post %{mingw32_debug_install_post}
 
 Name:           mingw-libtasn1
 Version:        2.9
@@ -37,7 +37,7 @@ libtasn1 is the ASN.1 library used in GNUTLS.
 This package contains the MinGW Windows cross compiled libtasn1 library.
 
 
-%{?_mingw32_debug_package}
+%{?mingw32_debug_package}
 
 
 %prep
@@ -45,7 +45,7 @@ This package contains the MinGW Windows cross compiled libtasn1 library.
 
 
 %build
-%{_mingw32_configure} --disable-static
+%{mingw32_configure} --disable-static
 make %{?_smp_mflags}
 
 
@@ -53,20 +53,20 @@ make %{?_smp_mflags}
 make install DESTDIR=$RPM_BUILD_ROOT
 
 # Remove documentation
-rm -rf $RPM_BUILD_ROOT%{_mingw32_datadir}/info/
-rm -rf $RPM_BUILD_ROOT%{_mingw32_mandir}
+rm -rf $RPM_BUILD_ROOT%{mingw32_datadir}/info/
+rm -rf $RPM_BUILD_ROOT%{mingw32_mandir}
 # Remove .la files
-rm -f $RPM_BUILD_ROOT%{_mingw32_libdir}/*.la
+rm -f $RPM_BUILD_ROOT%{mingw32_libdir}/*.la
 # Remove utilities
-rm -f $RPM_BUILD_ROOT%{_mingw32_bindir}/*.exe
+rm -f $RPM_BUILD_ROOT%{mingw32_bindir}/*.exe
 
 
 %files -n mingw32-libtasn1
 %doc COPYING.LIB
-%{_mingw32_bindir}/libtasn1-3.dll
-%{_mingw32_includedir}/libtasn1.h
-%{_mingw32_libdir}/libtasn1.dll.a
-%{_mingw32_libdir}/pkgconfig/libtasn1.pc
+%{mingw32_bindir}/libtasn1-3.dll
+%{mingw32_includedir}/libtasn1.h
+%{mingw32_libdir}/libtasn1.dll.a
+%{mingw32_libdir}/pkgconfig/libtasn1.pc
 
 
 %changelog


More information about the scm-commits mailing list