[amanda] update to new upstream beta release

[Jan Görig]

commit b1031e68652fa098f3774af9d0de3fdad007a08c
Author: Jan Görig <jgorig at redhat.com>
Date:   Wed May 4 12:00:39 2011 +0200

    update to new upstream beta release

 .gitignore                   |    1 +
 amanda-3.2.2-krb5-libs.patch |   16 ----------------
 amanda.spec                  |   25 +++++++++++++++++--------
 sources                      |    2 +-
 4 files changed, 19 insertions(+), 25 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9fe694f..83a7e5a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ amanda-3.1.1.tar.gz
 /amanda-3.2.0.tar.gz
 /amanda-3.2.1.tar.gz
 /amanda-3.2.2.tar.gz
+/amanda-3.3.0beta1.tar.gz
diff --git a/amanda.spec b/amanda.spec
index 97e5fb3..0a52516 100644
--- a/amanda.spec
+++ b/amanda.spec
@@ -7,9 +7,10 @@
 
 Summary: A network-capable tape backup solution
 Name: amanda
-Version: 3.2.2
-Release: 2%{?dist}
-Source: http://downloads.sourceforge.net/amanda/amanda-%{version}.tar.gz
+Version: 3.3.0
+Release: 0.1.beta1%{?dist}
+#Source: http://downloads.sourceforge.net/amanda/amanda-%%{version}.tar.gz
+Source: http://downloads.sourceforge.net/amanda/amanda-3.3.0beta1.tar.gz
 Source1: amanda.crontab
 Source4: disklist
 Source5: amanda-xinetd
@@ -19,7 +20,6 @@ Patch2: amanda-3.1.1-xattrs.patch
 Patch3: amanda-3.1.1-tcpport.patch
 Patch5: amanda-3.1.1-bsd.patch
 Patch6: amanda-3.2.0-config-dir.patch
-Patch7: amanda-3.2.2-krb5-libs.patch
 License: BSD and GPLv3+ and GPLv2+ and GPLv2
 Group: Applications/System
 URL: http://www.amanda.org
@@ -79,13 +79,13 @@ the AMANDA server machine.  And, if the server is also to be backed up, the
 server also needs to have the amanda-client package installed.
 
 %prep
-%setup -q -n %{name}-%{version}
+#%%setup -q -n %%{name}-%%{version}
+%setup -q -n %{name}-3.3.0beta1
 %patch1 -p1 -b .example
 %patch2 -p1 -b .xattrs
 %patch3 -p1 -b .tcpport
 %patch5 -p1 -b .bsd
 %patch6 -p1 -b .config
-%patch7 -p1 -b .libs
 ./autogen
 
 %build
@@ -272,6 +272,7 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_libdir}/libamdevice*.so
 %{_libdir}/libamserver*.so
 %{_libexecdir}/amanda/amcleanupdisk
+%{_libexecdir}/amanda/amdumpd
 %{_libexecdir}/amanda/amcheck-device
 %{_libexecdir}/amanda/amidxtaped
 %{_libexecdir}/amanda/amindexd
@@ -316,6 +317,7 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_mandir}/man5/tapelist.5*
 %{_mandir}/man7/amanda-devices.7*
 %{_mandir}/man7/amanda-changers.7*
+%{_mandir}/man7/amanda-interactivity.7*
 %{_mandir}/man7/amanda-taperscan.7*
 %{_mandir}/man8/amaddclient.8*
 %{_mandir}/man8/amadmin.8*
@@ -349,12 +351,13 @@ rm -rf ${RPM_BUILD_ROOT}
 %{perl_vendorarch}/Amanda/Holding.pm
 %{perl_vendorarch}/Amanda/Changer/
 %{perl_vendorarch}/Amanda/Changer.pm
-%{perl_vendorarch}/Amanda/Interactive/
-%{perl_vendorarch}/Amanda/Interactive.pm
+%{perl_vendorarch}/Amanda/Interactivity/
+%{perl_vendorarch}/Amanda/Interactivity.pm
 %{perl_vendorarch}/Amanda/Logfile.pm
 %{perl_vendorarch}/Amanda/Recovery/
 %{perl_vendorarch}/Amanda/Report/
 %{perl_vendorarch}/Amanda/Report.pm
+%{perl_vendorarch}/Amanda/ScanInventory.pm
 %{perl_vendorarch}/Amanda/Tapelist.pm
 %{perl_vendorarch}/Amanda/Taper/
 %{perl_vendorarch}/Amanda/XferServer.pm
@@ -401,10 +404,12 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_libexecdir}/amanda/sendbackup
 %{_libexecdir}/amanda/sendsize
 %{_libexecdir}/amanda/teecount
+%{_sbindir}/amdump_client
 %{_sbindir}/amoldrecover
 %{_sbindir}/amrecover
 
 %{_mandir}/man7/amanda-applications.7*
+%{_mandir}/man8/amdump_client.8*
 %{_mandir}/man5/amanda-client.conf.5*
 %{_mandir}/man8/amgtar.8*
 %{_mandir}/man8/ampgsql.8*
@@ -429,6 +434,10 @@ rm -rf ${RPM_BUILD_ROOT}
 
 
 %changelog
+* Wed May 4 2011 Jan Görig <jgorig at redhat.com> - 3.3.0-0.1.beta1
+- update to new upstream beta release
+- removed merged patch amanda-3.2.2-krb5-libs.patch
+
 * Wed Apr 27 2011 Jan Görig <jgorig at redhat.com> - 3.2.2-2
 - amgtar, amstar and amservice must have setuid flag (#697933)
 
diff --git a/sources b/sources
index 5820ea0..99674c2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4d5a5efcdcf01947a89323cd62d8fb6e  amanda-3.2.2.tar.gz
+ce14292d4f84448b3d87c3b475082d65  amanda-3.3.0beta1.tar.gz