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

epienbro epienbro at fedoraproject.org
Wed Mar 7 19:43:00 UTC 2012


commit 5ed0197cfc5fc315915a292c4d2ed02bdf41e51f
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date:   Wed Mar 7 20:40:05 2012 +0100

    Use mingw macros without leading underscore

 mingw-liboil.spec |   27 ++++++++++++++-------------
 1 files changed, 14 insertions(+), 13 deletions(-)
---
diff --git a/mingw-liboil.spec b/mingw-liboil.spec
index 7ade054..0ed0a80 100644
--- a/mingw-liboil.spec
+++ b/mingw-liboil.spec
@@ -1,8 +1,8 @@
-%define __strip %{_mingw32_strip}
-%define __objdump %{_mingw32_objdump}
+%define __strip %{mingw32_strip}
+%define __objdump %{mingw32_objdump}
 %define _use_internal_dependency_generator 0
-%define __find_requires %{_mingw32_findrequires}
-%define __find_provides %{_mingw32_findprovides}
+%define __find_requires %{mingw32_findrequires}
+%define __find_provides %{mingw32_findprovides}
 
 Summary: Library of Optimized Inner Loops, CPU optimized functions
 Name: mingw-liboil
@@ -73,7 +73,7 @@ extended instructions provided by modern CPUs (Altivec, MMX, SSE, etc.).
 #sed -i 's/LIBOIL_CFLAGS -maltivec/LIBOIL_CFLAGS -fno-tree-vectorize -Wa,-maltivec/' configure
 
 %build
-%{_mingw32_configure}
+%{mingw32_configure}
 # Remove standard rpath from oil-bugreport
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
 sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
@@ -87,14 +87,14 @@ rm -rf %{buildroot}
 make install DESTDIR=%{buildroot}
 
 # Remove static libraries but DON'T remove *.dll.a files.
-rm $RPM_BUILD_ROOT%{_mingw32_libdir}/liboil-0.3.a
-rm $RPM_BUILD_ROOT%{_mingw32_libdir}/liboil-0.3.la
+rm $RPM_BUILD_ROOT%{mingw32_libdir}/liboil-0.3.a
+rm $RPM_BUILD_ROOT%{mingw32_libdir}/liboil-0.3.la
 
 # Remove manpages which duplicate Fedora native.
 rm -rf $RPM_BUILD_ROOT%{_mingw_mandir} 
 
 # Remove documentation too.
-rm -rf $RPM_BUILD_ROOT%{_mingw32_datadir}/gtk-doc 
+rm -rf $RPM_BUILD_ROOT%{mingw32_datadir}/gtk-doc
 
 %clean
 rm -rf %{buildroot}
@@ -106,16 +106,17 @@ rm -rf %{buildroot}
 
 #%files devel
 #%defattr(-,root,root,-)
-%{_mingw32_bindir}/oil-bugreport.exe
-%{_mingw32_includedir}/*
-%{_mingw32_bindir}/liboil-0.3*.dll
-%{_mingw32_libdir}/liboil-0.3*.dll.a
-%{_mingw32_libdir}/pkgconfig/liboil-0.3*.pc
+%{mingw32_bindir}/oil-bugreport.exe
+%{mingw32_includedir}/*
+%{mingw32_bindir}/liboil-0.3*.dll
+%{mingw32_libdir}/liboil-0.3*.dll.a
+%{mingw32_libdir}/pkgconfig/liboil-0.3*.pc
 
 
 %changelog
 * Wed Mar 07 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 0.3.16-6
 - Renamed the source package to mingw-liboil (RHBZ #800919)
+- Use mingw macros without leading underscore
 
 * Mon Feb 27 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 0.3.16-5
 - Rebuild against the mingw-w64 toolchain


More information about the scm-commits mailing list