From e94541ab4099b193b5bc2baf5ad3201f8824915d Mon Sep 17 00:00:00 2001
From: Radek Brich <rbrich@fedoraproject.org>
Date: Jun 25 2007 13:02:21 +0000
Subject: fix more undefined symbols


---

diff --git a/amanda-2.5.2p1-undefSymbols.patch b/amanda-2.5.2p1-undefSymbols.patch
index 79da9ab..7ca6e61 100644
--- a/amanda-2.5.2p1-undefSymbols.patch
+++ b/amanda-2.5.2p1-undefSymbols.patch
@@ -1,10 +1,44 @@
---- amanda-2.5.2p1/server-src/Makefile.am.undefSymbols	2007-06-21 14:45:54.000000000 +0200
-+++ amanda-2.5.2p1/server-src/Makefile.am	2007-06-22 13:30:24.000000000 +0200
-@@ -98,6 +98,8 @@ amindexd_LDADD = ../common-src/libamanda
+--- amanda-2.5.2p1/client-src/Makefile.am.undefSymbols	2007-06-25 14:46:08.000000000 +0200
++++ amanda-2.5.2p1/client-src/Makefile.am	2007-06-25 14:46:08.000000000 +0200
+@@ -50,6 +50,8 @@ libamclient_la_SOURCES=	amandates.c		get
+ 
+ libamclient_la_LDFLAGS = -release $(VERSION)
+ 
++libamclient_la_LIBADD = ../common-src/libamanda.$(LIB_EXTENSION)
++
+ ###
+ # Because libamanda includes routines (e.g. regex) provided by some system
+ # libraries, and because of the way libtool sets up the command line, we
+--- amanda-2.5.2p1/amandad-src/Makefile.am.undefSymbols	2007-06-25 14:46:08.000000000 +0200
++++ amanda-2.5.2p1/amandad-src/Makefile.am	2007-06-25 14:46:08.000000000 +0200
+@@ -22,6 +22,8 @@ endif
+ libamandad_la_SOURCES= amandad_util.c
+ libamandad_la_LDFLAGS = -release $(VERSION)
+ 
++libamandad_la_LIBADD = ../common-src/libamanda.$(LIB_EXTENSION)
++
+ noinst_HEADERS  = amandad.h
+ 
+ ###
+--- amanda-2.5.2p1/tape-src/Makefile.am.undefSymbols	2007-06-25 14:46:08.000000000 +0200
++++ amanda-2.5.2p1/tape-src/Makefile.am	2007-06-25 14:53:16.000000000 +0200
+@@ -27,6 +27,8 @@ libamtape_la_SOURCES = 	output-file.c \
+ 
+ libamtape_la_LDFLAGS =  -release $(VERSION)
+ 
++libamtape_la_LIBADD = ../common-src/libamanda.$(LIB_EXTENSION)
++
+ ###
+ # Because libamanda includes routines (e.g. regex) provided by some system
+ # libraries, and because of the way libtool sets up the command line, we
+--- amanda-2.5.2p1/server-src/Makefile.am.undefSymbols	2007-06-25 14:46:08.000000000 +0200
++++ amanda-2.5.2p1/server-src/Makefile.am	2007-06-25 14:46:08.000000000 +0200
+@@ -98,6 +98,9 @@ amindexd_LDADD = ../common-src/libamanda
  	../common-src/libamanda.$(LIB_EXTENSION) \
  	../gnulib/libgnu.$(LIB_EXTENSION)
  
-+libamserver_la_LIBADD = ../common-src/libamanda.$(LIB_EXTENSION)
++libamserver_la_LIBADD = ../common-src/libamanda.$(LIB_EXTENSION) \
++	../tape-src/libamtape.$(LIB_EXTENSION)
 +
  SUFFIXES =		.sh .pl
  
diff --git a/amanda.spec b/amanda.spec
index f424bfe..b9c7332 100644
--- a/amanda.spec
+++ b/amanda.spec
@@ -11,7 +11,7 @@
 Summary: A network-capable tape backup solution
 Name: amanda
 Version: 2.5.2p1
-Release: 2%{?dist}
+Release: 3%{?dist}
 Source: http://download.sourceforge.net/amanda/amanda-%{version}.tar.gz
 Source1: amanda.crontab
 Source4: disklist
@@ -336,6 +336,10 @@ useradd -M -n -g %amanda_group -o -r -d %{_localstatedir}/amanda -s /bin/bash \
 %{_libdir}/libamandad.so
 
 %changelog
+* Mon Jun 25 2007 Radek Brich <rbrich@redhat.com> 2.5.2.p1-3
+- Update -undefSymbols patch. All undefined symbols reported by
+  'ldd -r' should now be fixed (#198178).
+
 * Fri Jun 22 2007 Radek Brich <rbrich@redhat.com> 2.5.2.p1-2
 - Fix undefined symbols in libamserver.so.
 - Fix ./autogen so it automatically installs ylwrap (bug 224143).