From db2c2c5bc30a5be21141e756dfee97d015230c14 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 1 Jan 1970 00:00:00 +0000 Subject: [PATCH] On 64 bit install in /usr/lib/rpm always. --- filesystem/mingw-filesystem.spec | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/filesystem/mingw-filesystem.spec b/filesystem/mingw-filesystem.spec index 238a44f..317d73e 100644 --- a/filesystem/mingw-filesystem.spec +++ b/filesystem/mingw-filesystem.spec @@ -1,7 +1,7 @@ %define debug_package %{nil} Name: mingw-filesystem -Version: 19 +Version: 20 Release: 1%{?dist} Summary: MinGW base filesystem and environment @@ -85,10 +85,11 @@ mkdir -p $RPM_BUILD_ROOT%{_prefix}/i686-pc-mingw32/sys-root/mingw/share/man/man{ # /usr/i686-pc-mingw32/sys-root/mingw/doc # but these are both packaging bugs. -mkdir -p $RPM_BUILD_ROOT%{_libdir}/rpm -install -m 0755 mingw-find-requires.sh $RPM_BUILD_ROOT%{_libdir}/rpm -install -m 0755 %{SOURCE5} $RPM_BUILD_ROOT%{_libdir}/rpm -install -m 0644 %{SOURCE6} $RPM_BUILD_ROOT%{_libdir}/rpm +# NB. NOT libdir +mkdir -p $RPM_BUILD_ROOT/usr/lib/rpm +install -m 0755 mingw-find-requires.sh $RPM_BUILD_ROOT/usr/lib/rpm +install -m 0755 %{SOURCE5} $RPM_BUILD_ROOT/usr/lib/rpm +install -m 0644 %{SOURCE6} $RPM_BUILD_ROOT/usr/lib/rpm %clean @@ -102,11 +103,14 @@ rm -rf $RPM_BUILD_ROOT %config(noreplace) %{_sysconfdir}/profile.d/mingw.sh %config(noreplace) %{_sysconfdir}/profile.d/mingw.csh %{_prefix}/i686-pc-mingw32/ -%{_libdir}/rpm/mingw-* +/usr/lib/rpm/mingw-* %changelog -* Mon Sep 4 2008 Richard W.M. Jones - 19-1 +* Fri Sep 5 2008 Richard W.M. Jones - 20-1 +- On 64 bit install in /usr/lib/rpm always. + +* Thu Sep 4 2008 Richard W.M. Jones - 19-1 - 'user32.dll' is provided by Windows. - Allow '-' in DLL names. - More accurate detection of DLLs in requires/provides scripts. -- 1.8.3.1