[mingw-cppunit: 12/13] Use mingw macros without leading underscore

epienbro epienbro at fedoraproject.org
Wed Mar 7 16:12:02 UTC 2012


commit dab978e60b2528ae84f467e3189654a85c395f0e
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date:   Wed Mar 7 17:10:05 2012 +0100

    Use mingw macros without leading underscore

 mingw-cppunit.spec |   29 +++++++++++++++--------------
 1 files changed, 15 insertions(+), 14 deletions(-)
---
diff --git a/mingw-cppunit.spec b/mingw-cppunit.spec
index e83c7fd..34ad064 100644
--- a/mingw-cppunit.spec
+++ b/mingw-cppunit.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-cppunit
 Version:        1.12.1
@@ -50,7 +50,7 @@ done
 
 
 %build
-%_mingw32_configure --disable-static --disable-doxygen
+%mingw32_configure --disable-static --disable-doxygen
 
 make %{?_smp_mflags}
 
@@ -67,20 +67,21 @@ rm -rf $RPM_BUILD_ROOT
 %files -n mingw32-cppunit
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING NEWS README THANKS ChangeLog TODO BUGS doc/FAQ
-%{_mingw32_bindir}/cppunit-config
-%{_mingw32_bindir}/DllPlugInTester.exe
-%{_mingw32_includedir}/cppunit/
-%{_mingw32_bindir}/libcppunit-*.dll
-%{_mingw32_libdir}/pkgconfig/cppunit.pc
-%{_mingw32_libdir}/libcppunit.dll.a
-%{_mingw32_libdir}/libcppunit.la
-%{_mingw32_datadir}/aclocal/cppunit.m4
-%exclude %{_mingw32_mandir}/man1/cppunit-config.1
+%{mingw32_bindir}/cppunit-config
+%{mingw32_bindir}/DllPlugInTester.exe
+%{mingw32_includedir}/cppunit/
+%{mingw32_bindir}/libcppunit-*.dll
+%{mingw32_libdir}/pkgconfig/cppunit.pc
+%{mingw32_libdir}/libcppunit.dll.a
+%{mingw32_libdir}/libcppunit.la
+%{mingw32_datadir}/aclocal/cppunit.m4
+%exclude %{mingw32_mandir}/man1/cppunit-config.1
 
 
 %changelog
 * Wed Mar 07 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 1.12.1-8
 - Renamed the source package to mingw-cppunit (RHBZ #800853)
+- Use mingw macros without leading underscore
 
 * Mon Feb 27 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 1.12.1-7
 - Rebuild against the mingw-w64 toolchain


More information about the scm-commits mailing list