[mingw-pango: 37/37] Use mingw macros without leading underscore

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

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

    Use mingw macros without leading underscore

 mingw-pango.spec |  123 +++++++++++++++++++++++++++---------------------------
 1 files changed, 62 insertions(+), 61 deletions(-)
---
diff --git a/mingw-pango.spec b/mingw-pango.spec
index 972a32b..88aa612 100644
--- a/mingw-pango.spec
+++ b/mingw-pango.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-pango
 Version:        1.29.5
@@ -19,7 +19,7 @@ Source0:        http://download.gnome.org/sources/pango/1.29/pango-%{version}.ta
 # it won't ever change much.
 #
 # If you want to rebuild this, do:
-# wine %{_mingw32_bindir}/pango-querymodules.exe > pango.modules
+# wine %{mingw32_bindir}/pango-querymodules.exe > pango.modules
 Source1:        pango.modules
 
 Patch1000:      pango_enable_static_build.patch
@@ -65,7 +65,7 @@ Group:          Development/Libraries
 Static version of the MinGW Windows Pango library.
 
 
-%{?_mingw32_debug_package}
+%{?mingw32_debug_package}
 
 
 %prep
@@ -75,88 +75,89 @@ Static version of the MinGW Windows Pango library.
 
 %build
 # Need to run the correct version of glib-mkenums.
-PATH=%{_mingw32_bindir}:$PATH \
-%{_mingw32_configure} --enable-static --enable-shared
+PATH=%{mingw32_bindir}:$PATH \
+%{mingw32_configure} --enable-static --enable-shared
 make %{?_smp_mflags}
 
 
 %install
 make DESTDIR=$RPM_BUILD_ROOT install
 
-mkdir -p $RPM_BUILD_ROOT%{_mingw32_sysconfdir}/pango/
-cp %{SOURCE1} $RPM_BUILD_ROOT%{_mingw32_sysconfdir}/pango/
+mkdir -p $RPM_BUILD_ROOT%{mingw32_sysconfdir}/pango/
+cp %{SOURCE1} $RPM_BUILD_ROOT%{mingw32_sysconfdir}/pango/
 
-rm -f $RPM_BUILD_ROOT/%{_mingw32_libdir}/charset.alias
-rm -f $RPM_BUILD_ROOT/%{_mingw32_libdir}/*.def
+rm -f $RPM_BUILD_ROOT/%{mingw32_libdir}/charset.alias
+rm -f $RPM_BUILD_ROOT/%{mingw32_libdir}/*.def
 
-rm -rf $RPM_BUILD_ROOT/%{_mingw32_mandir}/man1
-rm -rf $RPM_BUILD_ROOT%{_mingw32_datadir}/gtk-doc
+rm -rf $RPM_BUILD_ROOT/%{mingw32_mandir}/man1
+rm -rf $RPM_BUILD_ROOT%{mingw32_datadir}/gtk-doc
 
 # Drop all .la files
 find $RPM_BUILD_ROOT -name "*.la" -delete
 
 # Drop the .dll.a files for all modules as nothing is supposed
 # to link directly to these modules
-rm -f $RPM_BUILD_ROOT%{_mingw32_libdir}/pango/1.6.0/modules/*.dll.a
+rm -f $RPM_BUILD_ROOT%{mingw32_libdir}/pango/1.6.0/modules/*.dll.a
 
 
 %files -n mingw32-pango
 %doc COPYING
-%{_mingw32_bindir}/libpango-1.0-0.dll
-%{_mingw32_bindir}/libpangocairo-1.0-0.dll
-%{_mingw32_bindir}/libpangoft2-1.0-0.dll
-%{_mingw32_bindir}/libpangowin32-1.0-0.dll
-%{_mingw32_bindir}/pango-querymodules.exe
-%{_mingw32_bindir}/pango-view.exe
-%{_mingw32_includedir}/pango-1.0/
-%{_mingw32_libdir}/libpango-1.0.dll.a
-%{_mingw32_libdir}/libpangocairo-1.0.dll.a
-%{_mingw32_libdir}/libpangoft2-1.0.dll.a
-%{_mingw32_libdir}/libpangowin32-1.0.dll.a
-%dir %{_mingw32_libdir}/pango
-%dir %{_mingw32_libdir}/pango/1.6.0
-%dir %{_mingw32_libdir}/pango/1.6.0/modules
-%{_mingw32_libdir}/pango/1.6.0/modules/pango-basic-win32.dll
-%{_mingw32_libdir}/pango/1.6.0/modules/pango-arabic-lang.dll
-%{_mingw32_libdir}/pango/1.6.0/modules/pango-indic-lang.dll
-%{_mingw32_libdir}/pango/1.6.0/modules/pango-arabic-fc.dll
-%{_mingw32_libdir}/pango/1.6.0/modules/pango-basic-fc.dll
-%{_mingw32_libdir}/pango/1.6.0/modules/pango-hangul-fc.dll
-%{_mingw32_libdir}/pango/1.6.0/modules/pango-hebrew-fc.dll
-%{_mingw32_libdir}/pango/1.6.0/modules/pango-indic-fc.dll
-%{_mingw32_libdir}/pango/1.6.0/modules/pango-khmer-fc.dll
-%{_mingw32_libdir}/pango/1.6.0/modules/pango-syriac-fc.dll
-%{_mingw32_libdir}/pango/1.6.0/modules/pango-thai-fc.dll
-%{_mingw32_libdir}/pango/1.6.0/modules/pango-tibetan-fc.dll
-%{_mingw32_libdir}/pkgconfig/pango.pc
-%{_mingw32_libdir}/pkgconfig/pangocairo.pc
-%{_mingw32_libdir}/pkgconfig/pangoft2.pc
-%{_mingw32_libdir}/pkgconfig/pangowin32.pc
-%{_mingw32_sysconfdir}/pango/
+%{mingw32_bindir}/libpango-1.0-0.dll
+%{mingw32_bindir}/libpangocairo-1.0-0.dll
+%{mingw32_bindir}/libpangoft2-1.0-0.dll
+%{mingw32_bindir}/libpangowin32-1.0-0.dll
+%{mingw32_bindir}/pango-querymodules.exe
+%{mingw32_bindir}/pango-view.exe
+%{mingw32_includedir}/pango-1.0/
+%{mingw32_libdir}/libpango-1.0.dll.a
+%{mingw32_libdir}/libpangocairo-1.0.dll.a
+%{mingw32_libdir}/libpangoft2-1.0.dll.a
+%{mingw32_libdir}/libpangowin32-1.0.dll.a
+%dir %{mingw32_libdir}/pango
+%dir %{mingw32_libdir}/pango/1.6.0
+%dir %{mingw32_libdir}/pango/1.6.0/modules
+%{mingw32_libdir}/pango/1.6.0/modules/pango-basic-win32.dll
+%{mingw32_libdir}/pango/1.6.0/modules/pango-arabic-lang.dll
+%{mingw32_libdir}/pango/1.6.0/modules/pango-indic-lang.dll
+%{mingw32_libdir}/pango/1.6.0/modules/pango-arabic-fc.dll
+%{mingw32_libdir}/pango/1.6.0/modules/pango-basic-fc.dll
+%{mingw32_libdir}/pango/1.6.0/modules/pango-hangul-fc.dll
+%{mingw32_libdir}/pango/1.6.0/modules/pango-hebrew-fc.dll
+%{mingw32_libdir}/pango/1.6.0/modules/pango-indic-fc.dll
+%{mingw32_libdir}/pango/1.6.0/modules/pango-khmer-fc.dll
+%{mingw32_libdir}/pango/1.6.0/modules/pango-syriac-fc.dll
+%{mingw32_libdir}/pango/1.6.0/modules/pango-thai-fc.dll
+%{mingw32_libdir}/pango/1.6.0/modules/pango-tibetan-fc.dll
+%{mingw32_libdir}/pkgconfig/pango.pc
+%{mingw32_libdir}/pkgconfig/pangocairo.pc
+%{mingw32_libdir}/pkgconfig/pangoft2.pc
+%{mingw32_libdir}/pkgconfig/pangowin32.pc
+%{mingw32_sysconfdir}/pango/
 
 
 %files -n mingw32-pango-static
-%{_mingw32_libdir}/libpango-1.0.a
-%{_mingw32_libdir}/libpangocairo-1.0.a
-%{_mingw32_libdir}/libpangoft2-1.0.a
-%{_mingw32_libdir}/libpangowin32-1.0.a
-%{_mingw32_libdir}/pango/1.6.0/modules/pango-basic-win32.a
-%{_mingw32_libdir}/pango/1.6.0/modules/pango-arabic-lang.a
-%{_mingw32_libdir}/pango/1.6.0/modules/pango-indic-lang.a
-%{_mingw32_libdir}/pango/1.6.0/modules/pango-arabic-fc.a
-%{_mingw32_libdir}/pango/1.6.0/modules/pango-basic-fc.a
-%{_mingw32_libdir}/pango/1.6.0/modules/pango-hangul-fc.a
-%{_mingw32_libdir}/pango/1.6.0/modules/pango-hebrew-fc.a
-%{_mingw32_libdir}/pango/1.6.0/modules/pango-indic-fc.a
-%{_mingw32_libdir}/pango/1.6.0/modules/pango-khmer-fc.a
-%{_mingw32_libdir}/pango/1.6.0/modules/pango-syriac-fc.a
-%{_mingw32_libdir}/pango/1.6.0/modules/pango-thai-fc.a
-%{_mingw32_libdir}/pango/1.6.0/modules/pango-tibetan-fc.a
+%{mingw32_libdir}/libpango-1.0.a
+%{mingw32_libdir}/libpangocairo-1.0.a
+%{mingw32_libdir}/libpangoft2-1.0.a
+%{mingw32_libdir}/libpangowin32-1.0.a
+%{mingw32_libdir}/pango/1.6.0/modules/pango-basic-win32.a
+%{mingw32_libdir}/pango/1.6.0/modules/pango-arabic-lang.a
+%{mingw32_libdir}/pango/1.6.0/modules/pango-indic-lang.a
+%{mingw32_libdir}/pango/1.6.0/modules/pango-arabic-fc.a
+%{mingw32_libdir}/pango/1.6.0/modules/pango-basic-fc.a
+%{mingw32_libdir}/pango/1.6.0/modules/pango-hangul-fc.a
+%{mingw32_libdir}/pango/1.6.0/modules/pango-hebrew-fc.a
+%{mingw32_libdir}/pango/1.6.0/modules/pango-indic-fc.a
+%{mingw32_libdir}/pango/1.6.0/modules/pango-khmer-fc.a
+%{mingw32_libdir}/pango/1.6.0/modules/pango-syriac-fc.a
+%{mingw32_libdir}/pango/1.6.0/modules/pango-thai-fc.a
+%{mingw32_libdir}/pango/1.6.0/modules/pango-tibetan-fc.a
   
 
 %changelog
 * Tue Mar 06 2012 Kalev Lember <kalevlember at gmail.com> - 1.29.5-3
 - Renamed the source package to mingw-pango (#800444)
+- Use mingw macros without leading underscore
 
 * Tue Feb 28 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 1.29.5-2
 - Rebuild against the mingw-w64 toolchain

More information about the scm-commits mailing list