[amanda] Fix for swig-3.0.5 (#1195297)

[Petr Hracek]

commit b6e48b1a156dd8c068189ebc701314410be542ed
Author: Petr Hracek <phracek at redhat.com>
Date:   Fri Feb 27 13:54:55 2015 +0100

    Fix for swig-3.0.5 (#1195297)
    
    Signed-off-by: Petr Hracek <phracek at redhat.com>

 amanda-swig-3.0.5.patch | 60 +++++++++++++++++++++++++++++++++++++++++++++++++
 amanda.spec             | 27 +++++++++++++---------
 2 files changed, 76 insertions(+), 11 deletions(-)
---
diff --git a/amanda-swig-3.0.5.patch b/amanda-swig-3.0.5.patch
new file mode 100644
index 0000000..cffefdd
--- /dev/null
+++ b/amanda-swig-3.0.5.patch
@@ -0,0 +1,60 @@
+diff --git a/perl/Amanda/Xfer.swg b/perl/Amanda/Xfer.swg
+index 522d61f..352c5e9 100644
+--- a/perl/Amanda/Xfer.swg
++++ b/perl/Amanda/Xfer.swg
+@@ -513,16 +513,16 @@ xfer_get_amglue_source(
+ /* First, a few macros to generate decent Perl */
+ 
+ %define PACKAGE(PKG)
+-%perlcode {
++%perlcode %{
+ package PKG;
+-}
++%}
+ %enddef
+ 
+ %define XFER_ELEMENT_SUBCLASS_OF(PARENT)
+-%perlcode {
++%perlcode %{
+ use vars qw(@ISA);
+ @ISA = qw( PARENT );
+-}
++%}
+ %enddef
+ 
+ %define XFER_ELEMENT_SUBCLASS()
+@@ -530,28 +530,28 @@ XFER_ELEMENT_SUBCLASS_OF(Amanda::Xfer::Element)
+ %enddef
+ 
+ %define DECLARE_CONSTRUCTOR(C_CONSTRUCTOR)
+-%perlcode {
++%perlcode %{
+ sub new { 
+     my $pkg = shift;
+     # The C function adds the proper blessing -- this function
+     # just gets $pkg out of the way.
+     C_CONSTRUCTOR(@_);
+ }
+-}
++%}
+ %enddef
+ 
+ %define OVERLOAD_REPR()
+-%perlcode {
++%perlcode %{
+ use overload '""' => sub { $_[0]->repr(); };
+ # overload comparison, so users can ask if one obj == another
+ use overload '==' => sub {     Amanda::Xfer::same_elements($_[0], $_[1]); };
+ use overload '!=' => sub { not Amanda::Xfer::same_elements($_[0], $_[1]); };
+-}
++%}
+ %enddef
+ 
+ %define DECLARE_METHOD(METHOD_NAME, C_FUNCTION)
+-%perlcode {*METHOD_NAME = *C_FUNCTION;
+-}
++%perlcode %{*METHOD_NAME = *C_FUNCTION;
++%}
+ %enddef
+ 
+ /* And now define the required perl classes */
diff --git a/amanda.spec b/amanda.spec
index 4cb3ac0..93b81b2 100644
--- a/amanda.spec
+++ b/amanda.spec
@@ -10,7 +10,7 @@
 Summary: A network-capable tape backup solution
 Name: amanda
 Version: 3.3.6
-Release: 9%{?dist}
+Release: 10%{?dist}
 Source: http://downloads.sourceforge.net/amanda/amanda-%{version}.tar.gz
 Source1: amanda.crontab
 Source4: disklist
@@ -23,11 +23,12 @@ Source13: amanda-udp.socket
 Source14: amanda-udp.service
 Source15: kamanda.socket
 Source16: kamanda at .service
-Patch2: amanda-3.1.1-xattrs.patch
-Patch3: amanda-3.1.1-tcpport.patch
-Patch6: amanda-3.2.0-config-dir.patch
-Patch11: amanda-3.3.2-autogen.patch
-Patch12: amanda-krb5.patch
+Patch1: amanda-3.1.1-xattrs.patch
+Patch2: amanda-3.1.1-tcpport.patch
+Patch3: amanda-3.2.0-config-dir.patch
+Patch4: amanda-3.3.2-autogen.patch
+Patch5: amanda-krb5.patch
+Patch6: amanda-swig-3.0.5.patch
 
 License: BSD and GPLv3+ and GPLv2+ and GPLv2
 Group: Applications/System
@@ -105,11 +106,12 @@ server also needs to have the amanda-client package installed.
 
 %prep
 %setup -q -n %{name}-%{version}
-%patch2 -p1 -b .xattrs
-%patch3 -p1 -b .tcpport
-%patch6 -p1 -b .config
-%patch11 -p1 -b .autogen
-%patch12 -p1 -b .krb5
+%patch1 -p1 -b .xattrs
+%patch2 -p1 -b .tcpport
+%patch3 -p1 -b .config
+%patch4 -p1 -b .autogen
+%patch5 -p1 -b .krb5
+%patch6 -p1 -b .swig-3.0.5
 ./autogen
 
 %build
@@ -485,6 +487,9 @@ rm -rf ${RPM_BUILD_ROOT}
 
 
 %changelog
+* Fri Feb 27 2015 Petr Hracek <phracek at redhat.com> - 3.3.6-10
+- Fix for Swig-3.0.5 (#1195297)
+
 * Fri Nov 21 2014 Petr Hracek <phracek at redhat.com> - 3.3.6-9
 - inlude unit files for systemd