[mingw-dirac: 10/11] Use mingw macros without leading underscore

epienbro epienbro at fedoraproject.org
Wed Mar 7 16:40:19 UTC 2012


commit ee02fe75971887eef3150a9b835a0e37c4107fd9
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date:   Wed Mar 7 17:38:36 2012 +0100

    Use mingw macros without leading underscore

 mingw-dirac.spec |   31 ++++++++++++++++---------------
 1 files changed, 16 insertions(+), 15 deletions(-)
---
diff --git a/mingw-dirac.spec b/mingw-dirac.spec
index ba8220f..7c353ef 100644
--- a/mingw-dirac.spec
+++ b/mingw-dirac.spec
@@ -1,8 +1,8 @@
-%global __strip %{_mingw32_strip}
-%global __objdump %{_mingw32_objdump}
+%global __strip %{mingw32_strip}
+%global __objdump %{mingw32_objdump}
 %global _use_internal_dependency_generator 0
-%global __find_requires %{_mingw32_findrequires}
-%global __find_provides %{_mingw32_findprovides}
+%global __find_requires %{mingw32_findrequires}
+%global __find_provides %{mingw32_findprovides}
 
 Name:           mingw-dirac
 Version:        1.0.2
@@ -45,7 +45,7 @@ touch util/conversion/common/setstdiomode.cpp
 # Make sure the compilation also succeeds when mingw32-cppunit is installed
 export ac_cv_header_cppunit_TestRunner_h=no
 
-%_mingw32_configure \
+%mingw32_configure \
   --program-prefix=dirac_ \
   --program-transform-name=s,dirac_dirac_,dirac_, \
   --enable-overlay \
@@ -69,20 +69,21 @@ rm -rf $RPM_BUILD_ROOT
 %files -n mingw32-dirac
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING NEWS README TODO
-%exclude %{_mingw32_bindir}/dirac_create_dirac_testfile.pl            
-%{_mingw32_bindir}/dirac_*.exe                        
-%{_mingw32_includedir}/dirac/
-%{_mingw32_bindir}/libdirac_decoder-0.dll
-%{_mingw32_bindir}/libdirac_encoder-0.dll
-%{_mingw32_libdir}/pkgconfig/dirac.pc
-%{_mingw32_libdir}/libdirac_decoder.dll.a
-%{_mingw32_libdir}/libdirac_decoder.la
-%{_mingw32_libdir}/libdirac_encoder.dll.a
-%{_mingw32_libdir}/libdirac_encoder.la
+%exclude %{mingw32_bindir}/dirac_create_dirac_testfile.pl
+%{mingw32_bindir}/dirac_*.exe
+%{mingw32_includedir}/dirac/
+%{mingw32_bindir}/libdirac_decoder-0.dll
+%{mingw32_bindir}/libdirac_encoder-0.dll
+%{mingw32_libdir}/pkgconfig/dirac.pc
+%{mingw32_libdir}/libdirac_decoder.dll.a
+%{mingw32_libdir}/libdirac_decoder.la
+%{mingw32_libdir}/libdirac_encoder.dll.a
+%{mingw32_libdir}/libdirac_encoder.la
 
 %changelog
 * Wed Mar 07 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 1.0.2-7
 - Renamed the source package to mingw-dirac (RHBZ #800859)
+- Use mingw macros without leading underscore
 
 * Mon Feb 27 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 1.0.2-6
 - Rebuild against the mingw-w64 toolchain


More information about the scm-commits mailing list