[apcupsd/f14/master] - fix c++ code linking (FTBFS) (#631288)

[Michal Hlavinka]

commit afda2b63ed72e124aef1df8108d7d74a3203191f
Author: Michal Hlavinka <mhlavink at redhat.com>
Date:   Wed Sep 22 11:42:50 2010 +0200

    - fix c++ code linking (FTBFS) (#631288)

 apcupsd-3.14.8-cxxld.patch |   16 ++++++++++++++++
 apcupsd.spec               |    9 ++++++++-
 2 files changed, 24 insertions(+), 1 deletions(-)
---
diff --git a/apcupsd-3.14.8-cxxld.patch b/apcupsd-3.14.8-cxxld.patch
new file mode 100644
index 0000000..ba13d62
--- /dev/null
+++ b/apcupsd-3.14.8-cxxld.patch
@@ -0,0 +1,16 @@
+diff -up apcupsd-3.14.8/src/Makefile.cxxld apcupsd-3.14.8/src/Makefile
+--- apcupsd-3.14.8/src/Makefile.cxxld	2009-09-30 01:20:45.000000000 +0200
++++ apcupsd-3.14.8/src/Makefile	2010-09-22 11:18:03.550601657 +0200
+@@ -26,10 +26,10 @@ SRCS = $(common_srcs) $(apcupsd_srcs) $(
+ all-targets: apcupsd apcaccess apctest smtp 
+ 
+ apcupsd: $(common_obj) $(apcupsd_obj) $(APCDRVLIBS) $(APCLIBS)
+-	$(LINK) $(DRVLIBS)
++	$(LINK) -lstdc++ $(DRVLIBS)
+ 
+ apctest: $(common_obj) $(apctest_obj) $(APCDRVLIBS) $(APCLIBS)
+-	$(LINK) $(DRVLIBS)
++	$(LINK) -lstdc++ $(DRVLIBS)
+ 
+ apcaccess: $(apcaccess_obj) $(APCLIBS)
+ 	$(LINK)
diff --git a/apcupsd.spec b/apcupsd.spec
index 98777bf..243eb92 100644
--- a/apcupsd.spec
+++ b/apcupsd.spec
@@ -1,6 +1,6 @@
 Name:         apcupsd
 Version:      3.14.8
-Release:      1%{?dist}
+Release:      2%{?dist}
 Summary:      APC UPS Power Control Daemon for Linux
 
 Group:        System Environment/Daemons
@@ -12,6 +12,9 @@ Source2:      apcupsd-httpd.conf
 Patch0:       apcupsd-3.14.3-init.patch
 Patch1:       apcupsd-3.14.4-shutdown.patch
 
+#fix FTBFS, c++ linking needs -lstdc++ explicitly
+Patch2:       apcupsd-3.14.8-cxxld.patch
+
 BuildRoot:    %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: glibc-devel >= 2.3, gd-devel > 2.0
@@ -58,6 +61,7 @@ A GUI interface to the APC UPS monitoring daemon.
 %setup -q
 %patch0 -p1 -b .init
 %patch1 -p1 -b .shutdown
+%patch2 -p1 -b .cxxld
 
 %build
 cp -p /usr/lib/rpm/config.{guess,sub} autoconf/
@@ -173,6 +177,9 @@ fi
 
 
 %changelog
+* Wed Sep 22 2010 Michal Hlavinka <mhlavink at redhat.com> - 3.14.8-2
+- fix c++ code linking (FTBFS) (#631288)
+
 * Mon Jan 18 2010 Michal Hlavinka <mhlavink at redhat.com> - 3.14.8-1
 - updated to 3.14.8