From aab46b6b6b49251118f14da7ccb31b22d9ac8acb Mon Sep 17 00:00:00 2001
From: fenlason <fenlason@fedoraproject.org>
Date: Apr 22 2005 18:54:56 +0000
Subject: Upgrade to 2.4.5


---

diff --git a/.cvsignore b/.cvsignore
index 44172eb..40aa545 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1 @@
-amanda-2.4.4p3.tar.gz
-amanda-2.4.4p4.tar.gz
+amanda-2.4.5.tar.gz
diff --git a/amanda.spec b/amanda.spec
index fe10694..67c3ac0 100644
--- a/amanda.spec
+++ b/amanda.spec
@@ -1,12 +1,15 @@
 %define	_libexecdir	%{_libdir}/amanda
+%{!?defconfig:%define defconfig DailySet1}
+%{!?indexserver:%define indexserver localhost}
+%{!?tapeserver:%define tapeserver %{indexserver}}
 
 # XXX append lib to current _localstatedir setting
 %{expand: %%define	_localstatedir	%{_localstatedir}/lib}
 
 Summary: A network-capable tape backup solution.
 Name: amanda
-Version: 2.4.4p4
-Release: 4
+Version: 2.4.5
+Release: 2
 Source: http://download.sourceforge.net/amanda/amanda-%{version}.tar.gz
 Source1: amanda.crontab
 # Source2: __README_QUICKSETUP__
@@ -18,7 +21,6 @@ Source7: amidxtape-xinetd
 Source8: amandahosts
 Patch0: amanda-2.4.2-bug18322.patch
 Patch1: amanda-2.4.4p2-pie.patch
-Patch2: amanda-2.4.4p4-bug144052.patch
 License: BSD
 Group: Applications/System
 URL: http://www.amanda.org
@@ -80,7 +82,6 @@ be used to develop amanda applications.
 %setup -q
 %patch0 -p1 -b .bug18322
 %patch1 -p1 -b .pie
-%patch2 -p1 -b .bug144052
 libtoolize --copy --force
 aclocal
 automake
@@ -92,7 +93,9 @@ export SED=sed
 
 %configure --enable-shared \
 	--disable-dependency-tracking \
-	--with-index-server=localhost \
+	--with-index-server=%{indexserver} \
+	--with-tape-server=%{tapeserver} \
+	--with-config=%{defconfig} \
 	--with-gnutar-listdir=%{_localstatedir}/amanda/gnutar-lists \
 	--with-smbclient=%{_bindir}/smbclient \
 	--with-amandahosts \
@@ -199,7 +202,7 @@ useradd -M -n -g disk -o -r -d /var/lib/amanda -s /bin/bash \
 
 %files server
 %defattr(-,root,root)
-%doc examples docs/[A-LN-Z]* docs/MULTITAPE COPYRIGHT* NEWS README
+%doc examples docs/[A-LN-Z]* COPYRIGHT* NEWS README
 %{_libdir}/libamserver*.so
 %config(noreplace) /etc/xinetd.d/amandaidx
 %config(noreplace) /etc/xinetd.d/amidxtape
@@ -314,6 +317,14 @@ useradd -M -n -g disk -o -r -d /var/lib/amanda -s /bin/bash \
 %{_libdir}/*.la
 
 %changelog
+* Wed Apr 20 2005 Jay Fenlason <fenlason@redhat.com> 2.4.5-2
+- New upstream release.  This obsoletes the -bug144052 patch.
+- Reorg this spec file slightly to allow someone to specify
+  index server, tape server and default configuration when
+  rebuilding the rpms via something like
+  'rpmbuild -ba --define "indexserver foo.fqdn.com" amanda.spec'
+  This change suggested by Matt Hyclak <hyclak@math.ohiou.edu>.
+  
 * Tue Apr 5 2005 Jay Fenlason <fenlason@redhat.com> 2.4.4p4-4
 - Add -bug144052 patch to close
   bz#144052 amverifyrun sometimes verifies the wrong tapes
diff --git a/sources b/sources
index 4b62dbd..107e873 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3c1d80de30b97a892b7972781c5fb557  amanda-2.4.4p4.tar.gz
+1960b7875424e412d042bc92a1548d7f  amanda-2.4.5.tar.gz