Author: jajcus Date: Wed Nov 30 14:59:04 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - Version: 1.3.8.2 - bacula-gui sources commented out, as not used yet. Shouldn't that go to a separate spec, anyway? - fixed dvd-handler path in the supplied config gile (-dvd-handler_path.patch) - C: dvd+rw-tools <= 5.21.4.10.8-1 for bacula-sd (not everyone use DVD, but if one use, then unpatched 5.21.4.10.8 won't work for him) - %post scripts made quiet and return 0 exit code - dvd-handler script added - mtx-changer script made executable
---- Files affected: SPECS: bacula.spec (1.33 -> 1.34) ---- Diffs: ================================================================ Index: SPECS/bacula.spec diff -u SPECS/bacula.spec:1.33 SPECS/bacula.spec:1.34 --- SPECS/bacula.spec:1.33 Tue Nov 29 00:39:21 2005 +++ SPECS/bacula.spec Wed Nov 30 15:58:58 2005 @@ -13,18 +13,18 @@ Summary: Bacula - The Network Backup Solution Summary(pl): Bacula - rozwiązanie do wykonywania kopii zapasowych po sieci Name: bacula -Version: 1.38.1 +Version: 1.38.2 Release: 0.1 Epoch: 0 Group: Networking/Utilities License: extended GPL v2 Source0: http://dl.sourceforge.net/bacula/%{name}-%{version}.tar.gz -# Source0-md5: 3bbf805b873716ef782ae12c92a778b4 +# Source0-md5: 898a9ce05dc6b3e3312de4fa62aacb06 Source1: %{name}-manpages.tar.bz2 # Source1-md5: e4dae86d6574b360e831efd3913e7f4c Source2: http://dl.sourceforge.net/bacula/%{name}-docs-%{version}.tar.gz -# Source2-md5: 523ce33d8f038e9b16cdf03f5c2b66f0 -Source3: http://dl.sourceforge.net/bacula/%{name}-gui-%{version}.tar.gz +## Source2-md5: 6b4b6fba135e554687103340f07a31b2 +#Source3: http://dl.sourceforge.net/bacula/%{name}-gui-%{version}.tar.gz # Source3-md5: 5fb575ceed9dee0cdf8bc7f81ef60f54 Source4: http://dl.sourceforge.net/bacula/%{name}-rescue-1.8.1.tar.gz # Source4-md5: a5833354917125127b4a1f5e68521834 @@ -35,6 +35,7 @@ Source14: %{name}-dir.sysconfig Source15: %{name}-fd.sysconfig Source16: %{name}-sd.sysconfig +Patch0: %{name}-dvd-handler_path.patch URL: http://www.bacula.org/ BuildRequires: acl-static BuildRequires: automake @@ -289,6 +290,7 @@ Group: Networking/Utilities PreReq: bacula-common = %{epoch}:%{version}-%{release} Requires(post): sed >= 4.0 +Conflicts: dvd+rw-tools <= 5.21.4.10.8-1 %description sd Bacula - It comes by night and sucks the vital essence from your @@ -361,7 +363,8 @@ %prep %setup -q -a 1 -a 2 -tar -xf %{SOURCE3} +%patch0 -p1 +#tar -xf %{SOURCE3} tar -xf %{SOURCE4} && ln -s bacula-rescue-* rescue sed -i -e 's#wx-config#wx-gtk2-ansi-config#g' configure* sed -i -e 's#-lreadline -lhistory -ltermcap#-lreadline -lhistory#g' configure* @@ -535,9 +538,9 @@ cd /etc/bacula for f in *-password ; do p=`cat $f` - sed -i -e"s:#FAKE-$f#:$p:" *.conf *.conf.rpmnew + sed -i -e"s:#FAKE-$f#:$p:" *.conf *.conf.rpmnew 2>/dev/null || : done -sed -i -e"s:--hostname--:`hostname`:" *.conf *.conf.rpmnew +sed -i -e"s:--hostname--:`hostname`:" *.conf *.conf.rpmnew 2>/dev/null || : /sbin/chkconfig --add bacula-dir if [ -f /var/lock/subsys/bacula-dir ]; then @@ -559,9 +562,9 @@ cd /etc/bacula for f in *-password ; do p=`cat $f` - sed -i -e"s:#FAKE-$f#:$p:" *.conf *.conf.rpmnew + sed -i -e"s:#FAKE-$f#:$p:" *.conf *.conf.rpmnew 2>/dev/null || : done -sed -i -e"s:--hostname--:`hostname`:" *.conf *.conf.rpmnew +sed -i -e"s:--hostname--:`hostname`:" *.conf *.conf.rpmnew 2>/dev/null || : /sbin/chkconfig --add bacula-fd if [ -f /var/lock/subsys/bacula-fd ]; then @@ -583,9 +586,9 @@ cd /etc/bacula for f in *-password ; do p=`cat $f` - sed -i -e"s:#FAKE-$f#:$p:" *.conf *.conf.rpmnew + sed -i -e"s:#FAKE-$f#:$p:" *.conf *.conf.rpmnew 2>/dev/null || : done -sed -i -e"s:--hostname--:`hostname`:" *.conf *.conf.rpmnew +sed -i -e"s:--hostname--:`hostname`:" *.conf *.conf.rpmnew 2>/dev/null || : /sbin/chkconfig --add bacula-sd if [ -f /var/lock/subsys/bacula-sd ]; then @@ -612,36 +615,36 @@ cd /etc/bacula for f in *-password ; do p=`cat $f` - sed -i -e"s:#FAKE-$f#:$p:" *.conf *.conf.rpmnew + sed -i -e"s:#FAKE-$f#:$p:" *.conf *.conf.rpmnew 2>/dev/null || : done -sed -i -e"s:--hostname--:`hostname`:" *.conf *.conf.rpmnew +sed -i -e"s:--hostname--:`hostname`:" *.conf *.conf.rpmnew 2>/dev/null || : %post console-wx echo "Updating Bacula passwords and names..." cd /etc/bacula for f in *-password ; do p=`cat $f` - sed -i -e"s:#FAKE-$f#:$p:" *.conf *.conf.rpmnew + sed -i -e"s:#FAKE-$f#:$p:" *.conf *.conf.rpmnew 2>/dev/null || : done -sed -i -e"s:--hostname--:`hostname`:" *.conf *.conf.rpmnew +sed -i -e"s:--hostname--:`hostname`:" *.conf *.conf.rpmnew 2>/dev/null || : %post console-gnome echo "Updating Bacula passwords and names..." cd /etc/bacula for f in *-password ; do p=`cat $f` - sed -i -e"s:#FAKE-$f#:$p:" *.conf *.conf.rpmnew + sed -i -e"s:#FAKE-$f#:$p:" *.conf *.conf.rpmnew 2>/dev/null || : done -sed -i -e"s:--hostname--:`hostname`:" *.conf *.conf.rpmnew +sed -i -e"s:--hostname--:`hostname`:" *.conf *.conf.rpmnew 2>/dev/null || : %post tray-monitor echo "Updating Bacula passwords and names..." cd /etc/bacula for f in *-password ; do p=`cat $f` - sed -i -e"s:#FAKE-$f#:$p:" *.conf *.conf.rpmnew + sed -i -e"s:#FAKE-$f#:$p:" *.conf *.conf.rpmnew 2>/dev/null || : done -sed -i -e"s:--hostname--:`hostname`:" *.conf *.conf.rpmnew +sed -i -e"s:--hostname--:`hostname`:" *.conf *.conf.rpmnew 2>/dev/null || : %post rescue # link our current installed conf file to the rescue directory @@ -728,7 +731,8 @@ %attr(755,root,root) %{_sbindir}/bls %attr(755,root,root) %{_sbindir}/bscan %attr(755,root,root) %{_sbindir}/btape -%{_libexecdir}/%{name}/mtx-changer +%attr(755,root,root) %{_libexecdir}/%{name}/mtx-changer +%attr(755,root,root) %{_libexecdir}/%{name}/dvd-handler %{_mandir}/man8/bacula-sd.8* %{_mandir}/man1/bcopy.1* %{_mandir}/man1/bextract.1* @@ -797,6 +801,17 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.34 2005/11/30 14:58:58 jajcus +- Version: 1.3.8.2 +- bacula-gui sources commented out, as not used yet. Shouldn't that go + to a separate spec, anyway? +- fixed dvd-handler path in the supplied config gile (-dvd-handler_path.patch) +- C: dvd+rw-tools <= 5.21.4.10.8-1 for bacula-sd (not everyone use DVD, + but if one use, then unpatched 5.21.4.10.8 won't work for him) +- %post scripts made quiet and return 0 exit code +- dvd-handler script added +- mtx-changer script made executable + Revision 1.33 2005/11/28 23:39:21 zbyniu - spaces -> tabs & other cosmetics ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/bacula.spec?r1=1.33&r2=1.34&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
