- added banner about tape changer conf

[packages/amanda.git] / amanda.spec

diff --git a/amanda.spec b/amanda.spec
index 49151e6e17309b471b20236b0caf137605d29bd2..a725c13e4f497908dcef67f4edfdbde400ca85e6 100644 (file)
--- a/amanda.spec
+++ b/amanda.spec
@@ -9,26 +9,28 @@
 Summary:       A network-capable tape backup solution
 Summary(pl.UTF-8):     Sieciowo zorientowany system tworzenia kopii zapasowych
 Name:          amanda
 Summary:       A network-capable tape backup solution
 Summary(pl.UTF-8):     Sieciowo zorientowany system tworzenia kopii zapasowych
 Name:          amanda

-Version:       2.6.0p2
-Release:       3
+Version:       3.2.0
+Release:       0.1

 License:       BSD
 Group:         Networking/Utilities
 Source0:       http://dl.sourceforge.net/amanda/%{name}-%{version}.tar.gz
 License:       BSD
 Group:         Networking/Utilities
 Source0:       http://dl.sourceforge.net/amanda/%{name}-%{version}.tar.gz

-# Source0-md5: 75dcba5a75327ebcd4f197a93b8e8c9c
+# Source0-md5: df73a318af8f04e9ad2ecb4d59dc052c

 Source1:       %{name}-srv.crontab
 Source2:       %{name}.inetd
 Source3:       %{name}idx.inetd
 Source4:       amidxtape.inetd
 Source1:       %{name}-srv.crontab
 Source2:       %{name}.inetd
 Source3:       %{name}idx.inetd
 Source4:       amidxtape.inetd

+# http://amanda.svn.sourceforge.net/viewvc/amanda/amanda/branches/3_2/contrib/convert-zd-mtx-to-robot.sh
+Source5:       convert-zd-mtx-to-robot.sh

 Patch0:                %{name}-no_libnsl.patch
 Patch1:                %{name}-chg-zd-mtx-sh.patch
 Patch2:                %{name}-tar.patch
 Patch0:                %{name}-no_libnsl.patch
 Patch1:                %{name}-chg-zd-mtx-sh.patch
 Patch2:                %{name}-tar.patch

-Patch3:                %{name}-bashizm.patch
+Patch3:                %{name}-common.patch

 Patch4:                %{name}-as_needed.patch
 Patch5:                %{name}-tapetypes.patch
 Patch6:                %{name}-FHS.patch
 Patch7:                %{name}-no-buildtime-ipv6.patch
 Patch8:                %{name}-heimdal.patch
 Patch4:                %{name}-as_needed.patch
 Patch5:                %{name}-tapetypes.patch
 Patch6:                %{name}-FHS.patch
 Patch7:                %{name}-no-buildtime-ipv6.patch
 Patch8:                %{name}-heimdal.patch

-Patch9:                %{name}-amtoc.patch
+Patch9:                %{name}-ac.patch

 URL:           http://www.amanda.org/
 BuildRequires: autoconf >= 2.53
 BuildRequires: automake
 URL:           http://www.amanda.org/
 BuildRequires: autoconf >= 2.53
 BuildRequires: automake


@@ -36,9 +38,10 @@ BuildRequires:       curl-devel >= 7.10.0
 BuildRequires: dump
 BuildRequires: flex
 BuildRequires: glib2-devel
 BuildRequires: dump
 BuildRequires: flex
 BuildRequires: glib2-devel

+BuildRequires: gnuplot

 # curl is broken, see curl-config --libs
 BuildRequires: keyutils-devel
 # curl is broken, see curl-config --libs
 BuildRequires: keyutils-devel

-BuildRequires: krb5-devel >= 1.6-4
+BuildRequires: heimdal-devel

 BuildRequires: libtool
 BuildRequires: libxslt-progs
 BuildRequires: ncurses-devel
 BuildRequires: libtool
 BuildRequires: libxslt-progs
 BuildRequires: ncurses-devel


@@ -47,7 +50,8 @@ BuildRequires:        openssl-devel
 BuildRequires: perl-devel >= 5.6.0
 BuildRequires: pkgconfig
 BuildRequires: readline-devel >= 4.2
 BuildRequires: perl-devel >= 5.6.0
 BuildRequires: pkgconfig
 BuildRequires: readline-devel >= 4.2

-BuildRequires: rpmbuild(macros) >= 1.268
+BuildRequires: rpmbuild(macros) >= 1.559
+BuildRequires: rpm-perlprov

 %{?with_samba:BuildRequires:   samba-client}
 BuildRequires: swig
 %{?with_xfs:BuildRequires:     xfsdump}
 %{?with_samba:BuildRequires:   samba-client}
 BuildRequires: swig
 %{?with_xfs:BuildRequires:     xfsdump}


@@ -55,6 +59,9 @@ Conflicts:    shadow < 1:4.0.4.1-4
 Conflicts:     pwdutils < 3.1.2-2
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 Conflicts:     pwdutils < 3.1.2-2
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 

+# for some unknown reason those get detected in R but not in P (Tie::StdHash comes from perl)
+%define                _noautoreq      'perl(Tie::StdHash)' 'perl(Amanda::Recovery::Clerk::Feedback)' 'perl(Amanda::Taper::Scribe::Feedback)'
+

 %define                _ulibdir        %{_prefix}/lib
 
 %description
 %define                _ulibdir        %{_prefix}/lib
 
 %description


@@ -80,9 +87,9 @@ podstawowe pliki programu i powinien być zainstalowany zarówno na
 serwerze jak i na kliencie. Pamiętaj także o instalacji pakietów
 amanda-client i amanda-server!
 
 serwerze jak i na kliencie. Pamiętaj także o instalacji pakietów
 amanda-client i amanda-server!
 

-%package libs
-Summary:       Amanda shared libraries
-Summary(pl.UTF-8):     Biblioteki współdzielone pakietu amanda
+%package common
+Summary:       Amanda common files
+Summary(pl.UTF-8):     Wspólne pliki pakietu amanda

 Group:         Networking/Utilities
 Requires(postun):      /usr/sbin/groupdel
 Requires(postun):      /usr/sbin/userdel
 Group:         Networking/Utilities
 Requires(postun):      /usr/sbin/groupdel
 Requires(postun):      /usr/sbin/userdel


@@ -91,15 +98,39 @@ Requires(pre):      /usr/bin/chsh
 Requires(pre): /usr/bin/getgid
 Requires(pre): /usr/sbin/groupadd
 Requires(pre): /usr/sbin/useradd
 Requires(pre): /usr/bin/getgid
 Requires(pre): /usr/sbin/groupadd
 Requires(pre): /usr/sbin/useradd

+%requires_ge   glib2

 Requires:      setup >= 2.6.1-1
 Provides:      group(amanda)
 Provides:      user(amanda)
 Requires:      setup >= 2.6.1-1
 Provides:      group(amanda)
 Provides:      user(amanda)

+Obsoletes:     amanda-libs
+Obsoletes:     amanda-perl
+
+%description common
+AMANDA, the Advanced Maryland Automatic Network Disk Archiver, is a
+backup system that allows the administrator of a LAN to set up a
+single master backup server to back up multiple hosts to a single
+large capacity tape drive. AMANDA uses native dump and/or GNU tar
+facilities and can back up a large number of workstations running
+multiple versions of Unix. Newer versions of AMANDA (including this
+version) can use SAMBA to back up Microsoft(TM) Windows95/NT hosts.
+The amanda package contains the core AMANDA programs and will need to
+be installed on both AMANDA clients and AMANDA servers. Note that you
+will have to install the amanda-client and amanda-server packages as
+well.

 
 

-%description libs
-Amanda shared libraries.
+Amanda common files.
+
+%description common -l pl.UTF-8
+AMANDA jest sieciowo zorientowanym systemem tworzenia kopii
+zapasowych. Umożliwia administratorowi sieci tworzenie kopii z kilku
+hostów na jednej maszynie wyposażonej w pojemny dysk lub streamer.
+Nowsze wersje programu umożliwiają zabezpieczanie zasobów Microsoft
+Windows 95/98/NT/2000 przy użyciu protokołu Samba. Ten pakiet zawiera
+podstawowe pliki programu i powinien być zainstalowany zarówno na
+serwerze jak i na kliencie. Pamiętaj także o instalacji pakietów
+amanda-client i amanda-server!

 
 

-%description libs -l pl.UTF-8
-Biblioteki współdzielone pakietu amanda.
+Wspólne pliki pakietu amanda.

 
 %package client
 Summary:       The client side of Amanda
 
 %package client
 Summary:       The client side of Amanda


@@ -107,7 +138,7 @@ Summary(pl.UTF-8):  Klient Amandy
 Group:         Networking/Utilities
 Requires(post):        /bin/hostname
 Requires(post):        /usr/bin/ssh-keygen
 Group:         Networking/Utilities
 Requires(post):        /bin/hostname
 Requires(post):        /usr/bin/ssh-keygen

-Requires:      %{name}-libs = %{version}-%{release}
+Requires:      %{name}-common = %{version}-%{release}

 Requires:      rc-inetd
 Suggests:      openssh-clients
 Suggests:      openssh-server
 Requires:      rc-inetd
 Suggests:      openssh-clients
 Suggests:      openssh-server


@@ -133,8 +164,7 @@ Summary(pl.UTF-8):  Serwer Amandy
 Group:         Networking/Utilities
 Requires(post):        /bin/hostname
 Requires(post):        /usr/bin/ssh-keygen
 Group:         Networking/Utilities
 Requires(post):        /bin/hostname
 Requires(post):        /usr/bin/ssh-keygen

-Requires:      %{name}-libs = %{version}-%{release}
-Requires:      %{name}-perl = %{version}-%{release}
+Requires:      %{name}-common = %{version}-%{release}

 Requires:      /etc/cron.d
 Requires:      crondaemon
 Requires:      gnuplot
 Requires:      /etc/cron.d
 Requires:      crondaemon
 Requires:      gnuplot


@@ -158,18 +188,6 @@ Ten pakiet powinien być zainstalowany na maszynach, na których będą
 magazynowane kopie zapasowe (lub do których podpięte są urządzenia
 typu streamer).
 
 magazynowane kopie zapasowe (lub do których podpięte są urządzenia
 typu streamer).
 

-%package perl
-Summary:       Perl bindings for amanda
-Summary(pl.UTF-8):     Wiązania perla dla Amandy
-Group:         Networking/Utilities
-Requires:      %{name}-libs = %{version}-%{release}
-
-%description perl
-Perl bindings for amanda.
-
-%description perl -l pl.UTF-8
-Wiązania perla dla Amandy.
-

 %prep
 %setup -q
 %patch0 -p1
 %prep
 %setup -q
 %patch0 -p1


@@ -189,14 +207,12 @@ Wiązania perla dla Amandy.
 %{__automake}
 %configure \
        DUMP=/sbin/dump \
 %{__automake}
 %configure \
        DUMP=/sbin/dump \

-       GNUPLOT=/usr/bin/gnuplot \

        GZIP=/bin/gzip \
        MAILER=/bin/mail \
        MT=/bin/mt \
        MTX=/usr/sbin/mtx \
        PRINT=/usr/bin/lpr \
        RESTORE=/sbin/restore \
        GZIP=/bin/gzip \
        MAILER=/bin/mail \
        MT=/bin/mt \
        MTX=/usr/sbin/mtx \
        PRINT=/usr/bin/lpr \
        RESTORE=/sbin/restore \

-       STAR=/usr/bin/star \

        %{?with_xfs:XFSDUMP=/sbin/xfsdump} \
        %{?with_xfs:XFSRESTORE=/sbin/xfsrestore} \
        --disable-static \
        %{?with_xfs:XFSDUMP=/sbin/xfsdump} \
        %{?with_xfs:XFSRESTORE=/sbin/xfsrestore} \
        --disable-static \


@@ -207,24 +223,24 @@ Wiązania perla dla Amandy.
        --with-user=amanda \
        --with-group=amanda \
        --with-tape-device=/dev/null \
        --with-user=amanda \
        --with-group=amanda \
        --with-tape-device=/dev/null \

-       --with-ftape-rawdevice=/dev/null \
-       --with-changer-device=/dev/null \

        --with-fqdn \
        %{?with_samba:--with-smbclient=%{_bindir}/smbclient} \
        --with-fqdn \
        %{?with_samba:--with-smbclient=%{_bindir}/smbclient} \

+       --with-star=%{_bindir}/star \
+       --with-gnuplot=%{_bindir}/gnuplot \

        --with-bsd-security \
        --with-bsdtcp-security \
        --with-ssh-security \
        --with-krb5-security \
        --with-bsd-security \
        --with-bsdtcp-security \
        --with-ssh-security \
        --with-krb5-security \

-       --without-krb4-security \

        --with-buffered-dump \
        --with-amandahosts \
        --with-configdir=%{_sysconfdir}/amanda \
        --with-gnutar-listdir=%{_sharedstatedir}/amanda/gnutar-lists \
        --with-amandates=%{_sharedstatedir}/amanda/amandates \
        --with-debugging=%{_sharedstatedir}/amanda/debug \
        --with-buffered-dump \
        --with-amandahosts \
        --with-configdir=%{_sysconfdir}/amanda \
        --with-gnutar-listdir=%{_sharedstatedir}/amanda/gnutar-lists \
        --with-amandates=%{_sharedstatedir}/amanda/amandates \
        --with-debugging=%{_sharedstatedir}/amanda/debug \

-       --with-tmpdir=/var/tmp \
+       --with-tmpdir=/var/tmp/amanda \

        --with-amperldir=%{perl_vendorarch} \
        --with-ipv6 \
        --with-amperldir=%{perl_vendorarch} \
        --with-ipv6 \

+       --with-readline \

        --disable-installperms
 
 %{__make}
        --disable-installperms
 
 %{__make}


@@ -247,6 +263,8 @@ install example/amanda.conf $RPM_BUILD_ROOT%{_sysconfdir}/amanda
 install example/amanda-client.conf $RPM_BUILD_ROOT%{_sysconfdir}/amanda
 touch $RPM_BUILD_ROOT%{_sharedstatedir}/amanda/.amandahosts
 
 install example/amanda-client.conf $RPM_BUILD_ROOT%{_sysconfdir}/amanda
 touch $RPM_BUILD_ROOT%{_sharedstatedir}/amanda/.amandahosts
 

+install %{SOURCE5} $RPM_BUILD_ROOT%{_sbindir}/amconvert-zd-mtx-to-robot.sh
+

 touch $RPM_BUILD_ROOT%{_sharedstatedir}/amanda/.ssh/{,client_}authorized_keys
 touch $RPM_BUILD_ROOT%{_sharedstatedir}/amanda/.ssh/id_rsa_amdump{,.pub}
 touch $RPM_BUILD_ROOT%{_sharedstatedir}/amanda/.ssh/id_rsa_amrecover{,.pub}
 touch $RPM_BUILD_ROOT%{_sharedstatedir}/amanda/.ssh/{,client_}authorized_keys
 touch $RPM_BUILD_ROOT%{_sharedstatedir}/amanda/.ssh/id_rsa_amdump{,.pub}
 touch $RPM_BUILD_ROOT%{_sharedstatedir}/amanda/.ssh/id_rsa_amrecover{,.pub}


@@ -262,10 +280,13 @@ fi
 
 find $RPM_BUILD_ROOT -name \*.la | xargs rm -f
 
 
 find $RPM_BUILD_ROOT -name \*.la | xargs rm -f
 

+%{__rm} $RPM_BUILD_ROOT%{_datadir}/amanda/{COPYRIGHT,ChangeLog,NEWS,ReleaseNotes}
+%{__rm} $RPM_BUILD_ROOT%{_datadir}/amanda/example/{chg-multi,chg-scsi}.conf
+

 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 

-%triggerpostun libs -- %{name}-libs < 2.6.0p2-3
+%triggerpostun common -- amanda-libs < 2.6.0p2-3

 echo "Adding amanda to disk and tape groups"
 /usr/sbin/usermod -G disk,tape amanda
 echo "Setting amanda shell to /bin/sh"
 echo "Adding amanda to disk and tape groups"
 /usr/sbin/usermod -G disk,tape amanda
 echo "Setting amanda shell to /bin/sh"


@@ -276,11 +297,11 @@ if [ -f %{_sharedstatedir}/amanda/.amandahosts ]; then
        chmod 600 %{_sharedstatedir}/amanda/.amandahosts
 fi
 
        chmod 600 %{_sharedstatedir}/amanda/.amandahosts
 fi
 

-%pre libs
-%groupadd -P %{name}-libs -g 80 amanda
-%useradd -P %{name}-libs -u 80 -G disk,tape -d /var/lib/amanda -s /bin/sh -c "Amanda Backup user" -g amanda amanda
+%pre common
+%groupadd -P %{name}-common -g 80 amanda
+%useradd -P %{name}-common -u 80 -G disk,tape -d /var/lib/amanda -s /bin/sh -c "Amanda Backup user" -g amanda amanda

 
 

-%postun libs
+%postun common

 if [ "$1" = "0" ]; then
        %userremove amanda
        %groupremove amanda
 if [ "$1" = "0" ]; then
        %userremove amanda
        %groupremove amanda


@@ -329,21 +350,49 @@ fi
 if [ "$1" = "1" ]; then
        echo "Don't forget to edit /etc/cron.d/amanda-srv." 1>&2
 fi
 if [ "$1" = "1" ]; then
        echo "Don't forget to edit /etc/cron.d/amanda-srv." 1>&2
 fi

+%banner %{name} -e << EOF
+Warning: Tape changer configuration has chaged, please read
+%{_docdir}/%{name}-server-%{version}/ReleaseNotes.gz
+and %{_docdir}/%{name}-server-%{version}/NEWS.gz for details.
+You can use %{_sbindir}/amconvert-zd-mtx-to-robot.sh script
+to upgrade to chg-robot.
+EOF

 
 %postun server
 if [ "$1" = 0 ]; then
        %service -q rc-inetd reload
 fi
 
 
 %postun server
 if [ "$1" = 0 ]; then
        %service -q rc-inetd reload
 fi
 

-%files libs
+%files common

 %defattr(644,root,root,755)
 %doc AUTHORS COPYRIGHT ChangeLog NEWS README ReleaseNotes UPGRADING
 %attr(755,root,root) %{_libdir}/amanda/libamanda*.so
 %defattr(644,root,root,755)
 %doc AUTHORS COPYRIGHT ChangeLog NEWS README ReleaseNotes UPGRADING
 %attr(755,root,root) %{_libdir}/amanda/libamanda*.so

+%attr(755,root,root) %{_libdir}/amanda/libamar*.so
+%attr(755,root,root) %{_libdir}/amanda/libamxfer*.so
+%attr(755,root,root) %{_libdir}/amanda/libamglue*.so
+%attr(755,root,root) %{_libdir}/amanda/libndmjob*.so
+%attr(755,root,root) %{_libdir}/amanda/libndmlib*.so
+%attr(755,root,root) %{_libdir}/amanda/amndmjob
+%attr(755,root,root) %{_libdir}/amanda/ndmjob

 %attr(750,amanda,amanda) %dir %{_sysconfdir}/amanda
 %dir %{_libdir}/amanda
 %if %{_lib} != "lib"
 %{_ulibdir}/amanda
 %endif
 %attr(750,amanda,amanda) %dir %{_sysconfdir}/amanda
 %dir %{_libdir}/amanda
 %if %{_lib} != "lib"
 %{_ulibdir}/amanda
 %endif

+%{_libdir}/amanda/amanda-sh-lib.sh
+%attr(755,root,root) %{_sbindir}/amaespipe
+%attr(755,root,root) %{_sbindir}/amarchiver
+%attr(755,root,root) %{_sbindir}/amcrypt*
+%attr(755,root,root) %{_sbindir}/amgetconf
+%attr(755,root,root) %{_sbindir}/amgpgcrypt
+%attr(750,amanda,amanda) %dir %{_datadir}/amanda
+%attr(750,amanda,amanda) %dir %{_datadir}/amanda/example
+%attr(750,amanda,amanda) %dir %{_datadir}/amanda/example/label-templates
+%attr(640,amanda,amanda) %{_datadir}/amanda/example/*amanda*
+%attr(640,amanda,amanda) %{_datadir}/amanda/example/disklist
+%attr(640,amanda,amanda) %{_datadir}/amanda/example/label-templates/*.ps
+%attr(750,amanda,amanda) %dir %{_datadir}/amanda/template.d
+%attr(640,amanda,amanda) %{_datadir}/amanda/template.d/*

 %attr(750,amanda,amanda) %dir %{_sharedstatedir}/amanda
 %attr(700,amanda,amanda) %dir %{_sharedstatedir}/amanda/.ssh
 %attr(700,amanda,amanda) %dir %{_sharedstatedir}/amanda/.gnupg
 %attr(750,amanda,amanda) %dir %{_sharedstatedir}/amanda
 %attr(700,amanda,amanda) %dir %{_sharedstatedir}/amanda/.ssh
 %attr(700,amanda,amanda) %dir %{_sharedstatedir}/amanda/.gnupg


@@ -352,6 +401,65 @@ fi
 %attr(600,amanda,amanda) %config(noreplace) %verify(not md5 mtime size) %{_sharedstatedir}/amanda/.amandahosts
 # Commented out so it won't get removed on uninstall
 #%attr(600,amanda,amanda) %ghost %{_sharedstatedir}/amanda/.ssh/authorized_keys
 %attr(600,amanda,amanda) %config(noreplace) %verify(not md5 mtime size) %{_sharedstatedir}/amanda/.amandahosts
 # Commented out so it won't get removed on uninstall
 #%attr(600,amanda,amanda) %ghost %{_sharedstatedir}/amanda/.ssh/authorized_keys

+%{_mandir}/man5/amanda-archive-format.5*
+%{_mandir}/man7/amanda-auth.7*
+%{_mandir}/man7/amanda-match.7*
+%{_mandir}/man7/amanda-scripts.7*
+%{_mandir}/man8/amaespipe.8*
+%{_mandir}/man8/amanda.8*
+%{_mandir}/man8/amarchiver.8*
+%{_mandir}/man8/amcrypt*.8*
+%{_mandir}/man8/amgetconf.8*
+%{_mandir}/man8/amgpgcrypt.8*
+%{_mandir}/man8/script-email.8*
+
+%dir %{perl_vendorarch}/Amanda
+%dir %{perl_vendorarch}/Amanda/Config
+%dir %{perl_vendorarch}/Amanda/IPC
+%{perl_vendorarch}/Amanda/Archive.pm
+%{perl_vendorarch}/Amanda/BigIntCompat.pm
+%{perl_vendorarch}/Amanda/ClientService.pm
+%{perl_vendorarch}/Amanda/Config.pm
+%{perl_vendorarch}/Amanda/Config/FoldingHash.pm
+%{perl_vendorarch}/Amanda/Constants.pm
+%{perl_vendorarch}/Amanda/Debug.pm
+%{perl_vendorarch}/Amanda/Feature.pm
+%{perl_vendorarch}/Amanda/Header.pm
+%{perl_vendorarch}/Amanda/IPC/Binary.pm
+%{perl_vendorarch}/Amanda/IPC/LineProtocol.pm
+%{perl_vendorarch}/Amanda/MainLoop.pm
+%{perl_vendorarch}/Amanda/NDMP.pm
+%{perl_vendorarch}/Amanda/Paths.pm
+%{perl_vendorarch}/Amanda/Process.pm
+%{perl_vendorarch}/Amanda/Script.pm
+%{perl_vendorarch}/Amanda/Script_App.pm
+%{perl_vendorarch}/Amanda/Tests.pm
+%{perl_vendorarch}/Amanda/Util.pm
+%{perl_vendorarch}/Amanda/Xfer.pm
+%dir %{perl_vendorarch}/auto/Amanda
+%dir %{perl_vendorarch}/auto/Amanda/Archive
+%dir %{perl_vendorarch}/auto/Amanda/Config
+%dir %{perl_vendorarch}/auto/Amanda/Debug
+%dir %{perl_vendorarch}/auto/Amanda/Feature
+%dir %{perl_vendorarch}/auto/Amanda/Header
+%dir %{perl_vendorarch}/auto/Amanda/IPC
+%dir %{perl_vendorarch}/auto/Amanda/IPC/Binary
+%dir %{perl_vendorarch}/auto/Amanda/MainLoop
+%dir %{perl_vendorarch}/auto/Amanda/NDMP
+%dir %{perl_vendorarch}/auto/Amanda/Tests
+%dir %{perl_vendorarch}/auto/Amanda/Util
+%dir %{perl_vendorarch}/auto/Amanda/Xfer
+%attr(755,root,root) %{perl_vendorarch}/auto/Amanda/Archive/*.so
+%attr(755,root,root) %{perl_vendorarch}/auto/Amanda/Config/*.so
+%attr(755,root,root) %{perl_vendorarch}/auto/Amanda/Feature/*.so
+%attr(755,root,root) %{perl_vendorarch}/auto/Amanda/Header/*.so
+%attr(755,root,root) %{perl_vendorarch}/auto/Amanda/IPC/Binary/*.so
+%attr(755,root,root) %{perl_vendorarch}/auto/Amanda/Debug/*.so
+%attr(755,root,root) %{perl_vendorarch}/auto/Amanda/MainLoop/*.so
+%attr(755,root,root) %{perl_vendorarch}/auto/Amanda/NDMP/*.so
+%attr(755,root,root) %{perl_vendorarch}/auto/Amanda/Tests/*.so
+%attr(755,root,root) %{perl_vendorarch}/auto/Amanda/Util/*.so
+%attr(755,root,root) %{perl_vendorarch}/auto/Amanda/Xfer/*.so

 
 %if %{with server}
 %files server
 
 %if %{with server}
 %files server


@@ -365,24 +473,16 @@ fi
 #%attr(600,amanda,amanda) %ghost %{_sharedstatedir}/amanda/.ssh/client_authorized_keys
 #%attr(600,amanda,amanda) %ghost %{_sharedstatedir}/amanda/.ssh/id_rsa_amdump*
 
 #%attr(600,amanda,amanda) %ghost %{_sharedstatedir}/amanda/.ssh/client_authorized_keys
 #%attr(600,amanda,amanda) %ghost %{_sharedstatedir}/amanda/.ssh/id_rsa_amdump*
 

-%attr(750,amanda,amanda) %dir %{_sharedstatedir}/amanda/example
-%attr(750,amanda,amanda) %dir %{_sharedstatedir}/amanda/example/label-templates
-%attr(750,amanda,amanda) %dir %{_sharedstatedir}/amanda/template.d

 %attr(750,amanda,amanda) %dir %{_sharedstatedir}/amanda/debug/server
 %attr(750,amanda,amanda) %dir %{_sharedstatedir}/amanda/debug/server

-%attr(640,amanda,amanda) %{_sharedstatedir}/amanda/example/*amanda*
-%attr(640,amanda,amanda) %{_sharedstatedir}/amanda/example/label-templates/*.ps
-%attr(640,amanda,amanda) %{_sharedstatedir}/amanda/template.d/*

 
 %config(noreplace) %attr(640,root,root) /etc/cron.d/amanda-srv
 
 %attr(755,root,root) %{_libdir}/amanda/libamdevice*.so
 %attr(755,root,root) %{_libdir}/amanda/libamserver*.so
 
 %config(noreplace) %attr(640,root,root) /etc/cron.d/amanda-srv
 
 %attr(755,root,root) %{_libdir}/amanda/libamdevice*.so
 %attr(755,root,root) %{_libdir}/amanda/libamserver*.so

-%attr(755,root,root) %{_libdir}/amanda/libamtape*.so
-%attr(755,root,root) %{_libdir}/amanda/librestore*.so

 
 

-%{_libdir}/amanda/amanda-sh-lib.sh

 %attr(755,root,root) %{_libdir}/amanda/amcat.awk
 %attr(755,root,root) %{_libdir}/amanda/amcleanupdisk
 %attr(755,root,root) %{_libdir}/amanda/amcat.awk
 %attr(755,root,root) %{_libdir}/amanda/amcleanupdisk

+%attr(755,root,root) %{_libdir}/amanda/amcheck-device

 %attr(755,root,root) %{_libdir}/amanda/amidxtaped
 %attr(755,root,root) %{_libdir}/amanda/amindexd
 %attr(755,root,root) %{_libdir}/amanda/amlogroll
 %attr(755,root,root) %{_libdir}/amanda/amidxtaped
 %attr(755,root,root) %{_libdir}/amanda/amindexd
 %attr(755,root,root) %{_libdir}/amanda/amlogroll


@@ -391,102 +491,112 @@ fi
 %attr(755,root,root) %{_libdir}/amanda/amplot.gp
 %attr(755,root,root) %{_libdir}/amanda/amtrmidx
 %attr(755,root,root) %{_libdir}/amanda/amtrmlog
 %attr(755,root,root) %{_libdir}/amanda/amplot.gp
 %attr(755,root,root) %{_libdir}/amanda/amtrmidx
 %attr(755,root,root) %{_libdir}/amanda/amtrmlog

-%attr(755,root,root) %{_libdir}/amanda/chg-chio
-%attr(755,root,root) %{_libdir}/amanda/chg-chs

 %attr(755,root,root) %{_libdir}/amanda/chg-disk
 %attr(755,root,root) %{_libdir}/amanda/chg-disk

-%attr(755,root,root) %{_libdir}/amanda/chg-iomega
-%attr(755,root,root) %{_libdir}/amanda/chg-juke

 %attr(755,root,root) %{_libdir}/amanda/chg-lib.sh
 %attr(755,root,root) %{_libdir}/amanda/chg-manual
 %attr(755,root,root) %{_libdir}/amanda/chg-lib.sh
 %attr(755,root,root) %{_libdir}/amanda/chg-manual

-%attr(755,root,root) %{_libdir}/amanda/chg-mcutil
-%attr(755,root,root) %{_libdir}/amanda/chg-mtx

 %attr(755,root,root) %{_libdir}/amanda/chg-multi
 %attr(755,root,root) %{_libdir}/amanda/chg-multi

-%attr(755,root,root) %{_libdir}/amanda/chg-null
-%attr(755,root,root) %{_libdir}/amanda/chg-rait
-%attr(755,root,root) %{_libdir}/amanda/chg-rth
-%attr(755,root,root) %{_libdir}/amanda/chg-scsi

 %attr(755,root,root) %{_libdir}/amanda/chg-zd-mtx
 %attr(755,root,root) %{_libdir}/amanda/chunker
 %attr(755,root,root) %{_libdir}/amanda/driver
 %attr(4750,root,amanda) %{_libdir}/amanda/dumper
 %attr(755,root,root) %{_libdir}/amanda/chg-zd-mtx
 %attr(755,root,root) %{_libdir}/amanda/chunker
 %attr(755,root,root) %{_libdir}/amanda/driver
 %attr(4750,root,amanda) %{_libdir}/amanda/dumper

-%attr(755,root,root) %{_libdir}/amanda/patch-system

 %attr(4750,root,amanda) %{_libdir}/amanda/planner
 %attr(755,root,root) %{_libdir}/amanda/taper
 
 %attr(4750,root,amanda) %{_libdir}/amanda/planner
 %attr(755,root,root) %{_libdir}/amanda/taper
 

+%attr(755,root,root) %{_sbindir}/activate-devpay

 %attr(755,root,root) %{_sbindir}/amaddclient
 %attr(755,root,root) %{_sbindir}/amadmin
 %attr(755,root,root) %{_sbindir}/amaddclient
 %attr(755,root,root) %{_sbindir}/amadmin

-%attr(755,root,root) %{_sbindir}/amaespipe

 %attr(4750,root,amanda) %{_sbindir}/amcheck
 %attr(755,root,root) %{_sbindir}/amcheckdb
 %attr(755,root,root) %{_sbindir}/amcheckdump
 %attr(755,root,root) %{_sbindir}/amcleanup
 %attr(4750,root,amanda) %{_sbindir}/amcheck
 %attr(755,root,root) %{_sbindir}/amcheckdb
 %attr(755,root,root) %{_sbindir}/amcheckdump
 %attr(755,root,root) %{_sbindir}/amcleanup

-%attr(755,root,root) %{_sbindir}/amcrypt*
-%attr(755,root,root) %{_sbindir}/amdd
+%attr(755,root,root) %{_sbindir}/amconvert-zd-mtx-to-robot.sh

 %attr(755,root,root) %{_sbindir}/amdevcheck
 %attr(755,root,root) %{_sbindir}/amdump
 %attr(755,root,root) %{_sbindir}/amfetchdump
 %attr(755,root,root) %{_sbindir}/amflush
 %attr(755,root,root) %{_sbindir}/amdevcheck
 %attr(755,root,root) %{_sbindir}/amdump
 %attr(755,root,root) %{_sbindir}/amfetchdump
 %attr(755,root,root) %{_sbindir}/amflush

-%attr(755,root,root) %{_sbindir}/amgetconf
-%attr(755,root,root) %{_sbindir}/amgpgcrypt

 %attr(755,root,root) %{_sbindir}/amlabel
 %attr(755,root,root) %{_sbindir}/amlabel

-%attr(755,root,root) %{_sbindir}/ammt

 %attr(755,root,root) %{_sbindir}/amoverview
 %attr(755,root,root) %{_sbindir}/amplot
 %attr(755,root,root) %{_sbindir}/amreport
 %attr(755,root,root) %{_sbindir}/amrestore
 %attr(755,root,root) %{_sbindir}/amrmtape
 %attr(755,root,root) %{_sbindir}/amserverconfig
 %attr(755,root,root) %{_sbindir}/amoverview
 %attr(755,root,root) %{_sbindir}/amplot
 %attr(755,root,root) %{_sbindir}/amreport
 %attr(755,root,root) %{_sbindir}/amrestore
 %attr(755,root,root) %{_sbindir}/amrmtape
 %attr(755,root,root) %{_sbindir}/amserverconfig

+%attr(755,root,root) %{_sbindir}/amservice

 %attr(755,root,root) %{_sbindir}/amstatus
 %attr(755,root,root) %{_sbindir}/amtape
 %attr(755,root,root) %{_sbindir}/amtapetype
 %attr(755,root,root) %{_sbindir}/amtoc
 %attr(755,root,root) %{_sbindir}/amstatus
 %attr(755,root,root) %{_sbindir}/amtape
 %attr(755,root,root) %{_sbindir}/amtapetype
 %attr(755,root,root) %{_sbindir}/amtoc

-%attr(755,root,root) %{_sbindir}/amverify
-%attr(755,root,root) %{_sbindir}/amverifyrun
+%attr(755,root,root) %{_sbindir}/amvault

 %{_mandir}/man5/amanda.conf.5*
 %{_mandir}/man5/amanda.conf.5*

+%{_mandir}/man5/disklist.5*
+%{_mandir}/man5/tapelist.5*
+%{_mandir}/man7/amanda-changers.7*
+%{_mandir}/man7/amanda-compatibility.7*
+%{_mandir}/man7/amanda-devices.7*
+%{_mandir}/man7/amanda-taperscan.7*

 %{_mandir}/man8/amaddclient.8*
 %{_mandir}/man8/amadmin.8*
 %{_mandir}/man8/amaddclient.8*
 %{_mandir}/man8/amadmin.8*

-%{_mandir}/man8/amaespipe.8*
-%{_mandir}/man8/amanda.8*

 %{_mandir}/man8/amcheck.8*
 %{_mandir}/man8/amcheckdb.8*
 %{_mandir}/man8/amcheckdump.8*
 %{_mandir}/man8/amcleanup.8*
 %{_mandir}/man8/amcheck.8*
 %{_mandir}/man8/amcheckdb.8*
 %{_mandir}/man8/amcheckdump.8*
 %{_mandir}/man8/amcleanup.8*

-%{_mandir}/man8/amcrypt*.8*
-%{_mandir}/man8/amdd.8*

 %{_mandir}/man8/amdevcheck.8*
 %{_mandir}/man8/amdump.8*
 %{_mandir}/man8/amfetchdump.8*
 %{_mandir}/man8/amflush.8*
 %{_mandir}/man8/amdevcheck.8*
 %{_mandir}/man8/amdump.8*
 %{_mandir}/man8/amfetchdump.8*
 %{_mandir}/man8/amflush.8*

-%{_mandir}/man8/amgetconf.8*
-%{_mandir}/man8/amgpgcrypt.8*

 %{_mandir}/man8/amlabel.8*
 %{_mandir}/man8/amlabel.8*

-%{_mandir}/man8/ammt.8*

 %{_mandir}/man8/amoverview.8*
 %{_mandir}/man8/amplot.8*
 %{_mandir}/man8/amreport.8*
 %{_mandir}/man8/amrestore.8*
 %{_mandir}/man8/amrmtape.8*
 %{_mandir}/man8/amserverconfig.8*
 %{_mandir}/man8/amoverview.8*
 %{_mandir}/man8/amplot.8*
 %{_mandir}/man8/amreport.8*
 %{_mandir}/man8/amrestore.8*
 %{_mandir}/man8/amrmtape.8*
 %{_mandir}/man8/amserverconfig.8*

+%{_mandir}/man8/amservice.8*

 %{_mandir}/man8/amstatus.8*
 %{_mandir}/man8/amtape.8*
 %{_mandir}/man8/amtapetype.8*
 %{_mandir}/man8/amtoc.8*
 %{_mandir}/man8/amstatus.8*
 %{_mandir}/man8/amtape.8*
 %{_mandir}/man8/amtapetype.8*
 %{_mandir}/man8/amtoc.8*

-%{_mandir}/man8/amverify.8*
-%{_mandir}/man8/amverifyrun.8*
+%{_mandir}/man8/amvault.8*

 
 %{perl_vendorarch}/Amanda/Changer.pm
 
 %{perl_vendorarch}/Amanda/Changer.pm

+%dir %{perl_vendorarch}/Amanda/Changer
+%{perl_vendorarch}/Amanda/Changer/*.pm

 %{perl_vendorarch}/Amanda/Cmdline.pm
 %{perl_vendorarch}/Amanda/Cmdline.pm

+%{perl_vendorarch}/Amanda/Curinfo.pm
+%dir %{perl_vendorarch}/Amanda/Curinfo
+%{perl_vendorarch}/Amanda/Curinfo/*.pm
+%dir %{perl_vendorarch}/Amanda/DB
+%{perl_vendorarch}/Amanda/DB/*.pm

 %{perl_vendorarch}/Amanda/Device.pm
 %{perl_vendorarch}/Amanda/Device.pm

+%{perl_vendorarch}/Amanda/Disklist.pm
+%{perl_vendorarch}/Amanda/Holding.pm
+%{perl_vendorarch}/Amanda/Interactive.pm
+%dir %{perl_vendorarch}/Amanda/Interactive
+%{perl_vendorarch}/Amanda/Interactive/*.pm

 %{perl_vendorarch}/Amanda/Logfile.pm
 %{perl_vendorarch}/Amanda/Logfile.pm

-%{perl_vendorarch}/Amanda/Tapefile.pm
+%dir %{perl_vendorarch}/Amanda/Recovery
+%{perl_vendorarch}/Amanda/Recovery/*.pm
+%{perl_vendorarch}/Amanda/Report.pm
+%dir %{perl_vendorarch}/Amanda/Report
+%{perl_vendorarch}/Amanda/Report/*.pm
+%{perl_vendorarch}/Amanda/Tapelist.pm
+%dir %{perl_vendorarch}/Amanda/Taper
+%{perl_vendorarch}/Amanda/Taper/*.pm
+%dir %{perl_vendorarch}/Amanda/Taper/Scan
+%{perl_vendorarch}/Amanda/Taper/Scan/*.pm
+%{perl_vendorarch}/Amanda/XferServer.pm

 %dir %{perl_vendorarch}/auto/Amanda/Cmdline
 %dir %{perl_vendorarch}/auto/Amanda/Device
 %dir %{perl_vendorarch}/auto/Amanda/Cmdline
 %dir %{perl_vendorarch}/auto/Amanda/Device

+%dir %{perl_vendorarch}/auto/Amanda/Disklist

 %dir %{perl_vendorarch}/auto/Amanda/Logfile
 %dir %{perl_vendorarch}/auto/Amanda/Logfile

-%dir %{perl_vendorarch}/auto/Amanda/Tapefile
+%dir %{perl_vendorarch}/auto/Amanda/Tapelist
+%dir %{perl_vendorarch}/auto/Amanda/XferServer

 %attr(755,root,root) %{perl_vendorarch}/auto/Amanda/Cmdline/*.so
 %attr(755,root,root) %{perl_vendorarch}/auto/Amanda/Device/*.so
 %attr(755,root,root) %{perl_vendorarch}/auto/Amanda/Cmdline/*.so
 %attr(755,root,root) %{perl_vendorarch}/auto/Amanda/Device/*.so

+%attr(755,root,root) %{perl_vendorarch}/auto/Amanda/Disklist/*.so

 %attr(755,root,root) %{perl_vendorarch}/auto/Amanda/Logfile/*.so
 %attr(755,root,root) %{perl_vendorarch}/auto/Amanda/Logfile/*.so

-%attr(755,root,root) %{perl_vendorarch}/auto/Amanda/Tapefile/*.so
+%attr(755,root,root) %{perl_vendorarch}/auto/Amanda/Tapelist/*.so
+%attr(755,root,root) %{perl_vendorarch}/auto/Amanda/XferServer/*.so

 %endif
 
 %if %{with client}
 %endif
 
 %if %{with client}


@@ -499,15 +609,23 @@ fi
 %attr(640,amanda,amanda) %config(noreplace) %verify(not md5 mtime size) %{_sharedstatedir}/amanda/amandates
 
 %dir %{_libdir}/amanda/application
 %attr(640,amanda,amanda) %config(noreplace) %verify(not md5 mtime size) %{_sharedstatedir}/amanda/amandates
 
 %dir %{_libdir}/amanda/application

-%attr(755,root,root) %{_libdir}/amanda/application/amgtar
-%attr(644,root,root) %{_libdir}/amanda/application/generic-dumper
+%attr(755,root,root) %{_libdir}/amanda/application/amgtar*
+%attr(755,root,root) %{_libdir}/amanda/application/amlog-script
+%attr(755,root,root) %{_libdir}/amanda/application/ampgsql
+%attr(755,root,root) %{_libdir}/amanda/application/amraw
+%attr(755,root,root) %{_libdir}/amanda/application/amsamba
+%attr(755,root,root) %{_libdir}/amanda/application/amstar
+%attr(755,root,root) %{_libdir}/amanda/application/amsuntar
+%attr(755,root,root) %{_libdir}/amanda/application/amzfs*
+%attr(755,root,root) %{_libdir}/amanda/application/script-email

 
 %attr(755,root,root) %{_libdir}/amanda/libamclient*.so
 %attr(755,root,root) %{_libdir}/amanda/amandad
 %attr(755,root,root) %{_libdir}/amanda/noop
 
 %attr(755,root,root) %{_libdir}/amanda/libamclient*.so
 %attr(755,root,root) %{_libdir}/amanda/amandad
 %attr(755,root,root) %{_libdir}/amanda/noop

+%attr(755,root,root) %{_libdir}/amanda/patch-system

 %attr(755,root,root) %{_libdir}/amanda/sendbackup
 %attr(755,root,root) %{_libdir}/amanda/sendsize
 %attr(755,root,root) %{_libdir}/amanda/sendbackup
 %attr(755,root,root) %{_libdir}/amanda/sendsize

-%attr(755,root,root) %{_libdir}/amanda/versionsuffix
+%attr(755,root,root) %{_libdir}/amanda/teecount

 %attr(4750,root,amanda) %{_libdir}/amanda/calcsize
 %attr(4750,root,amanda) %{_libdir}/amanda/killpgrp
 %attr(4750,root,amanda) %{_libdir}/amanda/rundump
 %attr(4750,root,amanda) %{_libdir}/amanda/calcsize
 %attr(4750,root,amanda) %{_libdir}/amanda/killpgrp
 %attr(4750,root,amanda) %{_libdir}/amanda/rundump


@@ -517,25 +635,20 @@ fi
 %attr(755,root,root) %{_sbindir}/amrecover
 %attr(750,amanda,amanda) %dir %{_sharedstatedir}/amanda/gnutar-lists
 %attr(750,amanda,amanda) %dir %{_sharedstatedir}/amanda/debug/client
 %attr(755,root,root) %{_sbindir}/amrecover
 %attr(750,amanda,amanda) %dir %{_sharedstatedir}/amanda/gnutar-lists
 %attr(750,amanda,amanda) %dir %{_sharedstatedir}/amanda/debug/client

+%{_mandir}/man7/amanda-applications.7*

 %{_mandir}/man5/amanda-client.conf.5*
 %{_mandir}/man5/amanda-client.conf.5*

+%{_mandir}/man8/amgtar.8*
+%{_mandir}/man8/ampgsql.8*

 %{_mandir}/man8/amrecover.8*
 %{_mandir}/man8/amrecover.8*

+%{_mandir}/man8/amraw.8*
+%{_mandir}/man8/amsamba.8*
+%{_mandir}/man8/amstar.8*
+%{_mandir}/man8/amsuntar.8*
+%{_mandir}/man8/amzfs*.8*
+
+%{perl_vendorarch}/Amanda/Application.pm
+%dir %{perl_vendorarch}/Amanda/Application
+%{perl_vendorarch}/Amanda/Application/Zfs.pm
+%dir %{perl_vendorarch}/auto/Amanda/Application
+%attr(755,root,root) %{perl_vendorarch}/auto/Amanda/Application/*.so

 %endif
 %endif

-
-%files perl
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/amanda/libamglue*.so
-%dir %{perl_vendorarch}/Amanda
-%{perl_vendorarch}/Amanda/Config.pm
-%{perl_vendorarch}/Amanda/Debug.pm
-%{perl_vendorarch}/Amanda/Paths.pm
-%{perl_vendorarch}/Amanda/Types.pm
-%{perl_vendorarch}/Amanda/Util.pm
-%dir %{perl_vendorarch}/auto/Amanda
-%dir %{perl_vendorarch}/auto/Amanda/Config
-%dir %{perl_vendorarch}/auto/Amanda/Debug
-%dir %{perl_vendorarch}/auto/Amanda/Types
-%dir %{perl_vendorarch}/auto/Amanda/Util
-%attr(755,root,root) %{perl_vendorarch}/auto/Amanda/Config/*.so
-%attr(755,root,root) %{perl_vendorarch}/auto/Amanda/Debug/*.so
-%attr(755,root,root) %{perl_vendorarch}/auto/Amanda/Types/*.so
-%attr(755,root,root) %{perl_vendorarch}/auto/Amanda/Util/*.so