diff --git a/.cvsignore b/.cvsignore index 56ee3e3..4d6efe6 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -amanda-2.5.1p3.tar.gz +amanda-2.5.2p1.tar.gz diff --git a/amanda.spec b/amanda.spec index fa710df..48543e4 100644 --- a/amanda.spec +++ b/amanda.spec @@ -8,18 +8,16 @@ # XXX append lib to current _localstatedir setting %{expand: %%define _localstatedir %{_localstatedir}/lib} -Summary: A network-capable tape backup solution. +Summary: A network-capable tape backup solution Name: amanda -Version: 2.5.1p3 +Version: 2.5.2p1 Release: 1%{?dist} Source: http://download.sourceforge.net/amanda/amanda-%{version}.tar.gz Source1: amanda.crontab Source4: disklist Source5: amanda-xinetd Source8: amandahosts -Patch0: amanda-2.4.2-bug18322.patch Patch1: amanda-2.5.0-pie.patch -Patch2: amanda-2.5.1p1-rsh.patch License: BSD Group: Applications/System URL: http://www.amanda.org @@ -80,9 +78,7 @@ be used to develop amanda applications. %prep %setup -q -%patch0 -p1 -b .bug18322 %patch1 -p1 -b .pie -%patch2 -p1 -b .rsh %build export CFLAGS="$RPM_OPT_FLAGS -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE" @@ -143,6 +139,7 @@ pushd ${RPM_BUILD_ROOT} cp ${RPM_SOURCE_DIR}/amanda.crontab .%{_sysconfdir}/amanda/crontab.sample cp ${RPM_SOURCE_DIR}/disklist .%{_sysconfdir}/amanda/%defconfig cp ${RPM_BUILD_DIR}/%{name}-%{version}/examples/amanda.conf .%{_sysconfdir}/amanda/%{defconfig} + cp ${RPM_BUILD_DIR}/%{name}-%{version}/examples/amanda-client.conf .%{_sysconfdir}/amanda/%{defconfig} cp ${RPM_SOURCE_DIR}/disklist .%{_sysconfdir}/amanda/%defconfig touch .%{_sysconfdir}/amandates @@ -152,6 +149,7 @@ pushd ${RPM_BUILD_ROOT} chmod 755 .%{_libdir}/libam* popd cp examples/amanda.conf $RPM_BUILD_ROOT%{_sysconfdir}/amanda/%{defconfig} +cp examples/amanda-client.conf $RPM_BUILD_ROOT%{_sysconfdir}/amanda/%{defconfig} rm -rf $RPM_BUILD_ROOT/usr/share/amanda rm $RPM_BUILD_ROOT/%{_libdir}/*.la @@ -204,7 +202,7 @@ useradd -M -n -g %amanda_group -o -r -d %{_localstatedir}/amanda -s /bin/bash \ %files server %defattr(-,root,root) %doc examples COPYRIGHT* NEWS README -%attr(-,%amanda_user,%amanda_group) %dir %{_libexecdir}/ +%attr(-,%amanda_user,%amanda_group) %dir %{_libexecdir}/ %attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amidxtaped %attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amindexd %attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amlogroll @@ -214,11 +212,11 @@ useradd -M -n -g %amanda_group -o -r -d %{_localstatedir}/amanda -s /bin/bash \ %attr(4750,root,%amanda_group) %{_libexecdir}/dumper %attr(4750,root,%amanda_group) %{_libexecdir}/planner %attr(-,%amanda_user,%amanda_group) %{_libexecdir}/taper -%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/chunker -#%attr(-,%amanda_user,%amanda_group) %dir %{_libdir}/amanda -#%attr(-,%amanda_user,%amanda_group) %dir %{_libdir}/amanda/dumperdir -#%attr(-,%amanda_user,%amanda_group) %{_libdir}/amanda/dumperdir/generic-dumper -#%attr(-,%amanda_user,%amanda_group) %{_libdir}/amanda/dumperdir/gnutar +%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/chunker +#%attr(-,%amanda_user,%amanda_group) %dir %{_libdir}/amanda +#%attr(-,%amanda_user,%amanda_group) %dir %{_libdir}/amanda/dumperdir +#%attr(-,%amanda_user,%amanda_group) %{_libdir}/amanda/dumperdir/generic-dumper +#%attr(-,%amanda_user,%amanda_group) %{_libdir}/amanda/dumperdir/gnutar %attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amcleanupdisk %attr(-,%amanda_user,%amanda_group) %{_libexecdir}/chg-chio %attr(-,%amanda_user,%amanda_group) %{_libexecdir}/chg-chs @@ -234,6 +232,7 @@ useradd -M -n -g %amanda_group -o -r -d %{_localstatedir}/amanda -s /bin/bash \ %attr(-,%amanda_user,%amanda_group) %{_libexecdir}/chg-zd-mtx %attr(-,%amanda_user,%amanda_group) %{_libexecdir}/chg-disk %attr(-,%amanda_user,%amanda_group) %{_libexecdir}/chg-iomega +%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/chg-lib.sh %attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amcat.awk %attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amplot.awk %attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amplot.g @@ -302,7 +301,7 @@ useradd -M -n -g %amanda_group -o -r -d %{_localstatedir}/amanda -s /bin/bash \ %defattr(-,root,root) %config(noreplace) /etc/xinetd.d/amanda %attr(-,%amanda_user,%amanda_group) %dir %{_libexecdir}/ -%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/noop +%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/noop %attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amandad %attr(4750,root,%amanda_group) %{_libexecdir}/calcsize %attr(4750,root,%amanda_group) %{_libexecdir}/killpgrp @@ -313,13 +312,14 @@ useradd -M -n -g %amanda_group -o -r -d %{_localstatedir}/amanda -s /bin/bash \ %attr(-,%amanda_user,%amanda_group) %{_libexecdir}/sendbackup %attr(-,%amanda_user,%amanda_group) %{_libexecdir}/sendsize %attr(-,%amanda_user,%amanda_group) %{_libexecdir}/versionsuffix -%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amfetchdump - %{_mandir}/man8/amfetchdump.8* +%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amfetchdump + %{_mandir}/man8/amfetchdump.8* %attr(-,%amanda_user,%amanda_group) %{_sbindir}/amrecover %attr(-,%amanda_user,%amanda_group) %{_sbindir}/amoldrecover %{_mandir}/man8/amrecover.8* %{_mandir}/man5/amanda-client.conf.5* %attr(-,%amanda_user,%amanda_group) %{_localstatedir}/amanda/gnutar-lists/ +%attr(-,%amanda_user,%amanda_group) %config(noreplace) %{_sysconfdir}/amanda/%defconfig/amanda-client.conf %files devel %defattr(-,root,root) @@ -331,6 +331,12 @@ useradd -M -n -g %amanda_group -o -r -d %{_localstatedir}/amanda -s /bin/bash \ %{_libdir}/libamandad.so %changelog +* Thu Jun 21 2007 Radek Brich 2.5.2.p1-1 +- New upstream version. +- Client rpm now installs amanda-client.conf. +- Removed obsolete patches -bug18322 and -rsh. +- Clean up spec file (non-utf8 error and some warnings from rpmlint). + * Mon Feb 19 2007 Jay Fenlason 2.5.1p3-1%{?dist} - Upgrade to new upstream release, now that 2.5.1 is somewhat stable. - Note that this requires changing the xinetd configuration and amanda.conf @@ -490,56 +496,56 @@ useradd -M -n -g %amanda_group -o -r -d %{_localstatedir}/amanda -s /bin/bash \ * Thu May 23 2002 Tim Powers - automated rebuild -* Tue Apr 2 2002 Trond Eivind Glomsr�d 2.4.2p2-7 +* Tue Apr 2 2002 Trond Eivind Glomsrød 2.4.2p2-7 - Don't strip explicitly - Require samba-client instead of /usr/bin/smbclient -* Thu Feb 21 2002 Trond Eivind Glomsr�d 2.4.2p2-6 +* Thu Feb 21 2002 Trond Eivind Glomsrød 2.4.2p2-6 - Rebuild * Wed Jan 09 2002 Tim Powers - automated rebuild -* Fri Jul 13 2001 Trond Eivind Glomsr�d +* Fri Jul 13 2001 Trond Eivind Glomsrød - Build and install the "tapetype" utility program, for tape size identification (#48745) -* Tue Jun 19 2001 Trond Eivind Glomsr�d +* Tue Jun 19 2001 Trond Eivind Glomsrød - don't use %%configure, to make it build * Mon Apr 9 2001 Bill Nottingham - include ia64 again -* Wed Apr 4 2001 Trond Eivind Glomsr�d +* Wed Apr 4 2001 Trond Eivind Glomsrød - 2.4.2p2 - fixes problems with amrecover (#26567) - made config files noreplace - don't build on IA64 right now, amanda doesn't like the dump there: It segfaults. -* Fri Mar 16 2001 Trond Eivind Glomsr�d +* Fri Mar 16 2001 Trond Eivind Glomsrød - Add /usr/bin/smbclient to buildprereq (#31996), to avoid samba being built without such support -* Thu Feb 22 2001 Trond Eivind Glomsr�d +* Thu Feb 22 2001 Trond Eivind Glomsrød - Use %%{version} in source URL, and thus actually use 2.4.2p1 instead of 2.4.2 (doh! # 28759) - add patch to handle bogus /dev/root entries (#28759) -* Fri Feb 16 2001 Trond Eivind Glomsr�d +* Fri Feb 16 2001 Trond Eivind Glomsrød - 2.4.2p1 bugfix release - move amandaixd and amidxtape to the server package (#28037) -* Wed Jan 31 2001 Trond Eivind Glomsr�d +* Wed Jan 31 2001 Trond Eivind Glomsrød - move /etc/xinetd.d/amanda to the client subpackage (#25430) -* Tue Jan 30 2001 Trond Eivind Glomsr�d +* Tue Jan 30 2001 Trond Eivind Glomsrød - don't have "chunksize -1" as the default, as it's no longer supported - make it uid amanda, with home /var/lib/amada so programs can actually access it (#20510) - make .amandahosts a config file (#18322) -* Tue Jan 23 2001 Trond Eivind Glomsr�d +* Tue Jan 23 2001 Trond Eivind Glomsrød - 2.4.2 - make the UDP service "wait" (#23047) @@ -556,7 +562,7 @@ useradd -M -n -g %amanda_group -o -r -d %{_localstatedir}/amanda -s /bin/bash \ * Sun Sep 3 2000 Florian La Roche - do not include /etc/xinetd.d/amandaidx in the server rpm -* Mon Aug 21 2000 Trond Eivind Glomsr�d +* Mon Aug 21 2000 Trond Eivind Glomsrød - only do reload of xinetd if xinetd is running (#16653) - don't show output of reload command to STDOUT (#16653) - don't use /usr/sbin/tcpd in amidx, xinetd is linked @@ -570,7 +576,7 @@ useradd -M -n -g %amanda_group -o -r -d %{_localstatedir}/amanda -s /bin/bash \ * Tue Aug 1 2000 Matt Wilson - added Prereq: /sbin/service xinetd to client and server subpackages -* Tue Jul 18 2000 Trond Eivind Glomsr�d +* Tue Jul 18 2000 Trond Eivind Glomsrød - xinetd support * Wed Jul 12 2000 Prospector diff --git a/sources b/sources index ee366fa..e0d9cb5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7232da6d43543f2c7dac2ded21c65ee9 amanda-2.5.1p3.tar.gz +da1234b12e1e34f8535f1c6269d27788 amanda-2.5.2p1.tar.gz