[mingw-opensc: 24/24] Use mingw macros without leading underscore
Kalev Lember
kalev at fedoraproject.org
Wed Mar 7 16:20:58 UTC 2012
commit 504b059c0f58b51980ce698779c71336705ead69
Author: Kalev Lember <kalevlember at gmail.com>
Date: Wed Mar 7 18:16:54 2012 +0200
Use mingw macros without leading underscore
mingw-opensc.spec | 39 ++++++++++++++++++++-------------------
1 files changed, 20 insertions(+), 19 deletions(-)
---
diff --git a/mingw-opensc.spec b/mingw-opensc.spec
index ab46181..a57358c 100644
--- a/mingw-opensc.spec
+++ b/mingw-opensc.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-opensc
Version: 0.12.2
@@ -48,17 +48,17 @@ every software/card that does so, too.
This is the MinGW cross-compiled Windows library.
-%{?_mingw32_debug_package}
+%{?mingw32_debug_package}
%prep
%setup -q -n opensc-%{version}
-sed -i -e 's|/usr/local/towitoko/lib/|%{_mingw32_libdir}/ctapi/|' etc/opensc.conf.in
+sed -i -e 's|/usr/local/towitoko/lib/|%{mingw32_libdir}/ctapi/|' etc/opensc.conf.in
%build
-%{_mingw32_configure} --disable-static \
+%{mingw32_configure} --disable-static \
--disable-assert \
--enable-pcsc
make %{?_smp_mflags} V=1
@@ -66,32 +66,33 @@ make %{?_smp_mflags} V=1
%install
make install DESTDIR=$RPM_BUILD_ROOT
-install -Dpm 644 etc/opensc.conf $RPM_BUILD_ROOT%{_mingw32_sysconfdir}/opensc.conf
+install -Dpm 644 etc/opensc.conf $RPM_BUILD_ROOT%{mingw32_sysconfdir}/opensc.conf
# Remove docs which duplicate the ones in native package
-rm -rf $RPM_BUILD_ROOT%{_mingw32_datadir}/doc/opensc
+rm -rf $RPM_BUILD_ROOT%{mingw32_datadir}/doc/opensc
# Remove unneeded files
-rm -f $RPM_BUILD_ROOT%{_mingw32_libdir}/*.la
-rm -f $RPM_BUILD_ROOT%{_mingw32_libdir}/*.def
-rm -f $RPM_BUILD_ROOT%{_mingw32_libdir}/*.dll.a
+rm -f $RPM_BUILD_ROOT%{mingw32_libdir}/*.la
+rm -f $RPM_BUILD_ROOT%{mingw32_libdir}/*.def
+rm -f $RPM_BUILD_ROOT%{mingw32_libdir}/*.dll.a
%files -n mingw32-opensc
%doc COPYING
-%config(noreplace) %{_mingw32_sysconfdir}/opensc.conf
-%{_mingw32_bindir}/*.exe
-%{_mingw32_bindir}/libopensc-3.dll
-%{_mingw32_bindir}/onepin-opensc-pkcs11.dll
-%{_mingw32_bindir}/opensc-pkcs11.dll
-%{_mingw32_bindir}/pkcs11-spy.dll
-%{_mingw32_datadir}/opensc/
-%{_mingw32_sbindir}/opensc-install.bat
+%config(noreplace) %{mingw32_sysconfdir}/opensc.conf
+%{mingw32_bindir}/*.exe
+%{mingw32_bindir}/libopensc-3.dll
+%{mingw32_bindir}/onepin-opensc-pkcs11.dll
+%{mingw32_bindir}/opensc-pkcs11.dll
+%{mingw32_bindir}/pkcs11-spy.dll
+%{mingw32_datadir}/opensc/
+%{mingw32_sbindir}/opensc-install.bat
%changelog
* Wed Mar 07 2012 Kalev Lember <kalevlember at gmail.com> - 0.12.2-4
- Renamed the source package to mingw-opensc (#801009)
+- Use mingw macros without leading underscore
* Mon Feb 27 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 0.12.2-3
- Rebuild against the mingw-w64 toolchain
More information about the scm-commits
mailing list