[mingw-hunspell: 22/22] Use mingw macros without leading underscore

Kalev Lember kalev at fedoraproject.org
Tue Mar 6 18:36:59 UTC 2012


commit ac4b835a7490d45b6c503e6d7d3d81bab20fba0e
Author: Kalev Lember <kalevlember at gmail.com>
Date:   Tue Mar 6 20:33:30 2012 +0200

    Use mingw macros without leading underscore

 mingw-hunspell.spec |   51 ++++++++++++++++++++++++++-------------------------
 1 files changed, 26 insertions(+), 25 deletions(-)
---
diff --git a/mingw-hunspell.spec b/mingw-hunspell.spec
index 7ba05e0..cc2667e 100644
--- a/mingw-hunspell.spec
+++ b/mingw-hunspell.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-hunspell
 Summary:       MinGW Windows spell checker and morphological analyzer library
@@ -51,7 +51,7 @@ Group:          Development/Libraries
 Static version of the MinGW Windows hunspell spell checking library.
 
 
-%{?_mingw32_debug_package}
+%{?mingw32_debug_package}
 
 
 %prep
@@ -65,7 +65,7 @@ done
 
 
 %build
-%{_mingw32_configure} --enable-static --enable-shared --with-ui --with-readline --enable-threads=win32
+%{mingw32_configure} --enable-static --enable-shared --with-ui --with-readline --enable-threads=win32
 make %{?_smp_mflags}
 
 
@@ -73,39 +73,40 @@ make %{?_smp_mflags}
 make DESTDIR=$RPM_BUILD_ROOT install
 
 # Drop the man pages
-rm -rf $RPM_BUILD_ROOT%{_mingw32_datadir}/man
+rm -rf $RPM_BUILD_ROOT%{mingw32_datadir}/man
 
 %find_lang hunspell
 
 
 %files -n mingw32-hunspell -f hunspell.lang
 %doc README README.myspell COPYING COPYING.LGPL COPYING.MPL AUTHORS AUTHORS.myspell license.hunspell license.myspell THANKS
-%{_mingw32_bindir}/%{_mingw32_target}-affixcompress
-%{_mingw32_bindir}/%{_mingw32_target}-analyze.exe
-%{_mingw32_bindir}/%{_mingw32_target}-chmorph.exe
-%{_mingw32_bindir}/%{_mingw32_target}-hunspell.exe
-%{_mingw32_bindir}/%{_mingw32_target}-hunzip.exe
-%{_mingw32_bindir}/%{_mingw32_target}-hzip.exe
-%{_mingw32_bindir}/%{_mingw32_target}-ispellaff2myspell
-%{_mingw32_bindir}/%{_mingw32_target}-makealias
-%{_mingw32_bindir}/%{_mingw32_target}-munch.exe
-%{_mingw32_bindir}/%{_mingw32_target}-unmunch.exe
-%{_mingw32_bindir}/%{_mingw32_target}-wordforms
-%{_mingw32_bindir}/%{_mingw32_target}-wordlist2hunspell
-%{_mingw32_bindir}/libhunspell-1.3-0.dll
-%{_mingw32_includedir}/hunspell/
-%{_mingw32_libdir}/libhunspell-1.3.dll.a
-%{_mingw32_libdir}/libhunspell-1.3.la
-%{_mingw32_libdir}/libparsers.a
-%{_mingw32_libdir}/pkgconfig/hunspell.pc
+%{mingw32_bindir}/%{mingw32_target}-affixcompress
+%{mingw32_bindir}/%{mingw32_target}-analyze.exe
+%{mingw32_bindir}/%{mingw32_target}-chmorph.exe
+%{mingw32_bindir}/%{mingw32_target}-hunspell.exe
+%{mingw32_bindir}/%{mingw32_target}-hunzip.exe
+%{mingw32_bindir}/%{mingw32_target}-hzip.exe
+%{mingw32_bindir}/%{mingw32_target}-ispellaff2myspell
+%{mingw32_bindir}/%{mingw32_target}-makealias
+%{mingw32_bindir}/%{mingw32_target}-munch.exe
+%{mingw32_bindir}/%{mingw32_target}-unmunch.exe
+%{mingw32_bindir}/%{mingw32_target}-wordforms
+%{mingw32_bindir}/%{mingw32_target}-wordlist2hunspell
+%{mingw32_bindir}/libhunspell-1.3-0.dll
+%{mingw32_includedir}/hunspell/
+%{mingw32_libdir}/libhunspell-1.3.dll.a
+%{mingw32_libdir}/libhunspell-1.3.la
+%{mingw32_libdir}/libparsers.a
+%{mingw32_libdir}/pkgconfig/hunspell.pc
 
 %files -n mingw32-hunspell-static
-%{_mingw32_libdir}/libhunspell-1.3.a
+%{mingw32_libdir}/libhunspell-1.3.a
 
 
 %changelog
 * Tue Mar 06 2012 Kalev Lember <kalevlember at gmail.com> - 1.3.2-4
 - Renamed the source package to mingw-hunspell (#800425)
+- Use mingw macros without leading underscore
 
 * Mon Feb 27 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 1.3.2-3
 - Rebuild against the mingw-w64 toolchain


More information about the scm-commits mailing list