From 208b3e000a1266f59ad18d26b58c41779a17514d Mon Sep 17 00:00:00 2001 From: "Daniel P. Berrange" Date: Thu, 1 Jan 1970 00:00:00 +0000 Subject: [PATCH 1/1] Add macros for find-provides/requires scripts --- filesystem/mingw-defs | 4 ++-- filesystem/mingw-filesystem.spec | 5 ++++- filesystem/mingw-macros.mingw | 2 ++ 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/filesystem/mingw-defs b/filesystem/mingw-defs index b5e8cf2..511e46a 100644 --- a/filesystem/mingw-defs +++ b/filesystem/mingw-defs @@ -4,5 +4,5 @@ %define __strip %{_mingw_strip} %define __objdump %{_mingw_objdump} %define _use_internal_dependency_generator 0 -%define __find_requires /usr/lib/rpm/mingw-find-requires.sh -%define __find_provides /usr/lib/rpm/mingw-find-provides.sh +%define __find_requires %{_mingw_findrequires} +%define __find_provides %{_mingw_findprovides} diff --git a/filesystem/mingw-filesystem.spec b/filesystem/mingw-filesystem.spec index a42d12b..dd386e6 100644 --- a/filesystem/mingw-filesystem.spec +++ b/filesystem/mingw-filesystem.spec @@ -1,7 +1,7 @@ %define debug_package %{nil} Name: mingw-filesystem -Version: 22 +Version: 23 Release: 1%{?dist} Summary: MinGW base filesystem and environment @@ -109,6 +109,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Sep 11 2008 Daniel P. Berrange - 23-1 +- Add macros for find-provides/requires scripts + * Wed Sep 10 2008 Richard W.M. Jones - 22-1 - Windows provides OLE32.DLL. diff --git a/filesystem/mingw-macros.mingw b/filesystem/mingw-macros.mingw index 2945586..c4010b3 100644 --- a/filesystem/mingw-macros.mingw +++ b/filesystem/mingw-macros.mingw @@ -28,6 +28,8 @@ %_mingw_ranlib i686-pc-mingw32-ranlib %_mingw_strip i686-pc-mingw32-strip %_mingw_objdump i686-pc-mingw32-objdump +%_mingw_findprovides /usr/lib/rpm/mingw-find-provides.sh +%_mingw_findrequires /usr/lib/rpm/mingw-find-requires.sh %_mingw_configure \ PKG_CONFIG_PATH="%{_mingw_libdir}/pkgconfig" \\\ -- 1.8.3.1