diff --git a/.cvsignore b/.cvsignore index 9c59b8c..ee4e75a 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -pcmciautils-007.tar.bz2 +pcmciautils-011.tar.bz2 diff --git a/pcmciautils-fedora.patch b/pcmciautils-fedora.patch index 523ddff..0a5e4cf 100644 --- a/pcmciautils-fedora.patch +++ b/pcmciautils-fedora.patch @@ -44,8 +44,8 @@ endif --all: ccdv $(PCCARDCTL) $(PCMCIA_CHECK_BROKEN_CIS) $(PCMCIA_SOCKET_STARTUP_BUILD) -+all: $(PCCARDCTL) $(PCMCIA_CHECK_BROKEN_CIS) $(PCMCIA_SOCKET_STARTUP_BUILD) +-all: ccdv $(PCCARDCTL) $(PCMCIA_CHECK_BROKEN_CIS) $(PCMCIA_SOCKET_STARTUP_BUILD) udevrules ++all: $(PCCARDCTL) $(PCMCIA_CHECK_BROKEN_CIS) $(PCMCIA_SOCKET_STARTUP_BUILD) udevrules ccdv: @echo "Building ccdv" diff --git a/pcmciautils.spec b/pcmciautils.spec index 90bb162..52a65ec 100644 --- a/pcmciautils.spec +++ b/pcmciautils.spec @@ -1,20 +1,17 @@ Name: pcmciautils Summary: PCMCIA utilities and initialization programs License: GPL -Version: 007 -Release: 1.1 +Version: 011 +Release: 1 Group: System Environment/Base ExclusiveArch: i386 x86_64 ia64 ppc ppc64 Source: http://www.kernel.org/pub/linux/utils/kernel/pcmcia/pcmciautils-%{version}.tar.bz2 -Source10: pcmcia.rules Obsoletes: pcmcia-cs Obsoletes: kernel-pcmcia-cs -Provides: pcmcia-cs BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: sysfsutils-devel >= 1.3.0 Requires: udev >= 062, kernel >= 2.6.12-1.1411_FC5 Patch1: pcmciautils-fedora.patch -Patch2: pcmciautils-007-udev.patch %description The pcmciautils package contains utilities for initializing and @@ -24,7 +21,6 @@ debugging PCMCIA and Cardbus sockets. %setup -q # Fix build peculiarities %patch1 -p1 -%patch2 -p1 %build make @@ -33,12 +29,6 @@ make %{__rm} -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT -# Hotplug is handled by udev -rm -rf $RPM_BUILD_ROOT/etc/hotplug - -mkdir -p $RPM_BUILD_ROOT/etc/udev/rules.d -install -m 644 %{SOURCE10} $RPM_BUILD_ROOT/etc/udev/rules.d/ - %clean %{__rm} -rf $RPM_BUILD_ROOT @@ -49,6 +39,10 @@ install -m 644 %{SOURCE10} $RPM_BUILD_ROOT/etc/udev/rules.d/ /sbin/* %changelog +* Tue Dec 13 2005 Bill Nottingham 011-1 +- update to 011, now ships with its own udev rules +- remove pcmcia-cs provide + * Fri Dec 09 2005 Jesse Keating - rebuilt diff --git a/sources b/sources index 577b1d3..48c39ab 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -af6e65394a194d50df60153f975948b7 pcmciautils-007.tar.bz2 +8a7a014ea8177cf4514032722b695a9e pcmciautils-011.tar.bz2