From 9296f1d3c5573f6ec41999d568c348b9dcd2fed1 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Tue, 6 Mar 2012 21:45:27 +0200 Subject: [PATCH] Use mingw macros without leading underscore --- mingw-libtiff.spec | 37 +++++++++++++++++++------------------ 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/mingw-libtiff.spec b/mingw-libtiff.spec index 7e6ee3e..f5588ba 100644 --- a/mingw-libtiff.spec +++ b/mingw-libtiff.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} Summary: MinGW Windows port of the LibTIFF library Name: mingw-libtiff @@ -56,7 +56,7 @@ Group: Development/Libraries Static version of the MinGW Windows LibTIFF library. -%{?_mingw32_debug_package} +%{?mingw32_debug_package} %prep @@ -73,8 +73,8 @@ autoheader %build -export MINGW32_CFLAGS="%{_mingw32_cflags} -fno-strict-aliasing" -%{_mingw32_configure} --enable-static --enable-shared +export MINGW32_CFLAGS="%{mingw32_cflags} -fno-strict-aliasing" +%{mingw32_configure} --enable-static --enable-shared make %{?_smp_mflags} @@ -82,32 +82,33 @@ make %{?_smp_mflags} make DESTDIR=$RPM_BUILD_ROOT install # remove docs -rm -rf $RPM_BUILD_ROOT%{_mingw32_datadir}/doc -rm -rf $RPM_BUILD_ROOT%{_mingw32_mandir} +rm -rf $RPM_BUILD_ROOT%{mingw32_datadir}/doc +rm -rf $RPM_BUILD_ROOT%{mingw32_mandir} # remove binaries -rm -f $RPM_BUILD_ROOT%{_mingw32_bindir}/*.exe +rm -f $RPM_BUILD_ROOT%{mingw32_bindir}/*.exe %files -n mingw32-libtiff %doc COPYRIGHT README RELEASE-DATE VERSION TODO ChangeLog -%{_mingw32_bindir}/libtiff-3.dll -%{_mingw32_bindir}/libtiffxx-3.dll -%{_mingw32_includedir}/* -%{_mingw32_libdir}/libtiff.dll.a -%{_mingw32_libdir}/libtiffxx.dll.a -%{_mingw32_libdir}/libtiff.la -%{_mingw32_libdir}/libtiffxx.la +%{mingw32_bindir}/libtiff-3.dll +%{mingw32_bindir}/libtiffxx-3.dll +%{mingw32_includedir}/* +%{mingw32_libdir}/libtiff.dll.a +%{mingw32_libdir}/libtiffxx.dll.a +%{mingw32_libdir}/libtiff.la +%{mingw32_libdir}/libtiffxx.la %files -n mingw32-libtiff-static -%{_mingw32_libdir}/libtiff.a -%{_mingw32_libdir}/libtiffxx.a +%{mingw32_libdir}/libtiff.a +%{mingw32_libdir}/libtiffxx.a %changelog * Tue Mar 06 2012 Kalev Lember - 3.9.5-5 - Renamed the source package to mingw-libtiff (#800437) - Spec clean up +- Use mingw macros without leading underscore * Mon Feb 27 2012 Erik van Pienbroek - 3.9.5-4 - Rebuild against the mingw-w64 toolchain