[mingw-cairomm: 21/21] Use mingw macros without leading underscore
epienbro
epienbro at fedoraproject.org
Wed Mar 7 15:52:03 UTC 2012
commit fd927a4ab63258f95660b838796889c95407b812
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date: Wed Mar 7 16:50:13 2012 +0100
Use mingw macros without leading underscore
mingw-cairomm.spec | 39 ++++++++++++++++++++-------------------
1 files changed, 20 insertions(+), 19 deletions(-)
---
diff --git a/mingw-cairomm.spec b/mingw-cairomm.spec
index e50ae8c..af351a6 100644
--- a/mingw-cairomm.spec
+++ b/mingw-cairomm.spec
@@ -1,6 +1,6 @@
-%global __strip %{_mingw32_strip}
-%global __objdump %{_mingw32_objdump}
-%define __debug_install_post %{_mingw32_debug_install_post}
+%global __strip %{mingw32_strip}
+%global __objdump %{mingw32_objdump}
+%define __debug_install_post %{mingw32_debug_install_post}
Name: mingw-cairomm
Version: 1.10.0
@@ -36,7 +36,7 @@ of cairo with an interface familiar to C++ developers, including use of the
Standard Template Library where it makes sense.
-%{?_mingw32_debug_package}
+%{?mingw32_debug_package}
%prep
@@ -44,34 +44,35 @@ Standard Template Library where it makes sense.
%build
-%{_mingw32_configure} --disable-static --disable-documentation
+%{mingw32_configure} --disable-static --disable-documentation
make %{?_smp_mflags}
%install
make DESTDIR=$RPM_BUILD_ROOT install
-rm -rf $RPM_BUILD_ROOT/%{_mingw32_datadir}/{devhelp,doc}
-rm $RPM_BUILD_ROOT%{_mingw32_libdir}/*.la
+rm -rf $RPM_BUILD_ROOT/%{mingw32_datadir}/{devhelp,doc}
+rm $RPM_BUILD_ROOT%{mingw32_libdir}/*.la
%files -n mingw32-cairomm
%doc COPYING
-%{_mingw32_bindir}/libcairomm-1.0-1.dll
-%{_mingw32_libdir}/libcairomm-1.0.dll.a
-%{_mingw32_libdir}/pkgconfig/cairomm-1.0.pc
-%{_mingw32_libdir}/pkgconfig/cairomm-ft-1.0.pc
-%{_mingw32_libdir}/pkgconfig/cairomm-pdf-1.0.pc
-%{_mingw32_libdir}/pkgconfig/cairomm-png-1.0.pc
-%{_mingw32_libdir}/pkgconfig/cairomm-ps-1.0.pc
-%{_mingw32_libdir}/pkgconfig/cairomm-svg-1.0.pc
-%{_mingw32_libdir}/pkgconfig/cairomm-win32-1.0.pc
-%{_mingw32_libdir}/pkgconfig/cairomm-win32-font-1.0.pc
-%{_mingw32_includedir}/cairomm-1.0
-%{_mingw32_libdir}/cairomm-1.0/
+%{mingw32_bindir}/libcairomm-1.0-1.dll
+%{mingw32_libdir}/libcairomm-1.0.dll.a
+%{mingw32_libdir}/pkgconfig/cairomm-1.0.pc
+%{mingw32_libdir}/pkgconfig/cairomm-ft-1.0.pc
+%{mingw32_libdir}/pkgconfig/cairomm-pdf-1.0.pc
+%{mingw32_libdir}/pkgconfig/cairomm-png-1.0.pc
+%{mingw32_libdir}/pkgconfig/cairomm-ps-1.0.pc
+%{mingw32_libdir}/pkgconfig/cairomm-svg-1.0.pc
+%{mingw32_libdir}/pkgconfig/cairomm-win32-1.0.pc
+%{mingw32_libdir}/pkgconfig/cairomm-win32-font-1.0.pc
+%{mingw32_includedir}/cairomm-1.0
+%{mingw32_libdir}/cairomm-1.0/
%changelog
* Wed Mar 07 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 1.10.0-5
- Renamed the source package to mingw-cairomm (RHBZ #800848)
+- Use mingw macros without leading underscore
* Tue Feb 28 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 1.10.0-4
- Rebuild against the mingw-w64 toolchain
More information about the scm-commits
mailing list