X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=filesystem%2Fmingw-filesystem.spec;h=317d73e001263fd7e65198bfd9d058d066202ae8;hb=8e79bf80711e45f9e973672dff1e76dd74314242;hp=a3839ed4673d893d610667f698d268d97999e521;hpb=88677fd681a60a565fb236aabeabaf13435c3639;p=fedora-mingw.git

diff --git a/filesystem/mingw-filesystem.spec b/filesystem/mingw-filesystem.spec
index a3839ed..317d73e 100644
--- a/filesystem/mingw-filesystem.spec
+++ b/filesystem/mingw-filesystem.spec
@@ -1,7 +1,7 @@
 %define debug_package %{nil}
 
 Name:           mingw-filesystem
-Version:        14
+Version:        20
 Release:        1%{?dist}
 Summary:        MinGW base filesystem and environment
 
@@ -25,6 +25,7 @@ Requires:       rpm
 # These are actually provided by Windows itself, or Wine.
 Provides:       mingw(msvcrt.dll)
 Provides:       mingw(kernel32.dll)
+Provides:       mingw(user32.dll)
 
 
 %description
@@ -39,6 +40,7 @@ This environment is maintained by the Fedora MinGW SIG at:
 %prep
 %setup -q -c -T
 cp %{SOURCE0} COPYING
+sed 's/@VERSION@/%{version}/' < %{SOURCE4} > mingw-find-requires.sh
 
 
 %build
@@ -83,9 +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 %{SOURCE4} %{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
@@ -99,10 +103,23 @@ 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
+* Fri Sep  5 2008 Richard W.M. Jones <rjones@redhat.com> - 20-1
+- On 64 bit install in /usr/lib/rpm always.
+
+* Thu Sep  4 2008 Richard W.M. Jones <rjones@redhat.com> - 19-1
+- 'user32.dll' is provided by Windows.
+- Allow '-' in DLL names.
+- More accurate detection of DLLs in requires/provides scripts.
+
+* Mon Sep  4 2008 Richard W.M. Jones <rjones@redhat.com> - 17-1
+- Automatically add mingw-filesystem and mingw-runtime requires.
+- Add --prefix to _mingw_configure macro.
+- Three backslashes required on each continuation line in RPM macros.
+
 * Mon Sep  4 2008 Richard W.M. Jones <rjones@redhat.com> - 14-1
 - Fix path to mingw-find-requires/provides scripts.