[amanda] upgrade to new upstream release, fixes #600552, #610169 and some other fixes
Jan Görig
jgorig at fedoraproject.org
Tue Aug 3 13:09:52 UTC 2010
commit 3146317137a27f60cf45a7c050e135c8c0fecc94
Author: Jan Görig <jgorig at dhcp-31-148.brq.redhat.com>
Date: Tue Aug 3 15:05:10 2010 +0200
upgrade to new upstream release, fixes #600552, #610169 and some other fixes
.gitignore | 1 +
amanda-2.6.0b3-lib.patch | 31 ---
amanda-2.6.1p2-example.patch | 16 --
amanda-2.6.1p2-ftbfs.patch | 12 -
amanda-2.6.1p2-pie.patch | 204 ---------------
amanda-2.6.1p2-xattrs.patch | 61 -----
amanda-3.1.0-example.patch | 6 +-
amanda-3.1.1-xattrs.patch | 55 ++++
amanda.spec | 589 ++++++++++++++++++++----------------------
sources | 2 +-
10 files changed, 342 insertions(+), 635 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e2940ab..9d8dfa9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
amanda-3.1.0.tar.gz
+amanda-3.1.1.tar.gz
diff --git a/amanda-3.1.0-example.patch b/amanda-3.1.0-example.patch
index 7bee54a..ee9ea2c 100644
--- a/amanda-3.1.0-example.patch
+++ b/amanda-3.1.0-example.patch
@@ -1,15 +1,13 @@
diff -up amanda-3.1.0/example/Makefile.am.example amanda-3.1.0/example/Makefile.am
--- amanda-3.1.0/example/Makefile.am.example 2010-06-01 21:21:59.000000000 +0200
+++ amanda-3.1.0/example/Makefile.am 2010-06-23 15:53:42.693848261 +0200
-@@ -4,10 +4,10 @@ include $(top_srcdir)/config/automake/va
- include $(top_srcdir)/config/automake/installperms.am
+@@ -4,9 +4,9 @@ include $(top_srcdir)/config/automake/va
amanda_dir = $(amdatadir)
--templatedir = $(amanda_dir)/template.d
+ templatedir = $(amanda_dir)/template.d
-server_exampledir = $(amanda_dir)/example
-client_exampledir = $(amanda_dir)/example
-lbltempldir = $(amanda_dir)/example/label-templates
-+templatedir = $(localstatedir)/lib/amanda/template.d
+server_exampledir = $(sysconfdir)/amanda/example
+client_exampledir = $(sysconfdir)/amanda/example
+lbltempldir = $(sysconfdir)/amanda/example/label-templates
diff --git a/amanda-3.1.1-xattrs.patch b/amanda-3.1.1-xattrs.patch
new file mode 100644
index 0000000..62cc855
--- /dev/null
+++ b/amanda-3.1.1-xattrs.patch
@@ -0,0 +1,55 @@
+diff -up amanda-3.1.1/example/amanda.conf.in.xattrs amanda-3.1.1/example/amanda.conf.in
+--- amanda-3.1.1/example/amanda.conf.in.xattrs 2010-08-03 14:45:25.000000000 +0200
++++ amanda-3.1.1/example/amanda.conf.in 2010-08-03 14:47:42.516753010 +0200
+@@ -718,6 +718,7 @@ define interface local {
+ define application-tool app_amgtar {
+ comment "amgtar"
+ plugin "amgtar"
++ property "XATTRS" "YES"
+ #property "GNUTAR-PATH" "/path/to/gtar"
+ #property "GNUTAR-LISTDIR" "/path/to/gnutar_list_dir"
+ #default from gnutar_list_dir setting in amanda-client.conf
+diff -up amanda-3.1.1/example/template.d/amanda-harddisk.conf.in.xattrs amanda-3.1.1/example/template.d/amanda-harddisk.conf.in
+--- amanda-3.1.1/example/template.d/amanda-harddisk.conf.in.xattrs 2010-06-29 19:09:55.000000000 +0200
++++ amanda-3.1.1/example/template.d/amanda-harddisk.conf.in 2010-08-03 14:47:17.027752940 +0200
+@@ -30,6 +30,7 @@ define dumptype global {
+ define application-tool app_amgtar {
+ comment "amgtar"
+ plugin "amgtar"
++ property "XATTRS" "YES"
+ #property "GNUTAR-PATH" "/path/to/gtar"
+ #property "GNUTAR-LISTDIR" "/path/to/gnutar_list_dir"
+ }
+diff -up amanda-3.1.1/example/template.d/amanda-single-tape.conf.in.xattrs amanda-3.1.1/example/template.d/amanda-single-tape.conf.in
+--- amanda-3.1.1/example/template.d/amanda-single-tape.conf.in.xattrs 2010-06-29 19:09:55.000000000 +0200
++++ amanda-3.1.1/example/template.d/amanda-single-tape.conf.in 2010-08-03 14:47:21.307753002 +0200
+@@ -37,6 +37,7 @@ define dumptype global {
+ define application-tool app_amgtar {
+ comment "amgtar"
+ plugin "amgtar"
++ property "XATTRS" "YES"
+ #property "GNUTAR-PATH" "/path/to/gtar"
+ #property "GNUTAR-LISTDIR" "/path/to/gnutar_list_dir"
+ }
+diff -up amanda-3.1.1/example/template.d/amanda-S3.conf.in.xattrs amanda-3.1.1/example/template.d/amanda-S3.conf.in
+--- amanda-3.1.1/example/template.d/amanda-S3.conf.in.xattrs 2010-06-29 19:09:55.000000000 +0200
++++ amanda-3.1.1/example/template.d/amanda-S3.conf.in 2010-08-03 14:47:26.723752659 +0200
+@@ -38,6 +38,7 @@ define dumptype global {
+ define application-tool app_amgtar {
+ comment "amgtar"
+ plugin "amgtar"
++ property "XATTRS" "YES"
+ #property "GNUTAR-PATH" "/path/to/gtar"
+ #property "GNUTAR-LISTDIR" "/path/to/gnutar_list_dir"
+ }
+diff -up amanda-3.1.1/example/template.d/amanda-tape-changer.conf.in.xattrs amanda-3.1.1/example/template.d/amanda-tape-changer.conf.in
+--- amanda-3.1.1/example/template.d/amanda-tape-changer.conf.in.xattrs 2010-06-29 19:09:55.000000000 +0200
++++ amanda-3.1.1/example/template.d/amanda-tape-changer.conf.in 2010-08-03 14:47:30.827752997 +0200
+@@ -37,6 +37,7 @@ define dumptype global {
+ define application-tool app_amgtar {
+ comment "amgtar"
+ plugin "amgtar"
++ property "XATTRS" "YES"
+ #property "GNUTAR-PATH" "/path/to/gtar"
+ #property "GNUTAR-LISTDIR" "/path/to/gnutar_list_dir"
+ }
diff --git a/amanda.spec b/amanda.spec
index ec624d6..2e1b886 100644
--- a/amanda.spec
+++ b/amanda.spec
@@ -1,4 +1,4 @@
-%define _libexecdir %{_libdir}
+%define _libexecdir %{_libdir}
%{!?defconfig:%define defconfig DailySet1}
%{!?indexserver:%define indexserver amandahost}
%{!?tapeserver:%define tapeserver %{indexserver}}
@@ -7,17 +7,16 @@
Summary: A network-capable tape backup solution
Name: amanda
-Version: 3.1.0
+Version: 3.1.1
Release: 1%{?dist}
Source: http://downloads.sourceforge.net/amanda/amanda-%{version}.tar.gz
-#Source: http://www.zmanda.com/downloads/community/community-builds/amanda-%%{version}.tar.gz
Source1: amanda.crontab
Source4: disklist
Source5: amanda-xinetd
Source8: amandahosts
Source9: README-rpm
Patch1: amanda-3.1.0-example.patch
-Patch2: amanda-2.6.1p2-xattrs.patch
+Patch2: amanda-3.1.1-xattrs.patch
Patch3: amanda-2.6.0p2-tcpport.patch
Patch4: amanda-3.1.0-ftbfs.patch
License: BSD and GPLv3+ and GPLv2+ and GPLv2
@@ -56,7 +55,6 @@ Summary: The client component of the AMANDA tape backup system
Group: Applications/System
Requires: fileutils grep /sbin/service
Requires(pre): amanda = %{version}-%{release}
-Requires(post): grep sed
%description client
The Amanda-client package should be installed on any machine that will
@@ -69,7 +67,6 @@ Summary: The server side of the AMANDA tape backup system
Group: Applications/System
Requires: fileutils grep /sbin/service
Requires(pre): amanda = %{version}-%{release}
-Requires(post): grep sed findutils
%description server
The amanda-server package should be installed on the AMANDA server,
@@ -78,50 +75,47 @@ will be written. You will also need to install the amanda package on
the AMANDA server machine. And, if the server is also to be backed up, the
server also needs to have the amanda-client package installed.
-#%%define _default_patch_fuzz 3
-
%prep
%setup -q -n %{name}-%{version}
%patch1 -p1 -b .example
-#%patch2 -p1 -b .xattrs
+%patch2 -p1 -b .xattrs
%patch3 -p1 -b .tcpport
%patch4 -p1 -b .ftbfs
./autogen
%build
-export MAILER=/bin/mail
-
-%configure CFLAGS=-fPIE LDFLAGS=-pie \
- --enable-shared \
- --disable-rpath \
- --disable-static \
- --disable-dependency-tracking \
- --disable-installperms \
- --with-amlibdir=%{_libdir} \
- --with-amperldir=%{perl_vendorarch} \
- --with-index-server=%{indexserver} \
- --with-tape-server=%{tapeserver} \
- --with-config=%{defconfig} \
- --with-gnutar-listdir=%{_localstatedir}/lib/amanda/gnutar-lists \
- --with-smbclient=%{_bindir}/smbclient \
- --with-amandates=%{_localstatedir}/lib/amanda/amandates \
- --with-amandahosts \
- --with-user=%amanda_user \
- --with-group=%amanda_group \
- --with-tmpdir=/var/log/amanda \
- --with-gnutar=/bin/tar \
- --with-ssh-security \
- --with-rsh-security \
- --with-bsdtcp-security \
- --with-bsdudp-security \
- --with-krb5-security
-
+export MAILER=/bin/mail CFLAGS="$RPM_OPT_FLAGS -fPIE" LDFLAGS=-pie
+
+%configure --enable-shared \
+ --disable-rpath \
+ --disable-static \
+ --disable-dependency-tracking \
+ --disable-installperms \
+ --with-amdatadir=%{_localstatedir}/lib/amanda \
+ --with-amlibdir=%{_libdir} \
+ --with-amperldir=%{perl_vendorarch} \
+ --with-index-server=%{indexserver} \
+ --with-tape-server=%{tapeserver} \
+ --with-config=%{defconfig} \
+ --with-gnutar-listdir=%{_localstatedir}/lib/amanda/gnutar-lists \
+ --with-smbclient=%{_bindir}/smbclient \
+ --with-amandates=%{_localstatedir}/lib/amanda/amandates \
+ --with-amandahosts \
+ --with-user=%amanda_user \
+ --with-group=%amanda_group \
+ --with-tmpdir=/var/log/amanda \
+ --with-gnutar=/bin/tar \
+ --with-ssh-security \
+ --with-rsh-security \
+ --with-bsdtcp-security \
+ --with-bsdudp-security \
+ --with-krb5-security
+
make %{?_smp_mflags}
%install
rm -rf ${RPM_BUILD_ROOT}
-#export SED=sed
make install BINARY_OWNER=%(id -un) SETUID_GROUP=%(id -gn) DESTDIR=$RPM_BUILD_ROOT
@@ -136,9 +130,7 @@ ln -s %{_libexecdir}/amanda/amandad $RPM_BUILD_ROOT%{_sbindir}/amandad
cp %SOURCE9 .
-#pushd tape-src/.libs
-#install -m 755 amtapetype $RPM_BUILD_ROOT/%%{_sbindir}
-#popd
+ln -s amrecover.8.gz $RPM_BUILD_ROOT%{_mandir}/man8/amoldrecover.8
pushd ${RPM_BUILD_ROOT}
mv .%{_sysconfdir}/amanda/example .%{_sysconfdir}/amanda/%defconfig
@@ -160,46 +152,21 @@ make check
rm -rf ${RPM_BUILD_ROOT}
%pre
-# look for user 'amanda' with uid 33, if exists, rename to new %%amanda_user
-getent passwd 'amanda' | grep ':33:' >/dev/null &&
-usermod -l %amanda_user amanda >/dev/null 2>&1 &&
-mv /var/spool/cron/amanda /var/spool/cron/%amanda_user &>/dev/null
-
/usr/sbin/useradd -M -N -g %amanda_group -o -r -d %{_localstatedir}/lib/amanda -s /bin/bash \
- -c "Amanda user" -u 33 %amanda_user >/dev/null 2>&1 || :
+ -c "Amanda user" -u 33 %amanda_user >/dev/null 2>&1 || :
/usr/bin/gpasswd -a %amanda_user tape >/dev/null 2>&1 || :
%post
/sbin/ldconfig
-# when upgrading and /etc/xinet.d/amanda contains obsolete user name, update it
-[ $1 -eq 2 ] &&
- grep -E '^[[:blank:]]*user[[:blank:]]*=[[:blank:]]*amanda[[:blank:]]*$' /etc/xinetd.d/amanda &>/dev/null &&
- sed -i.rpmsave -r -e 's/^([[:blank:]]*user[[:blank:]]*=[[:blank:]]*)amanda([[:blank:]]*)$/\1%amanda_user\2/' /etc/xinetd.d/amanda || :
-
[ -f /var/lock/subsys/xinetd ] && /sbin/service xinetd reload > /dev/null 2>&1 || :
-# when upgrading and .amandahosts contains obsolete user name, update it
-#[ $1 -eq 2 ] &&
-#grep -E '^[^[:blank:]]+[[:blank:]]+amanda([[:blank:]].*)?$' /var/lib/amanda/.amandahosts &>/dev/null &&
-# sed -i.usernameupdate -r -e 's/^([^[:blank:]]+[[:blank:]]+)amanda([[:blank:]].*)?$/\1%%amanda_user\2/' /var/lib/amanda/.amandahosts || :
%postun
/sbin/ldconfig
[ -f /var/lock/subsys/xinetd ] && /sbin/service xinetd reload > /dev/null 2>&1 || :
-%pre client
-# when upgrading, move /etc/amandates to /var/lib/amanda/amandates
-[ -f /etc/amandates ] &&
- mv /etc/amandates /var/lib/amanda/amandates || :
-
%post client -p /sbin/ldconfig
-%post server
-/sbin/ldconfig
-# when upgrading, check amanda.conf in all configurations
-# if it contains obsolete user name, update it
-[ $1 -eq 2 ] &&
-grep -l -E '^dumpuser[[:blank:]]*"amanda"' /etc/amanda/*/amanda.conf |
- xargs sed -i.usernameupdate -r -e 's/^(dumpuser[[:blank:]]*)"amanda"/\1"%amanda_user"/' &>/dev/null || :
+%post server -p /sbin/ldconfig
%postun client -p /sbin/ldconfig
@@ -207,249 +174,259 @@ grep -l -E '^dumpuser[[:blank:]]*"amanda"' /etc/amanda/*/amanda.conf |
%files
%defattr(-,root,root)
-%doc COPYRIGHT* NEWS README README-rpm
- %config(noreplace) /etc/xinetd.d/amanda
-%attr(-,%amanda_user,%amanda_group) %{_libdir}/libamanda-*.so
- %{_libdir}/libamanda.so
- %{_libdir}/libamandad*.so
- %{_libdir}/libamar*.so
- %{_libdir}/libamglue*.so
- %{_libdir}/libamxfer*.so
- %{_libdir}/libndmjob*.so
- %{_libdir}/libndmlib*.so
-%attr(-,%amanda_user,%amanda_group) %dir %{_libexecdir}/amanda
-%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/amandad
-%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/amanda-sh-lib.sh
-%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/amcat.awk
-%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/amndmjob
-%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/amplot.awk
-%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/amplot.g
-%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/amplot.gp
-%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/ndmjob
-
-%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amandad
-%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amaespipe
-%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amarchiver
-%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amcrypt
-%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amcrypt-ossl
-%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amcrypt-ossl-asym
-%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amcryptsimple
-%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amgetconf
-%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amgpgcrypt
-%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amplot
-
-%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Archive.pm
-%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/BigIntCompat.pm
-%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/ClientService.pm
-%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Config.pm
-%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Constants.pm
-%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Debug.pm
-%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Feature.pm
-%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Header.pm
-%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/IPC
-%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/MainLoop.pm
-%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/NDMP.pm
-%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Paths.pm
-%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Process.pm
-%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Script_App.pm
-%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Script.pm
-%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Tests.pm
-%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Util.pm
-%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Xfer.pm
-
-%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/auto/Amanda/Archive/
-%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/auto/Amanda/Config/
-%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/auto/Amanda/Debug/
-%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/auto/Amanda/Feature/
-%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/auto/Amanda/Header/
-%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/auto/Amanda/IPC/
-%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/auto/Amanda/MainLoop/
-%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/auto/Amanda/NDMP/
-%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/auto/Amanda/Tests/
-%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/auto/Amanda/Util/
-%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/auto/Amanda/Xfer/
-
- %{_mandir}/man5/amanda-archive-format.5*
- %{_mandir}/man7/amanda-compatibility.7*
- %{_mandir}/man5/amanda.conf*
- %{_mandir}/man7/amanda-auth.7*
- %{_mandir}/man7/amanda-scripts.7*
- %{_mandir}/man8/amanda.8*
- %{_mandir}/man8/amarchiver.8*
- %{_mandir}/man8/amplot.8*
- %{_mandir}/man8/script-email.8*
- %{_mandir}/man8/amaespipe.8*
- %{_mandir}/man8/amcrypt-ossl-asym.8*
- %{_mandir}/man8/amcrypt-ossl.8*
- %{_mandir}/man8/amcryptsimple.8*
- %{_mandir}/man8/amcrypt.8*
- %{_mandir}/man8/amgpgcrypt.8*
- %{_mandir}/man8/amgetconf.8*
-
-%attr(600,%amanda_user,%amanda_group) %config(noreplace) %{_localstatedir}/lib/amanda/.amandahosts
+%doc COPYRIGHT* NEWS README README-rpm
+ %config(noreplace) /etc/xinetd.d/amanda
+%attr(-,%amanda_user,%amanda_group) %{_libdir}/libamanda-*.so
+ %{_libdir}/libamanda.so
+ %{_libdir}/libamandad*.so
+ %{_libdir}/libamar*.so
+ %{_libdir}/libamglue*.so
+ %{_libdir}/libamxfer*.so
+ %{_libdir}/libndmjob*.so
+ %{_libdir}/libndmlib*.so
+%attr(-,%amanda_user,%amanda_group) %dir %{_libexecdir}/amanda
+%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/amandad
+%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/amanda-sh-lib.sh
+%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/amcat.awk
+%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/amndmjob
+%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/amplot.awk
+%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/amplot.g
+%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/amplot.gp
+%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/ndmjob
+
+%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amandad
+%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amaespipe
+%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amarchiver
+%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amcrypt
+%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amcrypt-ossl
+%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amcrypt-ossl-asym
+%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amcryptsimple
+%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amgetconf
+%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amgpgcrypt
+%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amplot
+
+%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Archive.pm
+%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/BigIntCompat.pm
+%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/ClientService.pm
+%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Config.pm
+%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Constants.pm
+%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Debug.pm
+%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Feature.pm
+%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Header.pm
+%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/IPC
+%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/MainLoop.pm
+%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/NDMP.pm
+%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Paths.pm
+%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Process.pm
+%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Script_App.pm
+%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Script.pm
+%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Tests.pm
+%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Util.pm
+%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Xfer.pm
+
+%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/auto/Amanda/Archive/
+%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/auto/Amanda/Config/
+%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/auto/Amanda/Debug/
+%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/auto/Amanda/Feature/
+%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/auto/Amanda/Header/
+%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/auto/Amanda/IPC/
+%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/auto/Amanda/MainLoop/
+%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/auto/Amanda/NDMP/
+%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/auto/Amanda/Tests/
+%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/auto/Amanda/Util/
+%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/auto/Amanda/Xfer/
+
+ %{_mandir}/man5/amanda-archive-format.5*
+ %{_mandir}/man7/amanda-compatibility.7*
+ %{_mandir}/man5/amanda.conf*
+ %{_mandir}/man7/amanda-auth.7*
+ %{_mandir}/man7/amanda-scripts.7*
+ %{_mandir}/man8/amanda.8*
+ %{_mandir}/man8/amarchiver.8*
+ %{_mandir}/man8/amplot.8*
+ %{_mandir}/man8/script-email.8*
+ %{_mandir}/man8/amaespipe.8*
+ %{_mandir}/man8/amcrypt-ossl-asym.8*
+ %{_mandir}/man8/amcrypt-ossl.8*
+ %{_mandir}/man8/amcryptsimple.8*
+ %{_mandir}/man8/amcrypt.8*
+ %{_mandir}/man8/amgpgcrypt.8*
+ %{_mandir}/man8/amgetconf.8*
+
+%attr(600,%amanda_user,%amanda_group) %config(noreplace) %{_localstatedir}/lib/amanda/.amandahosts
%attr(02700,%amanda_user,%amanda_group) %dir /var/log/amanda
-%attr(-,%amanda_user,%amanda_group) %dir %{_localstatedir}/lib/amanda/
-%attr(-,%amanda_user,%amanda_group) %dir %{_sysconfdir}/amanda/
-%attr(-,%amanda_user,%amanda_group) %dir %{_sysconfdir}/amanda/%defconfig
+%attr(-,%amanda_user,%amanda_group) %dir %{_localstatedir}/lib/amanda/
+%attr(-,%amanda_user,%amanda_group) %dir %{_sysconfdir}/amanda/
+%attr(-,%amanda_user,%amanda_group) %dir %{_sysconfdir}/amanda/%defconfig
%files server
%defattr(-,root,root)
- %{_libdir}/libamdevice*.so
- %{_libdir}/libamserver*.so
-%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/amcleanupdisk
-%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/amcheck-device
-%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/amidxtaped
-%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/amindexd
-%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/amlogroll
-%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/amtrmidx
-%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/amtrmlog
-%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/driver
-%attr(4750,root,%amanda_group) %{_libexecdir}/amanda/dumper
-%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/chg-disk
-%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/chg-chio
-%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/chg-chs
-%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/chg-iomega
-%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/chg-juke
-%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/chg-lib.sh
-%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/chg-manual
-%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/chg-mcutil
-%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/chg-mtx
-%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/chg-multi
-%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/chg-null
-%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/chg-rait
-%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/chg-rth
-%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/chg-scsi
-%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/chg-zd-mtx
-%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/chunker
-%attr(4750,root,%amanda_group) %{_libexecdir}/amanda/planner
-%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/taper
-%attr(-,%amanda_user,%amanda_group) %{_sbindir}/activate-devpay
-%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amaddclient
-%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amadmin
-%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amcleanup
-%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amdevcheck
-%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amdump
-%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amfetchdump
-%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amflush
-%attr(4750,root,%amanda_group) %{_sbindir}/amcheck
-%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amcheckdb
-%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amcheckdump
-%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amlabel
-%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amoverview
-%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amreport
-%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amrestore
-%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amrmtape
-%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amserverconfig
-%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amservice
-%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amstatus
-%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amtape
-%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amtapetype
-%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amtoc
-%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amvault
-
-%{_mandir}/man5/disklist.5*
-%{_mandir}/man5/tapelist.5*
-%{_mandir}/man7/amanda-devices.7*
-%{_mandir}/man7/amanda-changers.7*
-%{_mandir}/man7/amanda-taperscan.7*
-%{_mandir}/man8/amaddclient.8*
-%{_mandir}/man8/amadmin.8*
-%{_mandir}/man8/amcleanup.8*
-%{_mandir}/man8/amdevcheck.8*
-%{_mandir}/man8/amdump.8*
-%{_mandir}/man8/amfetchdump.8*
-%{_mandir}/man8/amflush.8*
-%{_mandir}/man8/amcheckdb.8*
-%{_mandir}/man8/amcheckdump.8*
-%{_mandir}/man8/amcheck.8*
-%{_mandir}/man8/amlabel.8*
-%{_mandir}/man8/amoverview.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/amtapetype.8*
-%{_mandir}/man8/amtape.8*
-%{_mandir}/man8/amtoc.8*
-%{_mandir}/man8/amvault.8*
-
-%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Cmdline.pm
-%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Curinfo/
-%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Curinfo.pm
-%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/DB/
-%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Device.pm
-%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Disklist.pm
-%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Holding.pm
-%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Changer/
-%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Changer.pm
-%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Interactive/
-%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Interactive.pm
-%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Logfile.pm
-%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Recovery/
-%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Report/
-%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Report.pm
-%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Tapelist.pm
-%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Taper/
-%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/XferServer.pm
-%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/auto/Amanda/Cmdline/
-%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/auto/Amanda/Device/
-%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/auto/Amanda/Disklist/
-%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/auto/Amanda/Logfile/
-%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/auto/Amanda/Tapelist/
-%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/auto/Amanda/XferServer/
-
-%attr(-,%amanda_user,%amanda_group) %dir %{_localstatedir}/lib/amanda/%defconfig/
-%attr(-,%amanda_user,%amanda_group) %dir %{_localstatedir}/lib/amanda/%defconfig/index
-%attr(-,%amanda_user,%amanda_group) %dir %{_sysconfdir}/amanda
-%attr(-,%amanda_user,%amanda_group) %config(noreplace) %{_sysconfdir}/amanda/crontab.sample
-%attr(-,%amanda_user,%amanda_group) %config(noreplace) %{_sysconfdir}/amanda/%defconfig/*
-%exclude %{_sysconfdir}/amanda/%defconfig/amanda-client.conf
-%exclude %{_sysconfdir}/amanda/%defconfig/amanda-client-postgresql.conf
-%attr(-,%amanda_user,%amanda_group) %dir %{_localstatedir}/lib/amanda/template.d
-%attr(-,%amanda_user,%amanda_group) %config(noreplace) %{_localstatedir}/lib/amanda/template.d/*
+ %{_libdir}/libamdevice*.so
+ %{_libdir}/libamserver*.so
+%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/amcleanupdisk
+%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/amcheck-device
+%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/amidxtaped
+%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/amindexd
+%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/amlogroll
+%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/amtrmidx
+%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/amtrmlog
+%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/driver
+%attr(4750,root,%amanda_group) %{_libexecdir}/amanda/dumper
+%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/chg-disk
+%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/chg-chio
+%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/chg-chs
+%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/chg-iomega
+%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/chg-juke
+%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/chg-lib.sh
+%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/chg-manual
+%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/chg-mcutil
+%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/chg-mtx
+%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/chg-multi
+%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/chg-null
+%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/chg-rait
+%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/chg-rth
+%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/chg-scsi
+%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/chg-zd-mtx
+%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/chunker
+%attr(4750,root,%amanda_group) %{_libexecdir}/amanda/planner
+%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/taper
+%attr(-,%amanda_user,%amanda_group) %{_sbindir}/activate-devpay
+%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amaddclient
+%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amadmin
+%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amcleanup
+%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amdevcheck
+%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amdump
+%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amfetchdump
+%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amflush
+%attr(4750,root,%amanda_group) %{_sbindir}/amcheck
+%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amcheckdb
+%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amcheckdump
+%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amlabel
+%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amoverview
+%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amreport
+%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amrestore
+%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amrmtape
+%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amserverconfig
+%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amservice
+%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amstatus
+%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amtape
+%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amtapetype
+%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amtoc
+%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amvault
+
+ %{_mandir}/man5/disklist.5*
+ %{_mandir}/man5/tapelist.5*
+ %{_mandir}/man7/amanda-devices.7*
+ %{_mandir}/man7/amanda-changers.7*
+ %{_mandir}/man7/amanda-taperscan.7*
+ %{_mandir}/man8/amaddclient.8*
+ %{_mandir}/man8/amadmin.8*
+ %{_mandir}/man8/amcleanup.8*
+ %{_mandir}/man8/amdevcheck.8*
+ %{_mandir}/man8/amdump.8*
+ %{_mandir}/man8/amfetchdump.8*
+ %{_mandir}/man8/amflush.8*
+ %{_mandir}/man8/amcheckdb.8*
+ %{_mandir}/man8/amcheckdump.8*
+ %{_mandir}/man8/amcheck.8*
+ %{_mandir}/man8/amlabel.8*
+ %{_mandir}/man8/amoverview.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/amtapetype.8*
+ %{_mandir}/man8/amtape.8*
+ %{_mandir}/man8/amtoc.8*
+ %{_mandir}/man8/amvault.8*
+
+%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Cmdline.pm
+%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Curinfo/
+%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Curinfo.pm
+%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/DB/
+%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Device.pm
+%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Disklist.pm
+%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Holding.pm
+%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Changer/
+%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Changer.pm
+%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Interactive/
+%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Interactive.pm
+%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Logfile.pm
+%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Recovery/
+%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Report/
+%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Report.pm
+%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Tapelist.pm
+%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Taper/
+%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/XferServer.pm
+%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/auto/Amanda/Cmdline/
+%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/auto/Amanda/Device/
+%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/auto/Amanda/Disklist/
+%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/auto/Amanda/Logfile/
+%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/auto/Amanda/Tapelist/
+%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/auto/Amanda/XferServer/
+
+%attr(-,%amanda_user,%amanda_group) %dir %{_localstatedir}/lib/amanda/%defconfig/
+%attr(-,%amanda_user,%amanda_group) %dir %{_localstatedir}/lib/amanda/%defconfig/index
+%attr(-,%amanda_user,%amanda_group) %dir %{_sysconfdir}/amanda
+%attr(-,%amanda_user,%amanda_group) %config(noreplace) %{_sysconfdir}/amanda/crontab.sample
+%attr(-,%amanda_user,%amanda_group) %config(noreplace) %{_sysconfdir}/amanda/%defconfig/*
+%exclude %{_sysconfdir}/amanda/%defconfig/amanda-client.conf
+%exclude %{_sysconfdir}/amanda/%defconfig/amanda-client-postgresql.conf
+%attr(-,%amanda_user,%amanda_group) %dir %{_localstatedir}/lib/amanda/template.d
+%attr(-,%amanda_user,%amanda_group) %config(noreplace) %{_localstatedir}/lib/amanda/template.d/*
%files client
- %defattr(-,root,root)
- %{_libdir}/libamclient*.so
-%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/application/
-%attr(4750,root,%amanda_group) %{_libexecdir}/amanda/calcsize
-%attr(4750,root,%amanda_group) %{_libexecdir}/amanda/killpgrp
-%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/noop
-%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/patch-system
-%attr(4750,root,%amanda_group) %{_libexecdir}/amanda/rundump
-%attr(4750,root,%amanda_group) %{_libexecdir}/amanda/runtar
-%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/selfcheck
-%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/sendbackup
-%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/sendsize
-%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/teecount
-%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amoldrecover
-%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amrecover
- %{_mandir}/man7/amanda-applications.7*
- %{_mandir}/man5/amanda-client.conf.5*
- %{_mandir}/man8/amgtar.8*
- %{_mandir}/man8/ampgsql.8*
- %{_mandir}/man8/amraw.8*
- %{_mandir}/man8/amrecover.8*
- %{_mandir}/man8/amsamba.8*
- %{_mandir}/man8/amstar.8*
- %{_mandir}/man8/amsuntar.8*
- %{_mandir}/man8/amzfs-sendrecv.8*
- %{_mandir}/man8/amzfs-snapshot.8*
-
-%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Application.pm
-%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Application/
-%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/auto/Amanda/Application/
-
-%attr(-,%amanda_user,%amanda_group) %config(noreplace) %{_localstatedir}/lib/amanda/amandates
-%attr(-,%amanda_user,%amanda_group) %{_localstatedir}/lib/amanda/gnutar-lists/
-%attr(-,%amanda_user,%amanda_group) %config(noreplace) %{_sysconfdir}/amanda/%defconfig/amanda-client.conf
-%attr(-,%amanda_user,%amanda_group) %config(noreplace) %{_sysconfdir}/amanda/%defconfig/amanda-client-postgresql.conf
+%defattr(-,root,root)
+ %{_libdir}/libamclient*.so
+%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/application/
+%attr(4750,root,%amanda_group) %{_libexecdir}/amanda/calcsize
+%attr(4750,root,%amanda_group) %{_libexecdir}/amanda/killpgrp
+%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/noop
+%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/patch-system
+%attr(4750,root,%amanda_group) %{_libexecdir}/amanda/rundump
+%attr(4750,root,%amanda_group) %{_libexecdir}/amanda/runtar
+%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/selfcheck
+%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/sendbackup
+%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/sendsize
+%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/teecount
+%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amoldrecover
+%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amrecover
+ %{_mandir}/man7/amanda-applications.7*
+ %{_mandir}/man5/amanda-client.conf.5*
+ %{_mandir}/man8/amgtar.8*
+ %{_mandir}/man8/ampgsql.8*
+ %{_mandir}/man8/amraw.8*
+ %{_mandir}/man8/amrecover.8*
+ %{_mandir}/man8/amoldrecover.8*
+ %{_mandir}/man8/amsamba.8*
+ %{_mandir}/man8/amstar.8*
+ %{_mandir}/man8/amsuntar.8*
+ %{_mandir}/man8/amzfs-sendrecv.8*
+ %{_mandir}/man8/amzfs-snapshot.8*
+
+%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Application.pm
+%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Application/
+%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/auto/Amanda/Application/
+
+%attr(-,%amanda_user,%amanda_group) %config(noreplace) %{_localstatedir}/lib/amanda/amandates
+%attr(-,%amanda_user,%amanda_group) %{_localstatedir}/lib/amanda/gnutar-lists/
+%attr(-,%amanda_user,%amanda_group) %config(noreplace) %{_sysconfdir}/amanda/%defconfig/amanda-client.conf
+%attr(-,%amanda_user,%amanda_group) %config(noreplace) %{_sysconfdir}/amanda/%defconfig/amanda-client-postgresql.conf
%changelog
+* Tue Aug 03 2010 Jan Görig <jgorig at redhat.com> - 3.1.1-1
+- upgraded to new upstream bugfix version
+- dropped old upgrade scriptlets
+- spec cleanups
+- created symlink to manpage for amoldrecover
+- default configuration now backups extended attributes
+- fix #610169 - fixed build flags
+- fix #600552 - corrected amdatadir path, updated example patch
+
* Mon Jun 28 2010 Jan Görig <jgorig at redhat.com> - 3.1.0-1
- upgraded to new upstream version
- documentation moved to main package
@@ -859,7 +836,7 @@ grep -l -E '^dumpuser[[:blank:]]*"amanda"' /etc/amanda/*/amanda.conf |
* Wed Mar 8 2000 Tim Powers <timp at redhat.com>
- fixed files/dirs ending up in the wrong packages.
- last time it wasn't built with dump (doh!), this time it is. Now has a
- BuildRequires for dump.
+ BuildRequires for dump.
* Thu Feb 10 2000 Tim Powers <timp at redhat.com>
- strip binaries
@@ -869,14 +846,14 @@ grep -l -E '^dumpuser[[:blank:]]*"amanda"' /etc/amanda/*/amanda.conf |
* Tue Jan 11 2000 Tim Powers <timp at redhat.com>
- make sure the man pages are gzipped in each subpackage, overriding the build
- system spec_install_post macro.
+ system spec_install_post macro.
- using mega spec file changes from Marc Merlin <merlin_bts at valinux.com> since
- the package we were shipping in the past had some major issues (not in
- Marc's words ;)
+ the package we were shipping in the past had some major issues (not in
+ Marc's words ;)
- using Marc's added README and modified config files.
- adapted patches written by Alexandre Oliva <oliva at dcc.unicamp.br> from Marc
- Merlin's package so that the patch matches the source version (the patches
- are the glibc2.1 and glibc2.2 patches)
+ Merlin's package so that the patch matches the source version (the patches
+ are the glibc2.1 and glibc2.2 patches)
* Mon Jan 3 2000 Tim Powers <timp at redhat.com>
- fix so configure doesn't crap out (libtoolize --force)
diff --git a/sources b/sources
index 7849c1b..3da1de8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-86f1e3e052d336849a60b46f876fc0e4 amanda-3.1.0.tar.gz
+94ce893d211d9876ed2d9b33c46cef33 amanda-3.1.1.tar.gz
More information about the scm-commits
mailing list