[mingw-plotmm: 18/18] Use mingw macros without leading underscore

Kalev Lember kalev at fedoraproject.org
Wed Mar 7 16:46:34 UTC 2012


commit becac57f6c9505027d64d7d07c1a66e33e44b5d5
Author: Kalev Lember <kalevlember at gmail.com>
Date:   Wed Mar 7 18:43:34 2012 +0200

    Use mingw macros without leading underscore

 mingw-plotmm.spec |   23 ++++++++++++-----------
 1 files changed, 12 insertions(+), 11 deletions(-)
---
diff --git a/mingw-plotmm.spec b/mingw-plotmm.spec
index f878842..10d61c8 100644
--- a/mingw-plotmm.spec
+++ b/mingw-plotmm.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-plotmm
 Version:        0.1.2
@@ -44,7 +44,7 @@ contains widgets which are primarily useful for technical and
 scientifical purposes.  Initially, this is a 2-D plotting widget.
 
 
-%{?_mingw32_debug_package}
+%{?mingw32_debug_package}
 
 
 %prep
@@ -60,14 +60,14 @@ automake -a -c
 
 
 %build
-%{_mingw32_configure} --disable-static
+%{mingw32_configure} --disable-static
 make %{?_smp_mflags}
 
 
 %install
 make DESTDIR=${RPM_BUILD_ROOT} install
-rm $RPM_BUILD_ROOT%{_mingw32_bindir}/curves.exe
-rm $RPM_BUILD_ROOT%{_mingw32_bindir}/simple.exe
+rm $RPM_BUILD_ROOT%{mingw32_bindir}/curves.exe
+rm $RPM_BUILD_ROOT%{mingw32_bindir}/simple.exe
 
 # Drop all .la files
 find $RPM_BUILD_ROOT -name "*.la" -delete
@@ -75,15 +75,16 @@ find $RPM_BUILD_ROOT -name "*.la" -delete
 
 %files -n mingw32-plotmm
 %doc AUTHORS COPYING ChangeLog README
-%{_mingw32_bindir}/libplotmm-0.dll
-%{_mingw32_libdir}/libplotmm.dll.a
-%{_mingw32_libdir}/pkgconfig/plotmm.pc
-%{_mingw32_includedir}/plotmm
+%{mingw32_bindir}/libplotmm-0.dll
+%{mingw32_libdir}/libplotmm.dll.a
+%{mingw32_libdir}/pkgconfig/plotmm.pc
+%{mingw32_includedir}/plotmm
 
 
 %changelog
 * Wed Mar 07 2012 Kalev Lember <kalevlember at gmail.com> - 0.1.2-13
 - Renamed the source package to mingw-plotmm (#801014)
+- Use mingw macros without leading underscore
 
 * Tue Feb 28 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 0.1.2-12
 - Rebuild against the mingw-w64 toolchain


More information about the scm-commits mailing list