diff --git a/.cvsignore b/.cvsignore index a519e8d..625dbc7 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -pcmciautils-005.tar.bz2 +pcmciautils-006.tar.bz2 diff --git a/Makefile b/Makefile index 7eeb8b7..2515383 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,7 @@ # Makefile for source rpm: pcmciautils -# $Id$ +# $Id: Makefile,v 1.1 2005/07/11 16:39:23 notting Exp $ NAME := pcmciautils SPECFILE = $(firstword $(wildcard *.spec)) +UPSTREAM_CHECKS = sign include ../common/Makefile.common diff --git a/pcmciautils-fedora.patch b/pcmciautils-fedora.patch index 13e341c..523ddff 100644 --- a/pcmciautils-fedora.patch +++ b/pcmciautils-fedora.patch @@ -49,3 +49,16 @@ ccdv: @echo "Building ccdv" +--- pcmciautils-006/Makefile.foo 2005-07-20 17:25:13.000000000 -0400 ++++ pcmciautils-006/Makefile 2005-07-20 17:28:02.000000000 -0400 +@@ -129,8 +129,8 @@ + + #LIBC = + CFLAGS += $(WARNINGS) -I$(GCCINCDIR) +-LIB_OBJS = -lc -lsysfs +-LIB_PCI_OBJS = -lc -lpci ++LIB_OBJS = -Wl,-Bstatic -lsysfs -Wl,-Bdynamic ++LIB_PCI_OBJS = -lpci + #LDFLAGS = + + QUIET= diff --git a/pcmciautils.spec b/pcmciautils.spec index f4e6d43..5bdebc0 100644 --- a/pcmciautils.spec +++ b/pcmciautils.spec @@ -1,7 +1,7 @@ Name: pcmciautils Summary: PCMCIA utilities and initialization programs License: GPL -Version: 005 +Version: 006 Release: 1 Group: System Environment/Base ExclusiveArch: i386 x86_64 ia64 ppc ppc64 @@ -13,8 +13,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: sysfsutils-devel >= 1.3.0 Requires: udev >= 062 Patch1: pcmciautils-fedora.patch -Patch2: pcmciautils-radeonigp.patch -Patch3: pcmciautils-udev.patch %description The pcmciautils package contains utilities for initializing and @@ -24,10 +22,6 @@ debugging PCMCIA and Cardbus sockets. %setup -q # Fix build peculiarities %patch1 -p1 -# Make sure RadeonIGP boards don't MCE -%patch2 -p1 -# Make it callable as a direct udev helper -%patch3 -p1 %build make @@ -52,5 +46,9 @@ install -m 644 %{SOURCE10} $RPM_BUILD_ROOT/etc/udev/rules.d/ /sbin/* %changelog +* Wed Jul 20 2005 Bill Nottingham 006-1 +- update to 006 +- link libsysfs statically + * Fri Jul 08 2005 Bill Nottingham 005-1 - initial packaging \ No newline at end of file diff --git a/sources b/sources index c4de5da..69a9e22 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -67bb4efeb1b055753800c4b62b29987c pcmciautils-005.tar.bz2 +93ba0aad0a9552dffea9308299af0e60 pcmciautils-006.tar.bz2