- added /usr/lib for commands emebedded in ssh keys
Changed files:
amanda.spec -> 1.165
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)
+%define _ulibdir %{_prefix}/lib
+
%description
AMANDA, the Advanced Maryland Automatic Network Disk Archiver, is a
backup system that allows the administrator of a LAN to set up a
%description
AMANDA, the Advanced Maryland Automatic Network Disk Archiver, is a
backup system that allows the administrator of a LAN to set up a
Summary: The client side of Amanda
Summary(pl.UTF-8): Klient Amandy
Group: Networking/Utilities
Summary: The client side of Amanda
Summary(pl.UTF-8): Klient Amandy
Group: Networking/Utilities
+Requires(post): /bin/hostname
+Requires(post): /usr/bin/ssh-keygen
Requires: %{name}-libs = %{version}-%{release}
Requires: rc-inetd
Suggests: openssh-clients
Requires: %{name}-libs = %{version}-%{release}
Requires: rc-inetd
Suggests: openssh-clients
Summary: The server side of Amanda
Summary(pl.UTF-8): Serwer Amandy
Group: Networking/Utilities
Summary: The server side of Amanda
Summary(pl.UTF-8): Serwer Amandy
Group: Networking/Utilities
+Requires(post): /bin/hostname
+Requires(post): /usr/bin/ssh-keygen
Requires: %{name}-libs = %{version}-%{release}
Requires: /etc/cron.d
Requires: crondaemon
Requires: %{name}-libs = %{version}-%{release}
Requires: /etc/cron.d
Requires: crondaemon
> $RPM_BUILD_ROOT%{_sharedstatedir}/amanda/amandates
> $RPM_BUILD_ROOT%{_sharedstatedir}/amanda/amandates
+# Amanda tools generate ssh keys with embeded commands pointing to /usr/lib
+# Tools can't be "fixed" because keys generated on server are to be used on client
+if [ "%{_lib}" != "lib" ] ; then
+ install -d $RPM_BUILD_ROOT%{_ulibdir}
+ ln -s %{_libdir}/amanda $RPM_BUILD_ROOT%{_ulibdir}/amanda
+fi
+
find $RPM_BUILD_ROOT -name \*.la | xargs rm -f
%clean
find $RPM_BUILD_ROOT -name \*.la | xargs rm -f
%clean
%post client
%service -q rc-inetd reload
%post client
%service -q rc-inetd reload
-if [ -x /usr/bin/ssh-keygen -a ! -e /var/lib/amanda/.ssh/id_rsa_amrecover ] ; then
- HOST="`hostname`"
+if [ ! -e /var/lib/amanda/.ssh/id_rsa_amrecover ] ; then
+ HOST="`/bin/hostname`"
if [ -z "$HOST" ] ; then
COMMENT="root@client"
else
if [ -z "$HOST" ] ; then
COMMENT="root@client"
else
%post server
%service -q rc-inetd reload
%post server
%service -q rc-inetd reload
-if [ -x /usr/bin/ssh-keygen -a ! -e /var/lib/amanda/.ssh/id_rsa_amdump ] ; then
- HOST="`hostname`"
+if [ ! -e /var/lib/amanda/.ssh/id_rsa_amdump ] ; then
+ HOST="`/bin/hostname`"
if [ -z "$HOST" ] ; then
COMMENT="amanda@server"
else
if [ -z "$HOST" ] ; then
COMMENT="amanda@server"
else
%attr(755,root,root) %{_libdir}/amanda/libamanda*.so
%attr(750,amanda,amanda) %dir %{_sysconfdir}/amanda
%dir %{_libdir}/amanda
%attr(755,root,root) %{_libdir}/amanda/libamanda*.so
%attr(750,amanda,amanda) %dir %{_sysconfdir}/amanda
%dir %{_libdir}/amanda
+%if %{_lib} != "lib"
+%{_ulibdir}/amanda
+%endif
%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