diff --git a/pcmciautils.spec b/pcmciautils.spec index c4d97fc..d3e33a0 100644 --- a/pcmciautils.spec +++ b/pcmciautils.spec @@ -2,15 +2,16 @@ Name: pcmciautils Summary: PCMCIA utilities and initialization programs License: GPL Version: 014 -Release: 6%{?dist} +Release: 7%{?dist} Group: System Environment/Base ExclusiveArch: i386 x86_64 ia64 ppc ppc64 URL: http://www.kernel.org/pub/linux/utils/kernel/pcmcia/pcmcia.html Source: http://www.kernel.org/pub/linux/utils/kernel/pcmcia/pcmciautils-%{version}.tar.bz2 Obsoletes: pcmcia-cs < 3.2.9 Obsoletes: kernel-pcmcia-cs < 3.1.32 -Provides: pcmcia-cs = 3.2.9 -Provides: kernel-pcmcia-cs = 3.1.32 +# Do not Provide, because it would conflict +#Provides: pcmcia-cs = 3.2.9 +#Provides: kernel-pcmcia-cs = 3.1.32 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libsysfs-devel >= 1.3.0 Requires: udev >= 062, kernel >= 2.6.12-1.1411_FC5 @@ -51,7 +52,11 @@ make install DESTDIR=$RPM_BUILD_ROOT %{_mandir}/man*/pccardctl* %changelog -* Fri Mar 23 2007 Harald Hoyer - 014-6%{?dist} +* Mon Apr 2 2007 Harald Hoyer - 014-7 +- removed Provides, because it would conflict (#234504) +- Resolves: rhbz#234504 + +* Fri Mar 23 2007 Harald Hoyer - 014-6 - specfile cleanup * Mon Jul 17 2006 Jesse Keating - 014-5