From 2e01173138cabb11014f717073da7825c7a29839 Mon Sep 17 00:00:00 2001
From: CentOS Buildsys <bugs@centos.org>
Date: Mar 18 2014 07:39:47 +0000
Subject: import amanda-3.3.3-13.el7.src.rpm


---

diff --git a/SOURCES/amanda-udp.service b/SOURCES/amanda-udp.service
new file mode 100644
index 0000000..1054252
--- /dev/null
+++ b/SOURCES/amanda-udp.service
@@ -0,0 +1,9 @@
+[Unit]
+Description=Amanda Backup System
+After=local-fs.target
+
+[Service]
+User=amandabackup
+Group=disk
+ExecStart=/usr/sbin/amandad -auth=bsd amdump 
+StandardInput=socket
diff --git a/SOURCES/amanda-udp@.service b/SOURCES/amanda-udp@.service
deleted file mode 100644
index 1054252..0000000
--- a/SOURCES/amanda-udp@.service
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=Amanda Backup System
-After=local-fs.target
-
-[Service]
-User=amandabackup
-Group=disk
-ExecStart=/usr/sbin/amandad -auth=bsd amdump 
-StandardInput=socket
diff --git a/SPECS/amanda.spec b/SPECS/amanda.spec
index 0980661..8c41e20 100644
--- a/SPECS/amanda.spec
+++ b/SPECS/amanda.spec
@@ -10,7 +10,7 @@
 Summary: A network-capable tape backup solution
 Name: amanda
 Version: 3.3.3
-Release: 7%{?dist}
+Release: 13%{?dist}
 Source: http://downloads.sourceforge.net/amanda/amanda-%{version}.tar.gz
 Source1: amanda.crontab
 Source4: disklist
@@ -20,7 +20,7 @@ Source10: amanda@.service
 Source11: activate-devpay.1.gz
 Source12: killpgrp.8
 Source13: amanda-udp.socket
-Source14: amanda-udp@.service
+Source14: amanda-udp.service
 Patch2: amanda-3.1.1-xattrs.patch
 Patch3: amanda-3.1.1-tcpport.patch
 Patch6: amanda-3.2.0-config-dir.patch
@@ -49,8 +49,7 @@ Requires(postun): systemd-units
 Requires: fileutils grep initscripts tar /bin/mail
 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 Requires: amanda-libs%{?_isa} = %{version}-%{release}
-Obsoletes: amanda-devel < 2.6.1p2-5
-Provides: amanda-devel = 2.6.1p2-5
+Obsoletes: amanda-devel < 2.6.1p2-9
 
 %global __provides_exclude %{?__provides_exclude:%__provides_exclude|}^perl\\(Math::BigInt\\)
 
@@ -112,7 +111,7 @@ server also needs to have the amanda-client package installed.
 ./autogen
 
 %build
-export MAILER=/bin/mail CFLAGS="$RPM_OPT_FLAGS -fPIE" LDFLAGS=-pie
+export MAILER=/bin/mail CFLAGS="$RPM_OPT_FLAGS -fPIE -fstack-protector-strong" LDFLAGS=-pie
 
 %configure --enable-shared \
            --disable-rpath \
@@ -154,7 +153,7 @@ install -m 600 %SOURCE8 $RPM_BUILD_ROOT%{_localstatedir}/lib/amanda/.amandahosts
 install -p -m 644 -D %{SOURCE9} %{buildroot}%{_unitdir}/amanda.socket
 install -p -m 644 -D %{SOURCE10} %{buildroot}%{_unitdir}/amanda@.service
 install -p -m 644 -D %{SOURCE13} %{buildroot}%{_unitdir}/amanda-udp.socket
-install -p -m 644 -D %{SOURCE14} %{buildroot}%{_unitdir}/amanda-udp@.service
+install -p -m 644 -D %{SOURCE14} %{buildroot}%{_unitdir}/amanda-udp.service
 install -D %{SOURCE11}  %{buildroot}/%{_mandir}/man1/activate-devpay.1.gz
 install -D %{SOURCE12}  %{buildroot}/%{_mandir}/man8/killpgrp.8
 
@@ -214,20 +213,10 @@ rm -rf ${RPM_BUILD_ROOT}
 %doc COPYRIGHT* NEWS README
 %{_unitdir}/amanda@.service
 %{_unitdir}/amanda.socket
-%{_unitdir}/amanda-udp@.service
+%{_unitdir}/amanda-udp.service
 %{_unitdir}/amanda-udp.socket
 
 
-%dir %{_libexecdir}/amanda
-%{_libexecdir}/amanda/amandad
-%{_libexecdir}/amanda/amanda-sh-lib.sh
-%{_libexecdir}/amanda/amcat.awk
-%{_libexecdir}/amanda/amndmjob
-%{_libexecdir}/amanda/amplot.awk
-%{_libexecdir}/amanda/amplot.g
-%{_libexecdir}/amanda/amplot.gp
-%{_libexecdir}/amanda/ndmjob
-
 %{_sbindir}/amandad
 %{_sbindir}/amaespipe
 %{_sbindir}/amarchiver
@@ -239,26 +228,6 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_sbindir}/amgpgcrypt
 %{_sbindir}/amplot
 
-%{perl_vendorarch}/Amanda/Archive.pm
-%{perl_vendorarch}/Amanda/BigIntCompat.pm
-%{perl_vendorarch}/Amanda/ClientService.pm
-%{perl_vendorarch}/Amanda/Config.pm
-%{perl_vendorarch}/Amanda/Config/
-%{perl_vendorarch}/Amanda/Constants.pm
-%{perl_vendorarch}/Amanda/Debug.pm
-%{perl_vendorarch}/Amanda/Feature.pm
-%{perl_vendorarch}/Amanda/Header.pm
-%{perl_vendorarch}/Amanda/IPC
-%{perl_vendorarch}/Amanda/MainLoop.pm
-%{perl_vendorarch}/Amanda/NDMP.pm
-%{perl_vendorarch}/Amanda/Paths.pm
-%{perl_vendorarch}/Amanda/Process.pm
-%{perl_vendorarch}/Amanda/Script_App.pm
-%{perl_vendorarch}/Amanda/Script.pm
-%{perl_vendorarch}/Amanda/Tests.pm
-%{perl_vendorarch}/Amanda/Util.pm
-%{perl_vendorarch}/Amanda/Xfer.pm
-
 %{_mandir}/man5/amanda-archive-format.5*
 %{_mandir}/man7/amanda-compatibility.7*
 %{_mandir}/man5/amanda.conf*
@@ -286,6 +255,16 @@ rm -rf ${RPM_BUILD_ROOT}
 %attr(02700,%amanda_user,%amanda_group) %dir /var/log/amanda
 
 %files libs
+%dir %{_libexecdir}/amanda
+%{_libexecdir}/amanda/amandad
+%{_libexecdir}/amanda/amanda-sh-lib.sh
+%{_libexecdir}/amanda/amcat.awk
+%{_libexecdir}/amanda/amndmjob
+%{_libexecdir}/amanda/amplot.awk
+%{_libexecdir}/amanda/amplot.g
+%{_libexecdir}/amanda/amplot.gp
+%{_libexecdir}/amanda/ndmjob
+
 %{_libdir}/libamdevice*.so
 %{_libdir}/libamserver*.so
 %{_libdir}/libamclient*.so
@@ -297,6 +276,26 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_libdir}/libamxfer*.so
 %{_libdir}/libndmjob*.so
 %{_libdir}/libndmlib*.so
+%{perl_vendorarch}/Amanda/Archive.pm
+%{perl_vendorarch}/Amanda/BigIntCompat.pm
+%{perl_vendorarch}/Amanda/ClientService.pm
+%{perl_vendorarch}/Amanda/Config.pm
+%{perl_vendorarch}/Amanda/Config/
+%{perl_vendorarch}/Amanda/Constants.pm
+%{perl_vendorarch}/Amanda/Debug.pm
+%{perl_vendorarch}/Amanda/Feature.pm
+%{perl_vendorarch}/Amanda/Header.pm
+%{perl_vendorarch}/Amanda/IPC
+%{perl_vendorarch}/Amanda/MainLoop.pm
+%{perl_vendorarch}/Amanda/NDMP.pm
+%{perl_vendorarch}/Amanda/Paths.pm
+%{perl_vendorarch}/Amanda/Process.pm
+%{perl_vendorarch}/Amanda/Script_App.pm
+%{perl_vendorarch}/Amanda/Script.pm
+%{perl_vendorarch}/Amanda/Tests.pm
+%{perl_vendorarch}/Amanda/Util.pm
+%{perl_vendorarch}/Amanda/Xfer.pm
+
 %{perl_vendorarch}/auto/Amanda/Application/
 %{perl_vendorarch}/auto/Amanda/Cmdline/
 %{perl_vendorarch}/auto/Amanda/Device/
@@ -315,9 +314,6 @@ rm -rf ${RPM_BUILD_ROOT}
 %{perl_vendorarch}/auto/Amanda/Tests/
 %{perl_vendorarch}/auto/Amanda/Util/
 %{perl_vendorarch}/auto/Amanda/Xfer/
-
-%files server
-%defattr(-,root,root)
 %{_libexecdir}/amanda/amdumpd
 %{_libexecdir}/amanda/amcheck-device
 %{_libexecdir}/amanda/amidxtaped
@@ -335,6 +331,53 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_libexecdir}/amanda/chunker
 %attr(4750,root,%amanda_group) %{_libexecdir}/amanda/planner
 %{_libexecdir}/amanda/taper
+%{perl_vendorarch}/Amanda/Cmdline.pm
+%{perl_vendorarch}/Amanda/Curinfo/
+%{perl_vendorarch}/Amanda/Curinfo.pm
+%{perl_vendorarch}/Amanda/DB/
+%{perl_vendorarch}/Amanda/Device.pm
+%{perl_vendorarch}/Amanda/Disklist.pm
+%{perl_vendorarch}/Amanda/Extract.pm
+%{perl_vendorarch}/Amanda/Holding.pm
+%{perl_vendorarch}/Amanda/Changer/
+%{perl_vendorarch}/Amanda/Changer.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
+%dir %{_libexecdir}/amanda/application/
+%attr(4750,root,%amanda_group) %{_libexecdir}/amanda/application/amgtar
+%attr(4750,root,%amanda_group) %{_libexecdir}/amanda/application/amstar
+%{_libexecdir}/amanda/application/amlog-script
+%{_libexecdir}/amanda/application/ampgsql
+%{_libexecdir}/amanda/application/amraw
+%{_libexecdir}/amanda/application/amsamba
+%{_libexecdir}/amanda/application/amsuntar
+%{_libexecdir}/amanda/application/amzfs-sendrecv
+%{_libexecdir}/amanda/application/amzfs-snapshot
+%{_libexecdir}/amanda/application/script-email
+
+%attr(4750,root,%amanda_group) %{_libexecdir}/amanda/calcsize
+%attr(4750,root,%amanda_group) %{_libexecdir}/amanda/killpgrp
+%{_libexecdir}/amanda/noop
+%{_libexecdir}/amanda/patch-system
+%attr(4750,root,%amanda_group) %{_libexecdir}/amanda/rundump
+%attr(4750,root,%amanda_group) %{_libexecdir}/amanda/runtar
+%{_libexecdir}/amanda/selfcheck
+%{_libexecdir}/amanda/sendbackup
+%{_libexecdir}/amanda/sendsize
+%{_libexecdir}/amanda/teecount
+%{perl_vendorarch}/Amanda/Application.pm
+%{perl_vendorarch}/Amanda/Application/
+
+%files server
+%defattr(-,root,root)
 %{_sbindir}/activate-devpay
 %{_sbindir}/amaddclient
 %{_sbindir}/amadmin
@@ -390,27 +433,6 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_mandir}/man8/amvault.8*
 %{_mandir}/man1/activate-devpay.1*
 
-%{perl_vendorarch}/Amanda/Cmdline.pm
-%{perl_vendorarch}/Amanda/Curinfo/
-%{perl_vendorarch}/Amanda/Curinfo.pm
-%{perl_vendorarch}/Amanda/DB/
-%{perl_vendorarch}/Amanda/Device.pm
-%{perl_vendorarch}/Amanda/Disklist.pm
-%{perl_vendorarch}/Amanda/Extract.pm
-%{perl_vendorarch}/Amanda/Holding.pm
-%{perl_vendorarch}/Amanda/Changer/
-%{perl_vendorarch}/Amanda/Changer.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
-
 %config(noreplace) %{_sysconfdir}/amanda/crontab.sample
 %config(noreplace) %{_sysconfdir}/amanda/%defconfig/*
 %exclude %{_sysconfdir}/amanda/%defconfig/amanda-client.conf
@@ -424,28 +446,6 @@ rm -rf ${RPM_BUILD_ROOT}
 %files client
 %defattr(-,root,root)
 
-%dir %{_libexecdir}/amanda/application/
-%attr(4750,root,%amanda_group) %{_libexecdir}/amanda/application/amgtar
-%attr(4750,root,%amanda_group) %{_libexecdir}/amanda/application/amstar
-%{_libexecdir}/amanda/application/amlog-script
-%{_libexecdir}/amanda/application/ampgsql
-%{_libexecdir}/amanda/application/amraw
-%{_libexecdir}/amanda/application/amsamba
-%{_libexecdir}/amanda/application/amsuntar
-%{_libexecdir}/amanda/application/amzfs-sendrecv
-%{_libexecdir}/amanda/application/amzfs-snapshot
-%{_libexecdir}/amanda/application/script-email
-
-%attr(4750,root,%amanda_group) %{_libexecdir}/amanda/calcsize
-%attr(4750,root,%amanda_group) %{_libexecdir}/amanda/killpgrp
-%{_libexecdir}/amanda/noop
-%{_libexecdir}/amanda/patch-system
-%attr(4750,root,%amanda_group) %{_libexecdir}/amanda/rundump
-%attr(4750,root,%amanda_group) %{_libexecdir}/amanda/runtar
-%{_libexecdir}/amanda/selfcheck
-%{_libexecdir}/amanda/sendbackup
-%{_libexecdir}/amanda/sendsize
-%{_libexecdir}/amanda/teecount
 %{_sbindir}/amdump_client
 %{_sbindir}/amoldrecover
 %{_sbindir}/amrecover
@@ -465,9 +465,6 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_mandir}/man8/amzfs-snapshot.8*
 %{_mandir}/man8/killpgrp.8*
 
-%{perl_vendorarch}/Amanda/Application.pm
-%{perl_vendorarch}/Amanda/Application/
-
 %config(noreplace) %{_sysconfdir}/amanda/%defconfig/amanda-client.conf
 %config(noreplace) %{_sysconfdir}/amanda/%defconfig/amanda-client-postgresql.conf
 
@@ -476,6 +473,27 @@ rm -rf ${RPM_BUILD_ROOT}
 
 
 %changelog
+* Tue Mar 18 2014 Petr Hracek <phracek@redhat.com> - 3.3.3-13
+- Resolves: #881128 multilib conflicts
+
+* Mon Mar 03 2014 Petr Hracek <phracek@redhat.com> - 3.3.3-12
+- Add fstack-protector-strong into CFLAGS
+- Resolves: #1070779
+
+* Wed Feb 12 2014 Petr Hracek <phracek@redhat.com> - 3.3.3-11
+- Move all libs including perl into amanda-libs package
+- Resolves: #881128
+
+* Fri Jan 31 2014 Petr Hracek <phracek@redhat.com> - 3.3.3-10
+- systemd file incorrectly named
+- Resolves: #1059994
+
+* Fri Jan 24 2014 Daniel Mach <dmach@redhat.com> - 3.3.3-9
+- Mass rebuild 2014-01-24
+
+* Fri Dec 27 2013 Daniel Mach <dmach@redhat.com> - 3.3.3-8
+- Mass rebuild 2013-12-27
+
 * Fri Oct 25 2013 Petr Hracek <phracek@redhat.com> - 3.3.3-7
 - Resolves: #881128 - Move all dynamic libraries into amanda-libs