- libexec fixes

[packages/amanda.git] / amanda.spec

diff --git a/amanda.spec b/amanda.spec
index eb383fa87774f42eeb45f4dc1ce207cab29acde5..421d3ca6140d9b9b5e3c7bf82cc5623cb83a363c 100644 (file)
--- a/amanda.spec
+++ b/amanda.spec
@@ -9,12 +9,12 @@
 Summary:       A network-capable tape backup solution
 Summary(pl.UTF-8):     Sieciowo zorientowany system tworzenia kopii zapasowych
 Name:          amanda
-Version:       3.3.2
-Release:       5
+Version:       3.3.6
+Release:       12
 License:       BSD
 Group:         Networking/Utilities
 Source0:       http://downloads.sourceforge.net/amanda/%{name}-%{version}.tar.gz
-# Source0-md5: 1a6cfe47eaee121f22540ac5fa58c366
+# Source0-md5: 99559bd84b358701cf943fcc347d8914
 Source1:       %{name}-srv.crontab
 Source2:       %{name}.inetd
 Source3:       %{name}idx.inetd
@@ -39,19 +39,21 @@ Patch8:             %{name}-heimdal.patch
 Patch9:                %{name}-ac.patch
 Patch11:       %{name}-amstar-exclude-fix.patch
 Patch12:       %{name}-krb5-auth.patch
-Patch13:       %{name}-stdio.patch
-Patch14:       %{name}-amstar-device.patch
+Patch13:       %{name}-amstar-device.patch
+Patch14:       swig.patch
+Patch15:       krb5-ac.patch
 URL:           http://www.amanda.org/
-BuildRequires: autoconf >= 2.53
+%{?with_samba:BuildRequires:   /usr/bin/smbclient}
+BuildRequires: autoconf >= 2.64
 BuildRequires: automake
 BuildRequires: curl-devel >= 7.10.0
 BuildRequires: dump
 BuildRequires: flex
 BuildRequires: glib2-devel
 BuildRequires: gnuplot
-BuildRequires: rpmbuild(macros) >= 1.654
-# curl is broken, see curl-config --libs
 BuildRequires: heimdal-devel
+BuildRequires: rpmbuild(macros) >= 1.654
+# curl is broken, see curl-config --libs (c8cba693)
 BuildRequires: keyutils-devel
 BuildRequires: libtool
 BuildRequires: libxslt-progs
@@ -63,7 +65,6 @@ BuildRequires:        pkgconfig
 BuildRequires: readline-devel >= 4.2
 BuildRequires: rpm-perlprov
 BuildRequires: rpmbuild(macros) >= 1.654
-%{?with_samba:BuildRequires:   samba-client}
 BuildRequires: swig
 %{?with_xfs:BuildRequires:     xfsdump}
 Conflicts:     pwdutils < 3.1.2-2
@@ -109,7 +110,7 @@ Requires(pre):      /usr/bin/chsh
 Requires(pre): /usr/bin/getgid
 Requires(pre): /usr/sbin/groupadd
 Requires(pre): /usr/sbin/useradd
-%requires_ge   glib2
+%requires_ge glib2
 Requires:      setup >= 2.6.1-1
 Provides:      group(amanda)
 Provides:      user(amanda)
@@ -215,9 +216,13 @@ typu streamer).
 %patch12 -p1
 %patch13 -p1
 %patch14 -p1
+%patch15 -p1
 cp -a %{SOURCE10} .
 
+find perl/ -name '*.swg' -print0 | xargs -0 touch
+
 %build
+%{__libtoolize}
 %{__aclocal} -I config -I config/gettext-macros -I config/gnulib -I config/amanda -I config/macro-archive
 %{__autoconf}
 %{__automake}
@@ -270,29 +275,29 @@ install -d $RPM_BUILD_ROOT%{_sysconfdir}/{amanda,cron.d,sysconfig/rc-inetd} \
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
-install %{SOURCE1} $RPM_BUILD_ROOT/etc/cron.d/amanda-srv
+cp -p %{SOURCE1} $RPM_BUILD_ROOT/etc/cron.d/amanda-srv
 sed -e 's|/usr/lib|%{_libdir}|' %{SOURCE2} >$RPM_BUILD_ROOT/etc/sysconfig/rc-inetd/amanda
 sed -e 's|/usr/lib|%{_libdir}|' %{SOURCE3} >$RPM_BUILD_ROOT/etc/sysconfig/rc-inetd/amandaidx
 sed -e 's|/usr/lib|%{_libdir}|' %{SOURCE4} >$RPM_BUILD_ROOT/etc/sysconfig/rc-inetd/amidxtape
 sed -e 's|/usr/lib|%{_libdir}|' %{SOURCE5} >$RPM_BUILD_ROOT/etc/sysconfig/rc-inetd/k5amanda
 
-install example/amanda.conf $RPM_BUILD_ROOT%{_sysconfdir}/amanda
-install example/amanda-client.conf $RPM_BUILD_ROOT%{_sysconfdir}/amanda
+cp -p example/amanda.conf $RPM_BUILD_ROOT%{_sysconfdir}/amanda
+cp -p example/amanda-client.conf $RPM_BUILD_ROOT%{_sysconfdir}/amanda
 touch $RPM_BUILD_ROOT%{_sharedstatedir}/amanda/.amandahosts
 
-install %{SOURCE6} $RPM_BUILD_ROOT%{_sbindir}/amconvert-zd-mtx-to-robot.sh
+install -p %{SOURCE6} $RPM_BUILD_ROOT%{_sbindir}/amconvert-zd-mtx-to-robot.sh
 
-install %{SOURCE7} $RPM_BUILD_ROOT%{_sharedstatedir}/amanda/.ssh/config
+cp -p %{SOURCE7} $RPM_BUILD_ROOT%{_sharedstatedir}/amanda/.ssh/config
 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}
 
 %if %{with server}
-install -p %{SOURCE8} $RPM_BUILD_ROOT%{_sysconfdir}/amanda/lvm-snapshot.conf
+cp -p %{SOURCE8} $RPM_BUILD_ROOT%{_sysconfdir}/amanda/lvm-snapshot.conf
 %endif
 
 %if %{with client}
-sed -e 's|@@PERL_VENDORARCH@@|%{perl_vendorarch}|' %{SOURCE9} >$RPM_BUILD_ROOT%{_libdir}/amanda/application/amlvm-snapshot
+sed -e 's|@@PERL_VENDORARCH@@|%{perl_vendorarch}|' %{SOURCE9} >$RPM_BUILD_ROOT%{_libexecdir}/amanda/application/amlvm-snapshot
 %endif
 
 > $RPM_BUILD_ROOT%{_sharedstatedir}/amanda/amandates
@@ -412,14 +417,15 @@ EOF
 %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
-%{_libdir}/amanda/amanda-sh-lib.sh
+%dir %{_libexecdir}/amanda
+%{_libexecdir}/amanda/amanda-sh-lib.sh
+%attr(755,root,root) %{_libexecdir}/amanda/amndmjob
+%attr(755,root,root) %{_libexecdir}/amanda/ndmjob
 %attr(755,root,root) %{_sbindir}/amaespipe
 %attr(755,root,root) %{_sbindir}/amarchiver
 %attr(755,root,root) %{_sbindir}/amcrypt*
@@ -522,27 +528,27 @@ EOF
 %attr(755,root,root) %{_libdir}/amanda/libamdevice*.so
 %attr(755,root,root) %{_libdir}/amanda/libamserver*.so
 
-%attr(755,root,root) %{_libdir}/amanda/amcat.awk
-%attr(755,root,root) %{_libdir}/amanda/amcheck-device
-%attr(755,root,root) %{_libdir}/amanda/amdumpd
-%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/amplot.awk
-%attr(755,root,root) %{_libdir}/amanda/amplot.g
-%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-disk
-%attr(755,root,root) %{_libdir}/amanda/chg-lib.sh
-%attr(755,root,root) %{_libdir}/amanda/chg-manual
-%attr(755,root,root) %{_libdir}/amanda/chg-multi
-%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(4750,root,amanda) %{_libdir}/amanda/planner
-%attr(755,root,root) %{_libdir}/amanda/taper
+%attr(755,root,root) %{_libexecdir}/amanda/amcat.awk
+%attr(755,root,root) %{_libexecdir}/amanda/amcheck-device
+%attr(755,root,root) %{_libexecdir}/amanda/amdumpd
+%attr(755,root,root) %{_libexecdir}/amanda/amidxtaped
+%attr(755,root,root) %{_libexecdir}/amanda/amindexd
+%attr(755,root,root) %{_libexecdir}/amanda/amlogroll
+%attr(755,root,root) %{_libexecdir}/amanda/amplot.awk
+%attr(755,root,root) %{_libexecdir}/amanda/amplot.g
+%attr(755,root,root) %{_libexecdir}/amanda/amplot.gp
+%attr(755,root,root) %{_libexecdir}/amanda/amtrmidx
+%attr(755,root,root) %{_libexecdir}/amanda/amtrmlog
+%attr(755,root,root) %{_libexecdir}/amanda/chg-disk
+%attr(755,root,root) %{_libexecdir}/amanda/chg-lib.sh
+%attr(755,root,root) %{_libexecdir}/amanda/chg-manual
+%attr(755,root,root) %{_libexecdir}/amanda/chg-multi
+%attr(755,root,root) %{_libexecdir}/amanda/chg-zd-mtx
+%attr(755,root,root) %{_libexecdir}/amanda/chunker
+%attr(755,root,root) %{_libexecdir}/amanda/driver
+%attr(4750,root,amanda) %{_libexecdir}/amanda/dumper
+%attr(4750,root,amanda) %{_libexecdir}/amanda/planner
+%attr(755,root,root) %{_libexecdir}/amanda/taper
 
 %attr(755,root,root) %{_sbindir}/activate-devpay
 %attr(755,root,root) %{_sbindir}/amaddclient
@@ -613,6 +619,7 @@ EOF
 %dir %{perl_vendorarch}/Amanda/DB
 %{perl_vendorarch}/Amanda/DB/*.pm
 %{perl_vendorarch}/Amanda/Device.pm
+%{perl_vendorarch}/Amanda/Extract.pm
 %{perl_vendorarch}/Amanda/Disklist.pm
 %{perl_vendorarch}/Amanda/Holding.pm
 %{perl_vendorarch}/Amanda/Interactivity.pm
@@ -655,30 +662,31 @@ EOF
 #%attr(600,amanda,amanda) %ghost %{_sharedstatedir}/amanda/.ssh/id_rsa_amrecover*
 %attr(640,amanda,amanda) %config(noreplace) %verify(not md5 mtime size) %{_sharedstatedir}/amanda/amandates
 
-%dir %{_libdir}/amanda/application
-%attr(4750,root,amanda) %{_libdir}/amanda/application/amgtar
-%attr(755,root,root) %{_libdir}/amanda/application/amlog-script
-%attr(755,root,root) %{_libdir}/amanda/application/amlvm-snapshot
-%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(4750,root,amanda) %{_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
+%dir %{_libexecdir}/amanda/application
+%attr(4750,root,amanda) %{_libexecdir}/amanda/application/ambsdtar
+%attr(4750,root,amanda) %{_libexecdir}/amanda/application/amgtar
+%attr(755,root,root) %{_libexecdir}/amanda/application/amlog-script
+%attr(755,root,root) %{_libexecdir}/amanda/application/amlvm-snapshot
+%attr(755,root,root) %{_libexecdir}/amanda/application/ampgsql
+%attr(755,root,root) %{_libexecdir}/amanda/application/amraw
+%attr(755,root,root) %{_libexecdir}/amanda/application/amsamba
+%attr(4750,root,amanda) %{_libexecdir}/amanda/application/amstar
+%attr(755,root,root) %{_libexecdir}/amanda/application/amsuntar
+%attr(755,root,root) %{_libexecdir}/amanda/application/amzfs*
+%attr(755,root,root) %{_libexecdir}/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/patch-system
-%attr(755,root,root) %{_libdir}/amanda/sendbackup
-%attr(755,root,root) %{_libdir}/amanda/sendsize
-%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/runtar
-%attr(755,root,root) %{_libdir}/amanda/selfcheck
+%attr(755,root,root) %{_libexecdir}/amanda/amandad
+%attr(755,root,root) %{_libexecdir}/amanda/noop
+%attr(755,root,root) %{_libexecdir}/amanda/patch-system
+%attr(755,root,root) %{_libexecdir}/amanda/sendbackup
+%attr(755,root,root) %{_libexecdir}/amanda/sendsize
+%attr(755,root,root) %{_libexecdir}/amanda/teecount
+%attr(4750,root,amanda) %{_libexecdir}/amanda/calcsize
+%attr(4750,root,amanda) %{_libexecdir}/amanda/killpgrp
+%attr(4750,root,amanda) %{_libexecdir}/amanda/rundump
+%attr(4750,root,amanda) %{_libexecdir}/amanda/runtar
+%attr(755,root,root) %{_libexecdir}/amanda/selfcheck
 %attr(755,root,root) %{_sbindir}/amdump_client
 %attr(755,root,root) %{_sbindir}/amoldrecover
 %attr(755,root,root) %{_sbindir}/amrecover
@@ -687,6 +695,7 @@ EOF
 %{_mandir}/man7/amanda-applications.7*
 %{_mandir}/man5/amanda-client.conf.5*
 %{_mandir}/man8/amdump_client.8*
+%{_mandir}/man8/ambsdtar.8*
 %{_mandir}/man8/amgtar.8*
 %{_mandir}/man8/ampgsql.8*
 %{_mandir}/man8/amrecover.8*