[mingw32-filesystem] Generate versionless mingw32-filesystem Requires

Kalev Lember kalev at fedoraproject.org
Sat May 21 06:15:56 UTC 2011


commit 2de8bb604b4ffd190b9f7d2f3a02bbc25c93b0e0
Author: Kalev Lember <kalev at smartlink.ee>
Date:   Fri May 20 14:07:16 2011 +0300

    Generate versionless mingw32-filesystem Requires
    
    The automatically generated Requires were too strict, making every
    binary rpm depend on the very latest mingw32-filesystem. For almost all
    packages any mingw32-filesystem from Fedora repos is sufficient.
    
    Using versionless mingw32-filesystem Requires avoids the situation where
    e.g. downgrading mingw32-filesystem would be impossible due to other
    packages needlessly depending on it.

 mingw32-filesystem.spec  |    4 ++--
 mingw32-find-requires.sh |    5 ++---
 2 files changed, 4 insertions(+), 5 deletions(-)
---
diff --git a/mingw32-filesystem.spec b/mingw32-filesystem.spec
index dab8866..076bcb1 100644
--- a/mingw32-filesystem.spec
+++ b/mingw32-filesystem.spec
@@ -68,7 +68,6 @@ This environment is maintained by the Fedora MinGW SIG at:
 %prep
 %setup -q -c -T
 cp %{SOURCE0} COPYING
-sed 's/@VERSION@/%{version}/' < %{SOURCE4} > mingw32-find-requires.sh
 
 
 %build
@@ -134,7 +133,7 @@ mkdir -p $RPM_BUILD_ROOT%{_prefix}/i686-pc-mingw32/sys-root/mingw/share/themes
 
 # NB. NOT _libdir
 mkdir -p $RPM_BUILD_ROOT/usr/lib/rpm
-install -m 0755 mingw32-find-requires.sh $RPM_BUILD_ROOT/usr/lib/rpm
+install -m 0755 %{SOURCE4} $RPM_BUILD_ROOT/usr/lib/rpm
 install -m 0755 %{SOURCE5} $RPM_BUILD_ROOT/usr/lib/rpm
 install -m 0755 %{SOURCE9} $RPM_BUILD_ROOT/usr/lib/rpm
 
@@ -169,6 +168,7 @@ install -m 644 %{SOURCE8} $RPM_BUILD_ROOT%{_datadir}/mingw32
 * Fri May 20 2011 Kalev Lember <kalev at smartlink.ee> - 68-1
 - Support RPM 4.9 new "fileattr" dep extraction system
 - Cleaned up the spec file from cruft not needed with latest rpm
+- Generate versionless mingw32-filesystem Requires
 
 * Sat May 14 2011 Erik van Pienbroek <epienbro at fedoraproject.org> - 67-1
 - Don't unset PKG_CONFIG_PATH in the wrapper scripts
diff --git a/mingw32-find-requires.sh b/mingw32-find-requires.sh
index 9d93388..ae1047e 100755
--- a/mingw32-find-requires.sh
+++ b/mingw32-find-requires.sh
@@ -14,9 +14,8 @@ fi
 
 filelist=`sed "s/['\"]/\\\&/g"`
 
-# Everything requires mingw32-filesystem of at least the current version
-# and mingw32-runtime.
-echo 'mingw32-filesystem >= @VERSION@'
+# Everything requires mingw32-filesystem and mingw32-runtime.
+echo 'mingw32-filesystem'
 echo 'mingw32-runtime'
 
 dlls=$(echo $filelist | tr [:blank:] '\n' | grep -Ei '\.(dll|exe)$')


More information about the mingw mailing list