From 22de3fea414b1f81a5cfd4cc7b105f576ede5bbf Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Mon, 11 Jul 2005 17:20:11 +0000 Subject: [PATCH] initial checkin --- .cvsignore | 1 + pcmciautils-fedora.patch | 51 +++++++++++++++++++++++++++++++++++++ pcmciautils.spec | 55 ++++++++++++++++++++++++++++++++++++++++ sources | 1 + 4 files changed, 108 insertions(+) create mode 100644 pcmciautils-fedora.patch create mode 100644 pcmciautils.spec diff --git a/.cvsignore b/.cvsignore index e69de29..a519e8d 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +pcmciautils-005.tar.bz2 diff --git a/pcmciautils-fedora.patch b/pcmciautils-fedora.patch new file mode 100644 index 0000000..13e341c --- /dev/null +++ b/pcmciautils-fedora.patch @@ -0,0 +1,51 @@ +--- pcmciautils-005/Makefile.foo 2005-07-08 22:03:40.000000000 -0400 ++++ pcmciautils-005/Makefile 2005-07-08 22:05:02.000000000 -0400 +@@ -96,8 +96,7 @@ + GCC_LIB := $(shell $(CC) -print-libgcc-file-name ) + + # use '-Os' optimization if available, else use -O2 +-OPTIMIZATION := ${shell if $(CC) -Os -S -o /dev/null -xc /dev/null >/dev/null 2>&1; \ +- then echo "-Os"; else echo "-O2" ; fi} ++OPTIMIZATION := $(RPM_OPT_FLAGS) + + # check if compiler option is supported + cc-supports = ${shell if $(CC) ${1} -S -o /dev/null -xc /dev/null > /dev/null 2>&1; then echo "$(1)"; fi;} +@@ -134,24 +133,12 @@ + LIB_PCI_OBJS = -lc -lpci + #LDFLAGS = + +-ifeq ($(strip $(V)),false) +- QUIET=@$(PWD)/build/ccdv +- HOST_PROGS=build/ccdv +-else +- QUIET= +- HOST_PROGS= +-endif ++QUIET= ++HOST_PROGS= + +-# if DEBUG is enabled, then we do not strip or optimize +-ifeq ($(strip $(DEBUG)),true) +- CFLAGS += -O1 -g -DDEBUG -D_GNU_SOURCE +- LDFLAGS += -Wl,-warn-common +- STRIPCMD = /bin/true -Since_we_are_debugging +-else +- CFLAGS += $(OPTIMIZATION) -fomit-frame-pointer -D_GNU_SOURCE +- LDFLAGS += -s -Wl,-warn-common +- STRIPCMD = $(STRIP) -s --remove-section=.note --remove-section=.comment +-endif ++CFLAGS += $(OPTIMIZATION) -D_GNU_SOURCE ++LDFLAGS += -Wl,-warn-common ++STRIPCMD = /bin/true + + # if STARTUP is disabled, we can skip a few things + ifeq ($(strip $(STARTUP)),false) +@@ -165,7 +152,7 @@ + endif + + +-all: ccdv $(PCCARDCTL) $(PCMCIA_CHECK_BROKEN_CIS) $(PCMCIA_SOCKET_STARTUP_BUILD) ++all: $(PCCARDCTL) $(PCMCIA_CHECK_BROKEN_CIS) $(PCMCIA_SOCKET_STARTUP_BUILD) + + ccdv: + @echo "Building ccdv" diff --git a/pcmciautils.spec b/pcmciautils.spec new file mode 100644 index 0000000..9192c11 --- /dev/null +++ b/pcmciautils.spec @@ -0,0 +1,55 @@ +Name: pcmciautils +Summary: PCMCIA utilities and initialization programs +License: GPL +Version: 005 +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 +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root +BuildRequires: sysfsutils-devel >= 1.3.0 +Patch1: pcmciautils-fedora.patch +Patch2: pcmciautils-radeonigp.patch +Patch3: pcmciautils-udev.patch + +%description +The pcmciautils package contains utilities for initializing and +debugging PCMCIA and Cardbus sockets. + +%prep +%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 + +%install +%{__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 + +%files +%defattr(-,root,root) +%config(noreplace) %{_sysconfdir}/pcmcia/*.opts +/etc/udev/rules.d/* +/sbin/* + +%changelog +* Fri Jul 08 2005 Bill Nottingham 005-1 +- initial packaging \ No newline at end of file diff --git a/sources b/sources index e69de29..c4de5da 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +67bb4efeb1b055753800c4b62b29987c pcmciautils-005.tar.bz2