[mingw-libxml++: 24/24] Use mingw macros without leading underscore

Kalev Lember kalev at fedoraproject.org
Wed Mar 7 15:44:27 UTC 2012


commit 798d096c70708095aa392d04919d04ad09a0611f
Author: Kalev Lember <kalevlember at gmail.com>
Date:   Wed Mar 7 17:39:46 2012 +0200

    Use mingw macros without leading underscore

 mingw-libxml++.spec |   29 +++++++++++++++--------------
 1 files changed, 15 insertions(+), 14 deletions(-)
---
diff --git a/mingw-libxml++.spec b/mingw-libxml++.spec
index 6820c7b..23fb2dc 100644
--- a/mingw-libxml++.spec
+++ b/mingw-libxml++.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}
 
 %global name1 libxml++
 
@@ -41,7 +41,7 @@ author is Ari Johnson and it is currently maintained by Christophe de Vienne
 and Murray Cumming.
 
 
-%{?_mingw32_debug_package}
+%{?mingw32_debug_package}
 
 
 %prep
@@ -51,30 +51,31 @@ and Murray Cumming.
 sed -i s'#\r##' examples/dom_parser/example_with_namespace.xml
 
 %build
-%{_mingw32_configure} --disable-static --disable-documentation --disable-examples
+%{mingw32_configure} --disable-static --disable-documentation --disable-examples
 make %{?_smp_mflags}
 
 
 %install
 make install DESTDIR=$RPM_BUILD_ROOT
-rm -rf $RPM_BUILD_ROOT%{_mingw32_docdir}
-rm -f $RPM_BUILD_ROOT%{_mingw32_libdir}/*.la
+rm -rf $RPM_BUILD_ROOT%{mingw32_docdir}
+rm -f $RPM_BUILD_ROOT%{mingw32_libdir}/*.la
 
 
 %files -n mingw32-%{name1}
 %doc AUTHORS COPYING NEWS README ChangeLog
-%{_mingw32_bindir}/libxml++-2.6-2.dll
-%{_mingw32_includedir}/*
-%{_mingw32_libdir}/libxml++-2.6.dll.a
-%{_mingw32_libdir}/pkgconfig/*
-%dir %{_mingw32_libdir}/%{name1}-2.6
-%dir %{_mingw32_libdir}/%{name1}-2.6/include
-%{_mingw32_libdir}/%{name1}-2.6/include/*.h
+%{mingw32_bindir}/libxml++-2.6-2.dll
+%{mingw32_includedir}/*
+%{mingw32_libdir}/libxml++-2.6.dll.a
+%{mingw32_libdir}/pkgconfig/*
+%dir %{mingw32_libdir}/%{name1}-2.6
+%dir %{mingw32_libdir}/%{name1}-2.6/include
+%{mingw32_libdir}/%{name1}-2.6/include/*.h
 
 
 %changelog
 * Wed Mar 07 2012 Kalev Lember <kalevlember at gmail.com> - 2.34.2-5
 - Renamed the source package to mingw-libxml++ (#800926)
+- Use mingw macros without leading underscore
 
 * Tue Feb 28 2012 Kalev Lember <kalevlember at gmail.com> - 2.34.2-4
 - Remove the .la files


More information about the scm-commits mailing list