- more build requires (bug #194144)

- version 014
2006-06-06 06:19:05 +00:00 · 2006-06-06 06:19:05 +00:00 · bbb384470d
commit bbb384470d
parent f466075436
4 changed files with 27 additions and 48 deletions
--- a/.cvsignore
+++ b/.cvsignore
@ -1 +1 @@
-pcmciautils-011.tar.bz2
+pcmciautils-014.tar.bz2
--- a/pcmciautils-fedora.patch
+++ b/pcmciautils-fedora.patch
@ -1,19 +1,17 @@
--- 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 @@
+--- pcmciautils-014/Makefile.orig	2006-06-06 08:07:32.000000000 +0200
+++ pcmciautils-014/Makefile	2006-06-06 08:10:26.000000000 +0200
+@@ -147,30 +147,11 @@
+ LIB_OBJS = -lc -lsysfs
 LIB_PCI_OBJS = -lc -lpci
- #LDFLAGS =
 
+-ifeq ($(strip $(STATIC)),true)
+-	LIB_OBJS = -lsysfs
+-	LIB_PCI_OBJS = -lpci
+-	LDFLAGS += -static
+-else
+-	LDFLAGS += -Wl,-warn-common
+-endif
+-
 -ifeq ($(strip $(V)),false)
 -	QUIET=@$(PWD)/build/ccdv
 -	HOST_PROGS=build/ccdv
@ -21,44 +19,20 @@
 -	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
+LIB_OBJS =  -Wl,-Bstatic -lsysfs -Wl,-Bdynamic
+LIB_PCI_OBJS =  -lpci
 +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) udevrules
-+all: $(PCCARDCTL) $(PCMCIA_CHECK_BROKEN_CIS) $(PCMCIA_SOCKET_STARTUP_BUILD) udevrules
- 
- 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=
+ # HOTPLUG or UDEV?
+ ifeq ($(strip $(UDEV)),false)
--- a/pcmciautils.spec
+++ b/pcmciautils.spec
@ -1,8 +1,8 @@
 Name: pcmciautils
 Summary: PCMCIA utilities and initialization programs
 License: GPL
-Version: 011
-Release: 1.2
+Version: 014
+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
@ -11,6 +11,7 @@ Obsoletes: kernel-pcmcia-cs
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: sysfsutils-devel >= 1.3.0
 Requires: udev >= 062, kernel >= 2.6.12-1.1411_FC5
+Requires: /usr/bin/yacc /usr/bin/lex
 Patch1: pcmciautils-fedora.patch

 %description
@ -40,6 +41,10 @@ make install DESTDIR=$RPM_BUILD_ROOT
 %{_mandir}/man*/*

 %changelog
+* Tue Jun 06 2006 Harald Hoyer <harald@redhat.com> - 014-1
+- more build requires (bug #194144)
+- version 014
+
 * Fri Feb 10 2006 Jesse Keating <jkeating@redhat.com> - 011-1.2
 - bump again for double-long bug on ppc(64)

@ -65,4 +70,4 @@ make install DESTDIR=$RPM_BUILD_ROOT
 - link libsysfs statically

 * Fri Jul 08 2005  Bill Nottingham <notting@redhat.com> 005-1
- initial packaging
+- initial packaging
--- a/2
+++ b/2
@ -1 +1 @@
-8a7a014ea8177cf4514032722b695a9e  pcmciautils-011.tar.bz2
+3f07c926875f6c5dcb83240f39725177  pcmciautils-014.tar.bz2