[amanda] - upgrade to new upstream release - removed merged patch amanda-3.1-amrestore.patch - fixed build on

[Jan Görig]

commit e3cc2425ac2c709e15237161a54b62b590f30e33
Author: Jan Görig <jgorig at redhat.com>
Date:   Wed Mar 16 12:02:32 2011 +0100

    - upgrade to new upstream release
    - removed merged patch amanda-3.1-amrestore.patch
    - fixed build on system with amanda installed

 .gitignore                   |    1 +
 amanda-3.1-amrestore.patch   |   23 -----------------------
 amanda-3.2.2-krb5-libs.patch |   16 ++++++++++++++++
 amanda.spec                  |   13 +++++++++----
 sources                      |    2 +-
 5 files changed, 27 insertions(+), 28 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 66b8b8e..9fe694f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ amanda-3.1.1.tar.gz
 /amanda-3.1.3.tar.gz
 /amanda-3.2.0.tar.gz
 /amanda-3.2.1.tar.gz
+/amanda-3.2.2.tar.gz
diff --git a/amanda-3.2.2-krb5-libs.patch b/amanda-3.2.2-krb5-libs.patch
new file mode 100644
index 0000000..a525d50
--- /dev/null
+++ b/amanda-3.2.2-krb5-libs.patch
@@ -0,0 +1,16 @@
+diff --git a/config/amanda/krb5-security.m4 b/config/amanda/krb5-security.m4
+index 0aea8f5..9c8cf30 100644
+--- a/config/amanda/krb5-security.m4
++++ b/config/amanda/krb5-security.m4
+@@ -82,7 +82,10 @@ AC_DEFUN([AMANDA_KRB5_SECURITY],
+                 AMANDA_ADD_CPPFLAGS([-I$KRB5_DIR_FOUND/include])
+             fi
+                 AC_CHECK_LIB(krb5support,main)
+-            AMANDA_ADD_LDFLAGS([-L$KRB5_LIBDIR_FOUND])
++
++            if test "$KRB5_LIBDIR_FOUND" != "$libdir" ; then
++                AMANDA_ADD_LDFLAGS([-L$KRB5_LIBDIR_FOUND])
++            fi
+ 
+             AC_DEFINE(KRB5_SECURITY,1,
+                 [Define if Kerberos 5 security is to be enabled. ])
diff --git a/amanda.spec b/amanda.spec
index 1b1f3a8..84b05cd 100644
--- a/amanda.spec
+++ b/amanda.spec
@@ -7,8 +7,8 @@
 
 Summary: A network-capable tape backup solution
 Name: amanda
-Version: 3.2.1
-Release: 3%{?dist}
+Version: 3.2.2
+Release: 1%{?dist}
 Source: http://downloads.sourceforge.net/amanda/amanda-%{version}.tar.gz
 Source1: amanda.crontab
 Source4: disklist
@@ -19,7 +19,7 @@ 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.1-amrestore.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
@@ -85,7 +85,7 @@ server also needs to have the amanda-client package installed.
 %patch3 -p1 -b .tcpport
 %patch5 -p1 -b .bsd
 %patch6 -p1 -b .config
-%patch7 -p1 -b .amrestore
+%patch7 -p1 -b .libs
 ./autogen
 
 %build
@@ -417,6 +417,11 @@ rm -rf ${RPM_BUILD_ROOT}
 
 
 %changelog
+* Wed Mar 16 2011 Jan Görig <jgorig at redhat.com> - 3.2.2-1
+- upgrade to new upstream release
+- removed merged patch amanda-3.1-amrestore.patch
+- fixed build on system with amanda installed
+
 * Mon Feb 07 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.2.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
diff --git a/sources b/sources
index a365c82..5820ea0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-52448420a04d27b8ce47ef397b0a7061  amanda-3.2.1.tar.gz
+4d5a5efcdcf01947a89323cd62d8fb6e  amanda-3.2.2.tar.gz