[mingw-freetype: 18/18] Use mingw macros without leading underscore
epienbro
epienbro at fedoraproject.org
Tue Mar 6 18:57:23 UTC 2012
commit b5de1796a3865e5534bcfad48b458184ffbd5f83
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date: Tue Mar 6 19:55:48 2012 +0100
Use mingw macros without leading underscore
mingw-freetype.spec | 27 ++++++++++++++-------------
1 files changed, 14 insertions(+), 13 deletions(-)
---
diff --git a/mingw-freetype.spec b/mingw-freetype.spec
index 49b4d28..dbc7239 100644
--- a/mingw-freetype.spec
+++ b/mingw-freetype.spec
@@ -1,6 +1,6 @@
-%define __strip %{_mingw32_strip}
-%define __objdump %{_mingw32_objdump}
-%define __debug_install_post %{_mingw32_debug_install_post}
+%define __strip %{mingw32_strip}
+%define __objdump %{mingw32_objdump}
+%define __debug_install_post %{mingw32_debug_install_post}
# Patented subpixel rendering disabled by default.
# Pass '--with subpixel_rendering' on rpmbuild command-line to enable.
@@ -42,7 +42,7 @@ Summary: Free and portable font rendering engine
MinGW Windows Freetype library.
-%{?_mingw32_debug_package}
+%{?mingw32_debug_package}
%prep
@@ -59,7 +59,7 @@ MinGW Windows Freetype library.
%build
-%{_mingw32_configure} --disable-static
+%{mingw32_configure} --disable-static
make %{?_smp_mflags}
# The ft2demos Makefile is hacky and doesn't understand
@@ -76,19 +76,20 @@ make DESTDIR=$RPM_BUILD_ROOT install
%files -n mingw32-freetype
%doc docs/LICENSE.TXT
-%{_mingw32_bindir}/freetype-config
-%{_mingw32_bindir}/libfreetype-6.dll
-%{_mingw32_includedir}/freetype2
-%{_mingw32_includedir}/ft2build.h
-%{_mingw32_libdir}/libfreetype.dll.a
-%{_mingw32_libdir}/libfreetype.la
-%{_mingw32_libdir}/pkgconfig/freetype2.pc
-%{_mingw32_datadir}/aclocal/freetype2.m4
+%{mingw32_bindir}/freetype-config
+%{mingw32_bindir}/libfreetype-6.dll
+%{mingw32_includedir}/freetype2
+%{mingw32_includedir}/ft2build.h
+%{mingw32_libdir}/libfreetype.dll.a
+%{mingw32_libdir}/libfreetype.la
+%{mingw32_libdir}/pkgconfig/freetype2.pc
+%{mingw32_datadir}/aclocal/freetype2.m4
%changelog
* Tue Mar 06 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.4.8-3
- Renamed the source package to mingw-freetype (RHBZ #800380)
+- Use mingw macros without leading underscore
* Mon Feb 27 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.4.8-2
- Rebuild against the mingw-w64 toolchain
More information about the scm-commits
mailing list