[mingw-xerces-c: 13/13] Use mingw macros without leading underscore

Kalev Lember kalev at fedoraproject.org
Wed Mar 7 18:21:06 UTC 2012


commit 18d168b93c0e4e1fd8e8b663c6b791c8f84a2386
Author: Kalev Lember <kalevlember at gmail.com>
Date:   Wed Mar 7 20:15:48 2012 +0200

    Use mingw macros without leading underscore

 mingw-xerces-c.spec |   23 ++++++++++++-----------
 1 files changed, 12 insertions(+), 11 deletions(-)
---
diff --git a/mingw-xerces-c.spec b/mingw-xerces-c.spec
index 9062aa1..7f6f699 100644
--- a/mingw-xerces-c.spec
+++ b/mingw-xerces-c.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-xerces-c
 Version:        3.1.1
@@ -42,7 +42,7 @@ faithful to the XML 1.0 recommendation and associated standards (DOM
 1.0, DOM 2.0. SAX 1.0, SAX 2.0, Namespaces).
 
 
-%{?_mingw32_debug_package}
+%{?mingw32_debug_package}
 
 
 %prep
@@ -51,7 +51,7 @@ faithful to the XML 1.0 recommendation and associated standards (DOM
 
 
 %build
-%{_mingw32_configure} \
+%{mingw32_configure} \
     --disable-static \
     --disable-pretty-make
 make %{?_smp_mflags}
@@ -60,22 +60,23 @@ make %{?_smp_mflags}
 %install
 make install DESTDIR=$RPM_BUILD_ROOT
 
-rm -f $RPM_BUILD_ROOT%{_mingw32_bindir}/*.exe
+rm -f $RPM_BUILD_ROOT%{mingw32_bindir}/*.exe
 
 
 %files -n mingw32-xerces-c
 %doc LICENSE
-%{_mingw32_includedir}/xercesc/
-%{_mingw32_bindir}/libxerces-c-3-1.dll
-%{_mingw32_libdir}/libxerces-c.dll.a
-%{_mingw32_libdir}/libxerces-c.la
-%{_mingw32_libdir}/pkgconfig/xerces-c.pc
+%{mingw32_includedir}/xercesc/
+%{mingw32_bindir}/libxerces-c-3-1.dll
+%{mingw32_libdir}/libxerces-c.dll.a
+%{mingw32_libdir}/libxerces-c.la
+%{mingw32_libdir}/pkgconfig/xerces-c.pc
 
 
 %changelog
 * Wed Mar 07 2012 Kalev Lember <kalevlember at gmail.com> - 3.1.1-4
 - Renamed the source package to mingw-xerces-c (#801039)
 - Modernize the spec file
+- Use mingw macros without leading underscore
 
 * Mon Feb 27 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 3.1.1-3
 - Rebuild against the mingw-w64 toolchain


More information about the scm-commits mailing list