[mingw-libp11: 19/21] Use mingw macros without leading underscore
epienbro
epienbro at fedoraproject.org
Wed Mar 7 19:49:29 UTC 2012
commit beb45cab11e6215631e7bf944f4ee375754565f8
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date: Wed Mar 7 20:45:53 2012 +0100
Use mingw macros without leading underscore
mingw-libp11.spec | 29 +++++++++++++++--------------
1 files changed, 15 insertions(+), 14 deletions(-)
---
diff --git a/mingw-libp11.spec b/mingw-libp11.spec
index dbe9f84..42c2b7f 100644
--- a/mingw-libp11.spec
+++ b/mingw-libp11.spec
@@ -1,9 +1,9 @@
-%global __strip %{_mingw32_strip}
-%global __objdump %{_mingw32_objdump}
+%global __strip %{mingw32_strip}
+%global __objdump %{mingw32_objdump}
%global _use_internal_dependency_generator 0
-%global __find_requires %{_mingw32_findrequires}
-%global __find_provides %{_mingw32_findprovides}
-%define __debug_install_post %{_mingw32_debug_install_post}
+%global __find_requires %{mingw32_findrequires}
+%global __find_provides %{mingw32_findprovides}
+%define __debug_install_post %{mingw32_debug_install_post}
Name: mingw-libp11
Version: 0.2.8
@@ -44,7 +44,7 @@ make using PKCS#11 implementations easier.
This is the MinGW cross-compiled Windows library.
-%{?_mingw32_debug_package}
+%{?mingw32_debug_package}
%prep
@@ -52,7 +52,7 @@ This is the MinGW cross-compiled Windows library.
%build
-%{_mingw32_configure} --disable-static
+%{mingw32_configure} --disable-static
make %{?_smp_mflags}
@@ -62,7 +62,7 @@ make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
# Remove documentation from a wrong place.
# We install it with %%doc instead.
-rm -rf $RPM_BUILD_ROOT%{_mingw32_docdir}/libp11
+rm -rf $RPM_BUILD_ROOT%{mingw32_docdir}/libp11
%clean
@@ -72,17 +72,18 @@ rm -rf $RPM_BUILD_ROOT
%files -n mingw32-libp11
%defattr(-,root,root,-)
%doc COPYING NEWS
-%{_mingw32_bindir}/libp11-2.dll
-%{_mingw32_libdir}/libp11-2.dll.def
-%{_mingw32_libdir}/libp11.dll.a
-%{_mingw32_libdir}/libp11.la
-%{_mingw32_libdir}/pkgconfig/*
-%{_mingw32_includedir}/*
+%{mingw32_bindir}/libp11-2.dll
+%{mingw32_libdir}/libp11-2.dll.def
+%{mingw32_libdir}/libp11.dll.a
+%{mingw32_libdir}/libp11.la
+%{mingw32_libdir}/pkgconfig/*
+%{mingw32_includedir}/*
%changelog
* Wed Mar 07 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 0.2.8-4
- Renamed the source package to mingw-libp11 (RHBZ #800920)
+- Use mingw macros without leading underscore
* Mon Feb 27 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 0.2.8-3
- Rebuild against the mingw-w64 toolchain
More information about the scm-commits
mailing list