From dc2977300f7f6e8078106d065f8af8ace62a2fcc Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Wed, 7 Mar 2012 18:35:12 +0200 Subject: [PATCH] Use mingw macros without leading underscore --- mingw-pcre.spec | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/mingw-pcre.spec b/mingw-pcre.spec index ea86f47..4e5eeeb 100644 --- a/mingw-pcre.spec +++ b/mingw-pcre.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-pcre Version: 8.10 @@ -24,7 +24,7 @@ BuildRequires: mingw32-binutils # New libtool to get rid of rpath BuildRequires: autoconf, automake, libtool -%{?_mingw32_debug_package} +%{?mingw32_debug_package} %description Cross compiled Perl-compatible regular expression library for use with mingw32. @@ -64,24 +64,24 @@ for F in ChangeLog; do done %build -%{_mingw32_configure} --enable-utf8 --enable-unicode-properties --disable-static +%{mingw32_configure} --enable-utf8 --enable-unicode-properties --disable-static make %{?_smp_mflags} %install make DESTDIR=$RPM_BUILD_ROOT install -rm -rf $RPM_BUILD_ROOT%{_mingw32_datadir}/doc/* -rm -rf $RPM_BUILD_ROOT%{_mingw32_datadir}/man/* +rm -rf $RPM_BUILD_ROOT%{mingw32_datadir}/doc/* +rm -rf $RPM_BUILD_ROOT%{mingw32_datadir}/man/* %files -n mingw32-pcre -%{_mingw32_bindir}/pcre-config -%{_mingw32_bindir}/pcregrep.exe -%{_mingw32_bindir}/pcretest.exe -%{_mingw32_bindir}/libpcre*.dll -%{_mingw32_libdir}/libpcre*.dll.a -%{_mingw32_libdir}/libpcre*.la -%{_mingw32_libdir}/pkgconfig/libpcre*.pc -%{_mingw32_includedir}/*.h +%{mingw32_bindir}/pcre-config +%{mingw32_bindir}/pcregrep.exe +%{mingw32_bindir}/pcretest.exe +%{mingw32_bindir}/libpcre*.dll +%{mingw32_libdir}/libpcre*.dll.a +%{mingw32_libdir}/libpcre*.la +%{mingw32_libdir}/pkgconfig/libpcre*.pc +%{mingw32_includedir}/*.h %doc AUTHORS COPYING LICENCE NEWS README ChangeLog @@ -89,6 +89,7 @@ rm -rf $RPM_BUILD_ROOT%{_mingw32_datadir}/man/* * Wed Mar 07 2012 Kalev Lember - 8.10-7 - Renamed the source package to mingw-pcre (#801011) - Modernize the spec file +- Use mingw macros without leading underscore * Mon Feb 27 2012 Erik van Pienbroek - 8.10-6 - Rebuild against the mingw-w64 toolchain