[mingw-libogg: 9/11] Use mingw macros without leading underscore

epienbro epienbro at fedoraproject.org
Wed Mar 7 19:36:09 UTC 2012


commit 49ab33ec4d0e221cef087f3569b11c11b632b8d1
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date:   Wed Mar 7 20:32:43 2012 +0100

    Use mingw macros without leading underscore

 mingw-libogg.spec |   29 +++++++++++++++--------------
 1 files changed, 15 insertions(+), 14 deletions(-)
---
diff --git a/mingw-libogg.spec b/mingw-libogg.spec
index 1b29329..551b1ea 100644
--- a/mingw-libogg.spec
+++ b/mingw-libogg.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:        The Ogg bitstream file format library
 Name:           mingw-libogg
@@ -40,29 +40,30 @@ Ogg bitstreams.
 %build
 sed -i "s/-O20/-O2/" configure
 sed -i "s/-ffast-math//" configure
-%{_mingw32_configure} --disable-static
+%{mingw32_configure} --disable-static
 make %{?_smp_mflags}
 
 %install
 make DESTDIR=$RPM_BUILD_ROOT install
 # zap docs, redundant with native package
-rm -rf $RPM_BUILD_ROOT%{_mingw32_docdir}
+rm -rf $RPM_BUILD_ROOT%{mingw32_docdir}
 
 %files -n mingw32-libogg
 %defattr(-,root,root)
 %doc AUTHORS CHANGES COPYING README
-%{_mingw32_bindir}/libogg*
-%{_mingw32_libdir}/libogg*
-%{_mingw32_libdir}/pkgconfig/ogg.pc
-%dir %{_mingw32_includedir}/ogg
-%{_mingw32_includedir}/ogg/ogg.h
-%{_mingw32_includedir}/ogg/os_types.h
-%{_mingw32_includedir}/ogg/config_types.h
-%{_mingw32_datadir}/aclocal/ogg.m4
+%{mingw32_bindir}/libogg*
+%{mingw32_libdir}/libogg*
+%{mingw32_libdir}/pkgconfig/ogg.pc
+%dir %{mingw32_includedir}/ogg
+%{mingw32_includedir}/ogg/ogg.h
+%{mingw32_includedir}/ogg/os_types.h
+%{mingw32_includedir}/ogg/config_types.h
+%{mingw32_datadir}/aclocal/ogg.m4
 
 %changelog
 * Wed Mar 07 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 1.1.4-6
 - Renamed the source package to mingw-libogg (RHBZ #800918)
+- Use mingw macros without leading underscore
 
 * Mon Feb 27 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 1.1.4-5
 - Rebuild against the mingw-w64 toolchain


More information about the scm-commits mailing list