filesystem version 17

- Automatically add mingw-filesystem and mingw-runtime requires.
- Add --prefix to _mingw_configure macro.
- Three backslashes required on each continuation line in RPM macros.

diff --git a/filesystem/mingw-filesystem.spec b/filesystem/mingw-filesystem.spec
index a3839ed..43e3900 100644 (file)
--- a/filesystem/mingw-filesystem.spec
+++ b/filesystem/mingw-filesystem.spec
@@ -1,7 +1,7 @@
 %define debug_package %{nil}
 
 Name:           mingw-filesystem
-Version:        14
+Version:        17
 Release:        1%{?dist}
 Summary:        MinGW base filesystem and environment
 
@@ -39,6 +39,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
@@ -84,7 +85,8 @@ mkdir -p $RPM_BUILD_ROOT%{_prefix}/i686-pc-mingw32/sys-root/mingw/share/man/man{
 # 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 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
 
 
@@ -103,6 +105,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* 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.
 

diff --git a/filesystem/mingw-find-requires.sh b/filesystem/mingw-find-requires.sh
index 1a63fc3..66ac46f 100755 (executable)
--- a/filesystem/mingw-find-requires.sh
+++ b/filesystem/mingw-find-requires.sh
@@ -10,8 +10,15 @@ fi
 
 [ -z "$OBJDUMP" ] && OBJDUMP=i686-pc-mingw32-objdump
 
+# Get the list of files.
+
 filelist=`sed "s/['\"]/\\\&/g"`
 
+# Everything requires mingw-filesystem of at least the current version
+# and mingw-runtime.
+echo 'mingw-filesystem >= @VERSION@'
+echo 'mingw-runtime'
+
 dlls=$(echo $filelist | tr [:blank:] '\n' | grep '\.dll')
 
 for f in $dlls; do

diff --git a/filesystem/mingw-macros.mingw b/filesystem/mingw-macros.mingw
index 2f8947e..d45fd0d 100644 (file)
--- a/filesystem/mingw-macros.mingw
+++ b/filesystem/mingw-macros.mingw
@@ -17,8 +17,11 @@
 %_mingw_host              i686-pc-mingw32
 %_mingw_target            i686-pc-mingw32
 
-# Note: all flags must be on a single line.
-%_mingw_cflags            -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -I%{_mingw_includedir}
+%_mingw_cflags            -O2 -g -pipe -Wall \\\
+                         -Wp,-D_FORTIFY_SOURCE=2 \\\
+                         -fexceptions \\\
+                         --param=ssp-buffer-size=4 \\\
+                         -I%{_mingw_includedir}
 
 %_mingw_cc               i686-pc-mingw32-gcc
 %_mingw_cpp              i686-pc-mingw32-gcc -E
@@ -28,6 +31,8 @@
 %_mingw_objdump                  i686-pc-mingw32-objdump
 
 %_mingw_configure \
-  CC="%{_mingw_cc}" \
-  CFLAGS="%{_mingw_cflags}" \
-  ./configure --build=%_build --host=%{_mingw_host} --target=%{_mingw_target}
+  CC="%{_mingw_cc}" \\\
+  CFLAGS="%{_mingw_cflags}" \\\
+  ./configure \\\
+    --build=%_build --host=%{_mingw_host} --target=%{_mingw_target} \\\
+    --prefix=%{_mingw_prefix}