rpms/mingw-filesystem
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Generate versionless mingw32-filesystem Requires

Browse Source 
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.
This commit is contained in:
Kalev Lember 2011-05-20 14:07:16 +03:00
parent 11c4c8fba5
commit 2de8bb604b
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mingw32-filesystem.spec
View File

@ -68,7 +68,6 @@ This environment is maintained by the Fedora MinGW SIG at:
%prep %prep
%setup -q -c -T %setup -q -c -T
cp %{SOURCE0} COPYING cp %{SOURCE0} COPYING
sed 's/@VERSION@/%{version}/' < %{SOURCE4} > mingw32-find-requires.sh
%build %build
@ -134,7 +133,7 @@ mkdir -p $RPM_BUILD_ROOT%{_prefix}/i686-pc-mingw32/sys-root/mingw/share/themes
# NB. NOT _libdir # NB. NOT _libdir
mkdir -p $RPM_BUILD_ROOT/usr/lib/rpm 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 %{SOURCE5} $RPM_BUILD_ROOT/usr/lib/rpm
install -m 0755 %{SOURCE9} $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@smartlink.ee> - 68-1 * Fri May 20 2011 Kalev Lember <kalev@smartlink.ee> - 68-1
- Support RPM 4.9 new "fileattr" dep extraction system - Support RPM 4.9 new "fileattr" dep extraction system
- Cleaned up the spec file from cruft not needed with latest rpm - 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@fedoraproject.org> - 67-1 * Sat May 14 2011 Erik van Pienbroek <epienbro@fedoraproject.org> - 67-1
- Don't unset PKG_CONFIG_PATH in the wrapper scripts - Don't unset PKG_CONFIG_PATH in the wrapper scripts

5
mingw32-find-requires.sh
View File

@ -14,9 +14,8 @@ fi
filelist=`sed "s/['\"]/\\\&/g"` filelist=`sed "s/['\"]/\\\&/g"`
# Everything requires mingw32-filesystem of at least the current version # Everything requires mingw32-filesystem and mingw32-runtime.
# and mingw32-runtime. echo 'mingw32-filesystem'
echo 'mingw32-filesystem >= @VERSION@'
echo 'mingw32-runtime' echo 'mingw32-runtime'
dlls=$(echo $filelist | tr [:blank:] '\n' | grep -Ei '\.(dll|exe)$') dlls=$(echo $filelist | tr [:blank:] '\n' | grep -Ei '\.(dll|exe)$')