[mingw-libglade2: 18/18] Use mingw macros without leading underscore

epienbro epienbro at fedoraproject.org
Wed Mar 7 18:01:11 UTC 2012


commit 897dffedbe30f748a508a3de40307f07da6828c8
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date:   Wed Mar 7 18:59:36 2012 +0100

    Use mingw macros without leading underscore

 mingw-libglade2.spec |   29 +++++++++++++++--------------
 1 files changed, 15 insertions(+), 14 deletions(-)
---
diff --git a/mingw-libglade2.spec b/mingw-libglade2.spec
index 9016522..51b2844 100644
--- a/mingw-libglade2.spec
+++ b/mingw-libglade2.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-libglade2
 Version:        2.6.4
@@ -56,7 +56,7 @@ Requires:       mingw32-libglade2 = %{version}-%{release}
 Static MinGW Windows Libglade2 library.
 
 
-%{?_mingw32_debug_package}
+%{?mingw32_debug_package}
 
 
 %prep
@@ -68,13 +68,13 @@ Static MinGW Windows Libglade2 library.
 autoreconf --install --force
 
 %build
-%{_mingw32_configure} --disable-gtk-doc
+%{mingw32_configure} --disable-gtk-doc
 make %{?_smp_mflags}
 
 
 %install
 make DESTDIR=$RPM_BUILD_ROOT install
-rm -rf $RPM_BUILD_ROOT/%{_mingw32_datadir}/gtk-doc/html/libglade
+rm -rf $RPM_BUILD_ROOT/%{mingw32_datadir}/gtk-doc/html/libglade
 
 # Drop all .la files
 find $RPM_BUILD_ROOT -name "*.la" -delete
@@ -82,22 +82,23 @@ find $RPM_BUILD_ROOT -name "*.la" -delete
 
 %files -n mingw32-libglade2
 %doc COPYING
-%{_mingw32_bindir}/libglade-2.0-0.dll
-%{_mingw32_bindir}/libglade-convert
-%{_mingw32_includedir}/libglade-2.0
-%{_mingw32_libdir}/libglade-2.0.dll.a
-%{_mingw32_libdir}/pkgconfig/libglade-2.0.pc
+%{mingw32_bindir}/libglade-2.0-0.dll
+%{mingw32_bindir}/libglade-convert
+%{mingw32_includedir}/libglade-2.0
+%{mingw32_libdir}/libglade-2.0.dll.a
+%{mingw32_libdir}/pkgconfig/libglade-2.0.pc
 
-%dir %{_mingw32_datadir}/xml/libglade
-%{_mingw32_datadir}/xml/libglade/glade-2.0.dtd
+%dir %{mingw32_datadir}/xml/libglade
+%{mingw32_datadir}/xml/libglade/glade-2.0.dtd
 
 %files -n mingw32-libglade2-static
-%{_mingw32_libdir}/libglade-2.0.a
+%{mingw32_libdir}/libglade-2.0.a
 
 
 %changelog
 * Wed Mar 07 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.6.4-12
 - Renamed the source package to mingw-libglade2 (RHBZ #800908)
+- Use mingw macros without leading underscore
 
 * Tue Feb 28 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.6.4-11
 - Rebuild against the mingw-w64 toolchain


More information about the scm-commits mailing list