[mingw-atk: 27/27] Use mingw macros without leading underscore

epienbro epienbro at fedoraproject.org
Tue Mar 6 16:31:06 UTC 2012


commit 142ac99d602e429dc9f3a4cf6951437765db3847
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date:   Tue Mar 6 17:28:28 2012 +0100

    Use mingw macros without leading underscore

 mingw-atk.spec |   26 +++++++++++++-------------
 1 files changed, 13 insertions(+), 13 deletions(-)
---
diff --git a/mingw-atk.spec b/mingw-atk.spec
index 900ad91..3d22d05 100644
--- a/mingw-atk.spec
+++ b/mingw-atk.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-atk
 Version:        2.2.0
@@ -56,7 +56,7 @@ Static version of the MinGW Windows Atk library.
 
 
 %build
-%{_mingw32_configure} --enable-static --enable-shared
+%{mingw32_configure} --enable-static --enable-shared
 make %{?_smp_mflags}
 
 
@@ -64,28 +64,28 @@ make %{?_smp_mflags}
 make DESTDIR=$RPM_BUILD_ROOT install
 
 # Native Fedora package removes this file, so we do the same.
-rm -f $RPM_BUILD_ROOT/%{_mingw32_libdir}/charset.alias
+rm -f $RPM_BUILD_ROOT/%{mingw32_libdir}/charset.alias
 
 # Documentation duplicates what is in the native Fedora package.
-rm -rf $RPM_BUILD_ROOT/%{_mingw32_datadir}/gtk-doc
+rm -rf $RPM_BUILD_ROOT/%{mingw32_datadir}/gtk-doc
 
 # Remove this file, only used while creating the DLL.
 # See: https://bugzilla.redhat.com/show_bug.cgi?id=467409#c8
-rm $RPM_BUILD_ROOT%{_mingw32_libdir}/atk-1.0.def
+rm $RPM_BUILD_ROOT%{mingw32_libdir}/atk-1.0.def
 
 %find_lang atk10
 
 
 %files -n mingw32-atk -f atk10.lang
 %doc COPYING
-%{_mingw32_bindir}/libatk-1.0-0.dll
-%{_mingw32_includedir}/atk-1.0
-%{_mingw32_libdir}/libatk-1.0.dll.a
-%{_mingw32_libdir}/libatk-1.0.la
-%{_mingw32_libdir}/pkgconfig/atk.pc
+%{mingw32_bindir}/libatk-1.0-0.dll
+%{mingw32_includedir}/atk-1.0
+%{mingw32_libdir}/libatk-1.0.dll.a
+%{mingw32_libdir}/libatk-1.0.la
+%{mingw32_libdir}/pkgconfig/atk.pc
 
 %files -n mingw32-atk-static
-%{_mingw32_libdir}/libatk-1.0.a
+%{mingw32_libdir}/libatk-1.0.a
 
   
 %changelog


More information about the scm-commits mailing list