From f9a3c44dfa0c7569ab019aff396bf0c5b53b52cb Mon Sep 17 00:00:00 2001
From: Ville Skyttä <scop@fedoraproject.org>
Date: May 18 2010 17:22:17 +0000
Subject: - Build with $RPM_OPT_FLAGS, fix -debuginfo (#566277).


---

diff --git a/pcmciautils-fedora.patch b/pcmciautils-fedora.patch
deleted file mode 100644
index 105db56..0000000
--- a/pcmciautils-fedora.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- 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
- 
--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
--else
--	QUIET=
--	HOST_PROGS=
--endif
--
--# if DEBUG is enabled, then we do not strip or optimize
--ifeq ($(strip $(DEBUG)),true)
--	CFLAGS  += -O1 -g -DDEBUG -D_GNU_SOURCE
--	STRIPCMD = /bin/true -Since_we_are_debugging
--else
--	CFLAGS  += $(OPTIMIZATION) -fomit-frame-pointer -D_GNU_SOURCE
--	STRIPCMD = $(STRIP) -s --remove-section=.note --remove-section=.comment
--endif
-+LIB_OBJS =  -Wl,-Bstatic -lsysfs -Wl,-Bdynamic
-+LIB_PCI_OBJS =  -lpci
-+CFLAGS  += $(RPM_OPT_FLAGS) $(OPTIMIZATION) -D_GNU_SOURCE
-+LDFLAGS += -Wl,-warn-common
-+STRIPCMD = /bin/true
- 
- # HOTPLUG or UDEV?
- ifeq ($(strip $(UDEV)),false)
diff --git a/pcmciautils.spec b/pcmciautils.spec
index 10ec753..dcf3096 100644
--- a/pcmciautils.spec
+++ b/pcmciautils.spec
@@ -2,7 +2,7 @@ Name: pcmciautils
 Summary: PCMCIA utilities and initialization programs
 License: GPLv2
 Version: 017
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: System Environment/Base
 ExclusiveArch: i386 i586 i686 x86_64 ia64 ppc ppc64 %{?arm}
 URL: http://www.kernel.org/pub/linux/utils/kernel/pcmcia/pcmcia.html
@@ -25,14 +25,14 @@ debugging PCMCIA and Cardbus sockets.
 %setup -q
 
 %build
-#make %{?_smp_mflags}
-make
+make V=1 OPTIMIZATION="$RPM_OPT_FLAGS" STRIPCMD=: #%{?_smp_mflags}
 
 %install
 %{__rm} -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
 mkdir -p $RPM_BUILD_ROOT/lib/udev
+cp -p src/yacc_config.c y.tab.c # for -debuginfo
 
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
@@ -50,6 +50,9 @@ mkdir -p $RPM_BUILD_ROOT/lib/udev
 %{_mandir}/man*/pccardctl*
 
 %changelog
+* Tue May 18 2010 Ville Skyttä <ville.skytta@iki.fi> - 017-2
+- Build with $RPM_OPT_FLAGS, fix -debuginfo (#566277).
+
 * Mon Feb 15 2010 Harald Hoyer <harald@redhat.com> 017-1
 - version 017
 - fix build on rawhide (bug #565133)