[mingw-goocanvas2] Use mingw macros without leading underscore

Kalev Lember kalev at fedoraproject.org
Fri Mar 16 12:41:21 UTC 2012


commit 8d90f5c731f1cd5472f30ac6dc63c132452f825b
Author: Kalev Lember <kalevlember at gmail.com>
Date:   Fri Mar 16 14:33:24 2012 +0200

    Use mingw macros without leading underscore

 mingw-goocanvas2.spec |   22 +++++++++++-----------
 1 files changed, 11 insertions(+), 11 deletions(-)
---
diff --git a/mingw-goocanvas2.spec b/mingw-goocanvas2.spec
index 0a4aa72..402c412 100644
--- a/mingw-goocanvas2.spec
+++ b/mingw-goocanvas2.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}
 
 # first two digits of version
 %define release_version %(echo %{version} | awk -F. '{print $1"."$2}')
@@ -44,7 +44,7 @@ drawing.
 This package contains the MinGW Windows cross compiled GooCanvas 2.0 library.
 
 
-%{?_mingw32_debug_package}
+%{?mingw32_debug_package}
 
 
 %prep
@@ -52,7 +52,7 @@ This package contains the MinGW Windows cross compiled GooCanvas 2.0 library.
 
 
 %build
-%{_mingw32_configure} \
+%{mingw32_configure} \
   --disable-static \
   --enable-python=no
 
@@ -63,20 +63,20 @@ make %{?_smp_mflags} V=1
 make install DESTDIR=$RPM_BUILD_ROOT
 
 # Remove .la files
-rm $RPM_BUILD_ROOT%{_mingw32_libdir}/*.la
+rm $RPM_BUILD_ROOT%{mingw32_libdir}/*.la
 
 # Remove documentation which duplicates Fedora native
-rm -rf $RPM_BUILD_ROOT%{_mingw32_datadir}/gtk-doc
+rm -rf $RPM_BUILD_ROOT%{mingw32_datadir}/gtk-doc
 
 %find_lang goocanvas2
 
 
 %files -n mingw32-goocanvas2 -f goocanvas2.lang
 %doc COPYING
-%{_mingw32_bindir}/libgoocanvas-2.0-9.dll
-%{_mingw32_includedir}/goocanvas-2.0/
-%{_mingw32_libdir}/libgoocanvas-2.0.dll.a
-%{_mingw32_libdir}/pkgconfig/goocanvas-2.0.pc
+%{mingw32_bindir}/libgoocanvas-2.0-9.dll
+%{mingw32_includedir}/goocanvas-2.0/
+%{mingw32_libdir}/libgoocanvas-2.0.dll.a
+%{mingw32_libdir}/pkgconfig/goocanvas-2.0.pc
 
 
 %changelog


More information about the scm-commits mailing list