[mingw-pixman: 31/31] Use mingw macros without leading underscore

Kalev Lember kalev at fedoraproject.org
Tue Mar 6 20:20:24 UTC 2012


commit 6eaa4f84f32034f4b7524bbbae5589fd584c7fc6
Author: Kalev Lember <kalevlember at gmail.com>
Date:   Tue Mar 6 22:16:45 2012 +0200

    Use mingw macros without leading underscore

 mingw-pixman.spec |   23 ++++++++++++-----------
 1 files changed, 12 insertions(+), 11 deletions(-)
---
diff --git a/mingw-pixman.spec b/mingw-pixman.spec
index e51a245..e13df78 100644
--- a/mingw-pixman.spec
+++ b/mingw-pixman.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-pixman
 Version:        0.24.4
@@ -41,7 +41,7 @@ Group:          Development/Libraries
 Static version of the MinGW Windows Pixman library.
 
 
-%{?_mingw32_debug_package}
+%{?mingw32_debug_package}
 
 
 %prep
@@ -51,30 +51,31 @@ Static version of the MinGW Windows Pixman library.
 %build
 # Uses GTK for its testsuite, so disable this otherwise
 # we have a chicken & egg problem on mingw
-%{_mingw32_configure} --disable-gtk --enable-static --enable-shared
+%{mingw32_configure} --disable-gtk --enable-static --enable-shared
 make %{?_smp_mflags} V=1
 
 
 %install
 make DESTDIR=$RPM_BUILD_ROOT install
-rm -f $RPM_BUILD_ROOT%{_mingw32_libdir}/*.la
+rm -f $RPM_BUILD_ROOT%{mingw32_libdir}/*.la
 
 
 %files -n mingw32-pixman
 %doc COPYING
-%{_mingw32_bindir}/libpixman-1-0.dll
-%{_mingw32_includedir}/pixman-1
-%{_mingw32_libdir}/libpixman-1.dll.a
-%{_mingw32_libdir}/pkgconfig/pixman-1.pc
+%{mingw32_bindir}/libpixman-1-0.dll
+%{mingw32_includedir}/pixman-1
+%{mingw32_libdir}/libpixman-1.dll.a
+%{mingw32_libdir}/pkgconfig/pixman-1.pc
 
 
 %files -n mingw32-pixman-static
-%{_mingw32_libdir}/libpixman-1.a
+%{mingw32_libdir}/libpixman-1.a
 
 
 %changelog
 * Tue Mar 06 2012 Kalev Lember <kalevlember at gmail.com> - 0.24.4-2
 - Renamed the source package to mingw-pixman (#800445)
+- Use mingw macros without leading underscore
 
 * Tue Feb 28 2012 Kalev Lember <kalevlember at gmail.com> - 0.24.4-1
 - Update to 0.24.4


More information about the mingw mailing list