[amanda/f17: 3/3] Update to 3.3.1 from f18

[Orion Poplawski]

commit c723aaafa95f4bd31206a84ade14e959acfcc8b3
Merge: 43b9314 c9faf05
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Sat Mar 16 08:40:54 2013 -0600

    Update to 3.3.1 from f18

 .gitignore                    |    1 +
 amanda-3.3.0-match_disk.patch |  189 -----------------------------------------
 amanda-3.3.0-qw.patch         |  106 -----------------------
 amanda-3.3.1-stdio.patch      |   15 +++
 amanda.spec                   |   21 ++---
 sources                       |    2 +-
 6 files changed, 27 insertions(+), 307 deletions(-)
---
diff --cc amanda.spec
index bcb86fb,15604d9..1bd85d5
--- a/amanda.spec
+++ b/amanda.spec
@@@ -85,14 -83,9 +83,11 @@@ server also needs to have the amanda-cl
  %patch2 -p1 -b .xattrs
  %patch3 -p1 -b .tcpport
  %patch6 -p1 -b .config
- %patch7 -p3 -b .qw
- %patch8 -p3 -b .match_disk
  %patch9 -p2 -b .glib
- %patch10 -p1 -b .match
- %patch11 -p1 -b .match_fixed
+ %patch10 -p1 -b .stdio
  ./autogen
 +# file_lock is typedef to struct file_lock
 +sed -e 's/struct \(file_lock\)\b/\1/' -i perl/Amanda/Util.c
  
  %build
  export MAILER=/bin/mail CFLAGS="$RPM_OPT_FLAGS -fPIE" LDFLAGS=-pie
@@@ -441,15 -435,11 +437,18 @@@ rm -rf ${RPM_BUILD_ROOT
  
  
  %changelog
 -* Wed Jun 20 2012 Lukáš Nykrýn <lnykryn at redhat.com> - 3.3.1-1
 -- upgrade to new upstream release
++* Sat Mar 16 2013 Orion Poplawski <orion at cora.nwra.com> - 3.3.1-1
++- Update to 3.3.1 to properly fix bug #752253, client/server separation
+ 
 -* Mon Jun 11 2012 Petr Pisar <ppisar at redhat.com> - 3.3.0-6
 -- Perl 5.16 rebuild
 +* Mon Jan 21 2013 Petr Hracek <phracek at redhat.com> - 3.3.0-8
 +- Fixed problem with importing match_* (#895706)
 +
 +* Tue Oct 16 2012 Lukáš Nykrýn <lnykryn at redhat.com> - 3.3.0-7
 +- fix location of match_* functions (#861649)
 +
 +* Tue Sep 18 2012 Petr Pisar <ppisar at redhat.com> - 3.3.0-6
 +- Do not provide perl(Math::BigInt) (bug #648321)
 +- file_lock is typedef to struct file_lock
  
  * Wed Apr 18 2012 Lukáš Nykrýn <lnykryn at redhat.com>> - 3.3.0-5
  - Fix building issues with newer glib