diff --git a/mingw32-filesystem.spec b/mingw32-filesystem.spec index faf6ae5..21d9464 100644 --- a/mingw32-filesystem.spec +++ b/mingw32-filesystem.spec @@ -1,8 +1,8 @@ %define debug_package %{nil} Name: mingw32-filesystem -Version: 43 -Release: 6%{?dist} +Version: 44 +Release: 1%{?dist} Summary: MinGW base filesystem and environment Group: Development/Libraries @@ -18,9 +18,13 @@ Source2: mingw32.sh Source4: mingw32-find-requires.sh Source5: mingw32-find-provides.sh Source6: mingw32-scripts.sh +Source7: mingw32-rpmlint.config Requires: setup Requires: rpm +Requires: rpmlint >= 0.85-2 + +BuildRequires: rpmlint >= 0.85-2 # Note about 'Provides: mingw32(foo.dll)' # ------------------------------------------------------------ @@ -88,6 +92,9 @@ install -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/rpm install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros.mingw32 +mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/rpmlint +install -m 644 %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/rpmlint/ + mkdir -p $RPM_BUILD_ROOT%{_prefix}/i686-pc-mingw32 # GCC requires these directories, even though they contain links @@ -137,6 +144,7 @@ rm -rf $RPM_BUILD_ROOT %config(noreplace) %{_sysconfdir}/rpm/macros.mingw32 %config(noreplace) %{_sysconfdir}/profile.d/mingw32.sh #%config(noreplace) %{_sysconfdir}/profile.d/mingw32.csh +%config(noreplace) %{_sysconfdir}/rpmlint/mingw32-rpmlint.config %{_bindir}/mingw32-configure %{_bindir}/mingw32-make %{_libexecdir}/mingw32-scripts @@ -145,6 +153,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Jan 26 2009 Richard W.M. Jones - 44-1 +- Install rpmlint overrides file to suppress some rpmlint warnings. + * Sat Jan 24 2009 Richard W.M. Jones - 43-6 - Don't claim C++ compiler exists if it's not installed, as this breaks autoconf and (in particular) libtool. diff --git a/mingw32-rpmlint.config b/mingw32-rpmlint.config new file mode 100644 index 0000000..b591c28 --- /dev/null +++ b/mingw32-rpmlint.config @@ -0,0 +1,19 @@ +# rpmlint overrides file. +# This file filters out MinGW warnings. +# See: http://fedoraproject.org/wiki/MinGW/Rpmlint + +# Unconditionally remove devel-file-in-non-devel rpmlint warning. +addFilter ("^mingw32-.*devel-file-in-non-devel") + +# /usr/i686-pc-mingw32 is permitted by MinGW packaging guidelines. +addFilter ("^mingw32-.*non-standard-dir-in-usr i686-pc-mingw32") + +# Permit *.la files (error is a bit odd, but it's what rpmlint prints). +addFilter ("^mingw32-.*script-without-shebang.*\.la$") + +# GCC and libtool create executable archive files. It's not clear +# why, but we permit this for now. +addFilter ("^mingw32-.*spurious-executable-perm.*\.dll\.a$") + +# *.dll.a files are permitted arch-independent objects. +addFilter ("^mingw32-.*arch-independent-package-contains-binary-or-object.*\.dll\.a$")