[mingw-pangomm: 26/26] Use mingw macros without leading underscore

Kalev Lember kalev at fedoraproject.org
Wed Mar 7 16:33:35 UTC 2012


commit 2af1ae04fbd53cc1412b57bb91836ba20ee99700
Author: Kalev Lember <kalevlember at gmail.com>
Date:   Wed Mar 7 18:30:33 2012 +0200

    Use mingw macros without leading underscore

 mingw-pangomm.spec |   23 ++++++++++++-----------
 1 files changed, 12 insertions(+), 11 deletions(-)
---
diff --git a/mingw-pangomm.spec b/mingw-pangomm.spec
index 9f31575..1c9d9c1 100644
--- a/mingw-pangomm.spec
+++ b/mingw-pangomm.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}
 
 %global apiver 1.4
 # first two digits of version
@@ -46,7 +46,7 @@ comprehensive set of widget classes that can be freely combined to
 quickly create complex user interfaces.
 
 
-%{?_mingw32_debug_package}
+%{?mingw32_debug_package}
 
 
 %prep
@@ -54,7 +54,7 @@ quickly create complex user interfaces.
 
 
 %build
-%{_mingw32_configure} --disable-static --disable-documentation
+%{mingw32_configure} --disable-static --disable-documentation
 make %{?_smp_mflags}
 
 
@@ -62,21 +62,22 @@ make %{?_smp_mflags}
 make DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" install
 
 # Remove .la files
-rm $RPM_BUILD_ROOT%{_mingw32_libdir}/*.la
+rm $RPM_BUILD_ROOT%{mingw32_libdir}/*.la
 
 
 %files -n mingw32-pangomm
 %doc COPYING COPYING.tools
-%{_mingw32_bindir}/libpangomm-%{apiver}-1.dll
-%{_mingw32_libdir}/libpangomm-%{apiver}.dll.a
-%{_mingw32_libdir}/pkgconfig/pangomm-%{apiver}.pc
-%{_mingw32_libdir}/pangomm-%{apiver}/
-%{_mingw32_includedir}/pangomm-%{apiver}
+%{mingw32_bindir}/libpangomm-%{apiver}-1.dll
+%{mingw32_libdir}/libpangomm-%{apiver}.dll.a
+%{mingw32_libdir}/pkgconfig/pangomm-%{apiver}.pc
+%{mingw32_libdir}/pangomm-%{apiver}/
+%{mingw32_includedir}/pangomm-%{apiver}
 
 
 %changelog
 * Wed Mar 07 2012 Kalev Lember <kalevlember at gmail.com> - 2.28.3-5
 - Renamed the source package to mingw-pangomm (#801010)
+- Use mingw macros without leading underscore
 
 * Tue Feb 28 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.28.3-4
 - Rebuild against the mingw-w64 toolchain


More information about the scm-commits mailing list