[mingw-fontconfig: 16/16] Use mingw macros without leading underscore
epienbro
epienbro at fedoraproject.org
Tue Mar 6 18:46:37 UTC 2012
commit c6736b34938765062f94fd96e4f6c85c80abf648
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date: Tue Mar 6 19:45:10 2012 +0100
Use mingw macros without leading underscore
mingw-fontconfig.spec | 47 ++++++++++++++++++++++++-----------------------
1 files changed, 24 insertions(+), 23 deletions(-)
---
diff --git a/mingw-fontconfig.spec b/mingw-fontconfig.spec
index dc9733f..c9eb716 100644
--- a/mingw-fontconfig.spec
+++ b/mingw-fontconfig.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}
Name: mingw-fontconfig
Version: 2.8.0
@@ -38,7 +38,7 @@ Summary: MinGW Windows Fontconfig library
MinGW Windows Fontconfig library.
-%{?_mingw32_debug_package}
+%{?mingw32_debug_package}
%prep
@@ -46,8 +46,8 @@ MinGW Windows Fontconfig library.
%build
-PATH="%{_mingw32_bindir}:$PATH" \
-%{_mingw32_configure} \
+PATH="%{mingw32_bindir}:$PATH" \
+%{mingw32_configure} \
--with-arch=i686 \
--disable-docs
make %{?_smp_mflags}
@@ -56,35 +56,36 @@ make %{?_smp_mflags}
%install
make DESTDIR=$RPM_BUILD_ROOT install
-rm -f $RPM_BUILD_ROOT/%{_mingw32_libdir}/charset.alias
+rm -f $RPM_BUILD_ROOT/%{mingw32_libdir}/charset.alias
# Remove static library.
-rm $RPM_BUILD_ROOT%{_mingw32_libdir}/libfontconfig.a
+rm $RPM_BUILD_ROOT%{mingw32_libdir}/libfontconfig.a
# Remove duplicate documentation.
-rm -rf $RPM_BUILD_ROOT%{_mingw32_mandir}
-rm -rf $RPM_BUILD_ROOT%{_mingw32_datadir}/doc/fontconfig
+rm -rf $RPM_BUILD_ROOT%{mingw32_mandir}
+rm -rf $RPM_BUILD_ROOT%{mingw32_datadir}/doc/fontconfig
%files -n mingw32-fontconfig
%doc COPYING
-%{_mingw32_bindir}/fc-cache.exe
-%{_mingw32_bindir}/fc-cat.exe
-%{_mingw32_bindir}/fc-list.exe
-%{_mingw32_bindir}/fc-match.exe
-%{_mingw32_bindir}/fc-query.exe
-%{_mingw32_bindir}/fc-scan.exe
-%{_mingw32_bindir}/libfontconfig-1.dll
-%{_mingw32_libdir}/fontconfig.def
-%{_mingw32_libdir}/libfontconfig.dll.a
-%{_mingw32_libdir}/libfontconfig.la
-%{_mingw32_libdir}/pkgconfig/fontconfig.pc
-%{_mingw32_includedir}/fontconfig/
-%{_mingw32_sysconfdir}/fonts/
+%{mingw32_bindir}/fc-cache.exe
+%{mingw32_bindir}/fc-cat.exe
+%{mingw32_bindir}/fc-list.exe
+%{mingw32_bindir}/fc-match.exe
+%{mingw32_bindir}/fc-query.exe
+%{mingw32_bindir}/fc-scan.exe
+%{mingw32_bindir}/libfontconfig-1.dll
+%{mingw32_libdir}/fontconfig.def
+%{mingw32_libdir}/libfontconfig.dll.a
+%{mingw32_libdir}/libfontconfig.la
+%{mingw32_libdir}/pkgconfig/fontconfig.pc
+%{mingw32_includedir}/fontconfig/
+%{mingw32_sysconfdir}/fonts/
%changelog
* Tue Mar 06 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.8.0-5
- Renamed the source package to mingw-fontconfig (RHBZ #800379)
+- Use mingw macros without leading underscore
* Mon Feb 27 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.8.0-4
- Rebuild against the mingw-w64 toolchain
More information about the scm-commits
mailing list