rpms/pcmciautils/devel .cvsignore, 1.5, 1.6 pcmciautils-fedora.patch, 1.3, 1.4 pcmciautils.spec, 1.15, 1.16 sources, 1.5, 1.6
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Tue Jun 6 06:19:08 UTC 2006
Author: harald
Update of /cvs/dist/rpms/pcmciautils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21148
Modified Files:
.cvsignore pcmciautils-fedora.patch pcmciautils.spec sources
Log Message:
- more build requires (bug #194144)
- version 014
Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/pcmciautils/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore 13 Dec 2005 21:05:17 -0000 1.5
+++ .cvsignore 6 Jun 2006 06:19:05 -0000 1.6
@@ -1 +1 @@
-pcmciautils-011.tar.bz2
+pcmciautils-014.tar.bz2
pcmciautils-fedora.patch:
Makefile | 29 +++++------------------------
1 files changed, 5 insertions(+), 24 deletions(-)
Index: pcmciautils-fedora.patch
===================================================================
RCS file: /cvs/dist/rpms/pcmciautils/devel/pcmciautils-fedora.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- pcmciautils-fedora.patch 13 Dec 2005 21:05:17 -0000 1.3
+++ pcmciautils-fedora.patch 6 Jun 2006 06:19:05 -0000 1.4
@@ -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)
Index: pcmciautils.spec
===================================================================
RCS file: /cvs/dist/rpms/pcmciautils/devel/pcmciautils.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- pcmciautils.spec 11 Feb 2006 04:57:29 -0000 1.15
+++ pcmciautils.spec 6 Jun 2006 06:19:05 -0000 1.16
@@ -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 @@
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 @@
%{_mandir}/man*/*
%changelog
+* Tue Jun 06 2006 Harald Hoyer <harald at redhat.com> - 014-1
+- more build requires (bug #194144)
+- version 014
+
* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 011-1.2
- bump again for double-long bug on ppc(64)
@@ -65,4 +70,4 @@
- link libsysfs statically
* Fri Jul 08 2005 Bill Nottingham <notting at redhat.com> 005-1
-- initial packaging
\ No newline at end of file
+- initial packaging
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/pcmciautils/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources 13 Dec 2005 21:05:17 -0000 1.5
+++ sources 6 Jun 2006 06:19:05 -0000 1.6
@@ -1 +1 @@
-8a7a014ea8177cf4514032722b695a9e pcmciautils-011.tar.bz2
+3f07c926875f6c5dcb83240f39725177 pcmciautils-014.tar.bz2
More information about the fedora-cvs-commits
mailing list