rpms/bacula/devel .cvsignore, 1.9, 1.10 bacula-bat.desktop, 1.2, 1.3 bacula-bwxconsole.desktop, 1.2, 1.3 bacula-config.patch, 1.3, 1.4 bacula-gconsole.desktop, 1.3, 1.4 bacula-traymonitor.desktop, 1.2, 1.3 bacula-wxconsole.desktop, 1.3, 1.4 bacula.spec, 1.26, 1.27 sources, 1.8, 1.9
Jon Ciesla
limb at fedoraproject.org
Thu Jul 23 15:33:47 UTC 2009
Author: limb
Update of /cvs/pkgs/rpms/bacula/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11322
Modified Files:
.cvsignore bacula-bat.desktop bacula-bwxconsole.desktop
bacula-config.patch bacula-gconsole.desktop
bacula-traymonitor.desktop bacula-wxconsole.desktop
bacula.spec sources
Log Message:
Update to new upstream, 3.0.2.
Put full paths in desktop files. BZ 426790.
Moved console requires from sysconfdir to common BZ 505755.
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bacula/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore 30 Apr 2009 19:20:04 -0000 1.9
+++ .cvsignore 23 Jul 2009 15:33:17 -0000 1.10
@@ -1,2 +1,2 @@
-bacula-3.0.1.tar.gz
-bacula-docs-3.0.1.tar.bz2
+bacula-3.0.2.tar.gz
+bacula-docs-3.0.2.tar.bz2
Index: bacula-bat.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/bacula/devel/bacula-bat.desktop,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- bacula-bat.desktop 17 Nov 2008 18:07:32 -0000 1.2
+++ bacula-bat.desktop 23 Jul 2009 15:33:17 -0000 1.3
@@ -4,7 +4,7 @@ Encoding=UTF-8
Name=Bacula Bat Console
GenericName=Backup Management Console
Comment=Control your Bacula Server
-Exec=bat -c /etc/bacula/bat.conf
+Exec=/usr/sbin/bat -c /etc/bacula/bat.conf
Icon=bat_icon
Terminal=false
Type=Application
Index: bacula-bwxconsole.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/bacula/devel/bacula-bwxconsole.desktop,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- bacula-bwxconsole.desktop 17 Nov 2008 18:07:33 -0000 1.2
+++ bacula-bwxconsole.desktop 23 Jul 2009 15:33:17 -0000 1.3
@@ -4,7 +4,7 @@ Encoding=UTF-8
Name=Bacula WX Console
GenericName=Backup Management Console
Comment=Control your Bacula Server
-Exec=bwxconsole -c /etc/bacula/bwxconsole.conf
+Exec=/usr/sbin/bwxconsole -c /etc/bacula/bwxconsole.conf
Icon=wxwin16x16
Terminal=false
Type=Application
bacula-config.patch:
dird/bacula-dir.conf.in | 67 ++++++++++++++++------------------
gnome2-console/bgnome-console.conf.in | 4 +-
qt-console/bat.conf.in | 4 +-
stored/stored.conf.in | 6 +--
4 files changed, 40 insertions(+), 41 deletions(-)
Index: bacula-config.patch
===================================================================
RCS file: /cvs/pkgs/rpms/bacula/devel/bacula-config.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- bacula-config.patch 10 Dec 2008 18:59:21 -0000 1.3
+++ bacula-config.patch 23 Jul 2009 15:33:17 -0000 1.4
@@ -1,7 +1,7 @@
--- bacula-2.4.3/src/gnome2-console/bgnome-console.conf.in.orig 2008-12-10 10:12:18.000000000 -0600
+++ bacula-2.4.3/src/gnome2-console/bgnome-console.conf.in 2008-12-10 10:12:18.000000000 -0600
@@ -6 +6 @@
-- Name = @hostname at -dir
+- Name = @basename at -dir
+ Name = bacula-dir
@@ -8 +8 @@
- address = @hostname@
@@ -9,24 +9,24 @@
--- bacula-2.4.3/src/dird/bacula-dir.conf.in.orig 2008-12-10 10:17:27.000000000 -0600
+++ bacula-2.4.3/src/dird/bacula-dir.conf.in 2008-12-10 10:17:27.000000000 -0600
@@ -16 +16 @@
-- Name = @hostname at -dir
+- Name = @basename at -dir
+ Name = bacula-dir
@@ -30 +30 @@
-- Client = @hostname at -fd
+- Client = @basename at -fd
+ Client = bacula-fd
@@ -51 +51 @@
--# Client = @hostname at 2-fd
+-# Client = @basename at 2-fd
+# Client = bacula2-fd
@@ -82 +82 @@
-- Client=@hostname at -fd
+- Client=@basename at -fd
+ Client=bacula-fd
@@ -157,2 +157,2 @@
-- Name = @hostname at -fd
+- Name = @basename at -fd
- Address = @hostname@
+ Name = bacula-fd
+ Address = client.example.com
@@ -172,2 +172,2 @@
--# Name = @hostname at 2-fd
+-# Name = @basename at 2-fd
-# Address = @hostname at 2
+# Name = bacula2-fd
+# Address = client2.example.com
@@ -43,40 +43,40 @@
-# Address = @hostname@ # N.B. Use a fully qualified name here
+# Address = storage.example.com # N.B. Use a fully qualified name here
@@ -299 +299 @@
-- Name = @hostname at -mon
+- Name = @basename at -mon
+ Name = bacula-mon
--- bacula-2.4.3/src/filed/bacula-fd.conf.in.orig 2008-12-10 10:19:12.000000000 -0600
+++ bacula-2.4.3/src/filed/bacula-fd.conf.in 2008-12-10 10:19:12.000000000 -0600
@@ -14 +14 @@
-- Name = @hostname at -dir
+- Name = @basename at -dir
+ Name = bacula-dir
@@ -23 +23 @@
-- Name = @hostname at -mon
+- Name = @basename at -mon
+ Name = bacula-mon
@@ -32 +32 @@
-- Name = @hostname at -fd
+- Name = @basename at -fd
+ Name = bacula-fd
@@ -42 +42 @@
-- director = @hostname at -dir = all, !skipped, !restored
+- director = @basename at -dir = all, !skipped, !restored
+ director = bacula-dir = all, !skipped, !restored
--- bacula-2.4.3/src/stored/bacula-sd.conf.in.orig 2008-12-10 10:21:45.000000000 -0600
+++ bacula-2.4.3/src/stored/bacula-sd.conf.in 2008-12-10 10:21:45.000000000 -0600
@@ -14 +14 @@
-- Name = @hostname at -sd
+- Name = @basename at -sd
+ Name = bacula-sd
@@ -25 +25 @@
-- Name = @hostname at -dir
+- Name = @basename at -dir
+ Name = bacula-dir
@@ -34 +34 @@
-- Name = @hostname at -mon
+- Name = @basename at -mon
+ Name = bacula-mon
@@ -228 +228 @@
-- director = @hostname at -dir = all
+- director = @basename at -dir = all
+ director = bacula-dir = all
--- bacula-2.4.3/src/wx-console/bwx-console.conf.in.orig 2008-12-10 10:22:23.000000000 -0600
+++ bacula-2.4.3/src/wx-console/bwx-console.conf.in 2008-12-10 10:22:23.000000000 -0600
@@ -6 +6 @@
-- Name = @hostname at -dir
+- Name = @basename at -dir
+ Name = bacula-dir
@@ -8 +8 @@
- address = @hostname@
@@ -84,27 +84,27 @@
--- bacula-2.4.3/src/tray-monitor/tray-monitor.conf.in.orig 2008-12-10 10:28:02.000000000 -0600
+++ bacula-2.4.3/src/tray-monitor/tray-monitor.conf.in 2008-12-10 10:28:02.000000000 -0600
@@ -6 +6 @@
-- Name = @hostname at -mon
+- Name = @basename at -mon
+ Name = bacula-mon
@@ -12,2 +12,2 @@
-- Name = @hostname at -fd
+- Name = @basename at -fd
- Address = @hostname@
+ Name = bacula-fd
+ Address = client.example.com
@@ -19,2 +19,2 @@
-- Name = @hostname at -sd
+- Name = @basename at -sd
- Address = @hostname@
+ Name = bacula-sd
+ Address = storage.example.com
@@ -26 +26 @@
-- Name = @hostname at -dir
+- Name = @basename at -dir
+ Name = bacula-dir
@@ -28 +27,0 @@
- address = @hostname@
--- bacula-2.4.3/src/qt-console/bat.conf.in.orig 2008-12-10 10:27:02.000000000 -0600
+++ bacula-2.4.3/src/qt-console/bat.conf.in 2008-12-10 10:27:02.000000000 -0600
@@ -6 +6 @@
-- Name = @hostname at -dir
+- Name = @basename at -dir
+ Name = bacula-dir
@@ -8 +8 @@
- address = @hostname@
Index: bacula-gconsole.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/bacula/devel/bacula-gconsole.desktop,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- bacula-gconsole.desktop 17 Nov 2008 18:07:33 -0000 1.3
+++ bacula-gconsole.desktop 23 Jul 2009 15:33:17 -0000 1.4
@@ -4,9 +4,9 @@ Encoding=UTF-8
Name=Bacula Console
GenericName=Backup Management Console
Comment=Control your Bacula Server
-Exec=bgnome-console -c /etc/bacula/bgnome-console.conf
-Icon=bacula
+Exec=/usr/sbin/bgnome-console -c /etc/bacula/bgnome-console.conf
+Icon=bacula.png
Terminal=false
Type=Application
-Categories=System;Application;
+Categories=System;Application;Utility
Index: bacula-traymonitor.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/bacula/devel/bacula-traymonitor.desktop,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- bacula-traymonitor.desktop 17 Nov 2008 18:07:33 -0000 1.2
+++ bacula-traymonitor.desktop 23 Jul 2009 15:33:17 -0000 1.3
@@ -4,8 +4,8 @@ Encoding=UTF-8
Name=Bacula Monitor
GenericName=Bacula Tray Monitor
Comment=Monitor your Bacula Backup server
-Exec=bacula-tray-monitor -c /etc/bacula/tray-monitor.conf
-Icon=bacula-tray-monitor
+Exec=/usr/sbin/bacula-tray-monitor -c /etc/bacula/tray-monitor.conf
+Icon=bacula-tray-monitor.xpm
Terminal=false
Type=Application
Categories=System;Application;Utility
Index: bacula-wxconsole.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/bacula/devel/bacula-wxconsole.desktop,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- bacula-wxconsole.desktop 17 Nov 2008 18:07:33 -0000 1.3
+++ bacula-wxconsole.desktop 23 Jul 2009 15:33:17 -0000 1.4
@@ -4,7 +4,7 @@ Encoding=UTF-8
Name=Bacula WX Console
GenericName=Backup Management Console
Comment=Control your Bacula Server
-Exec=wxconsole -c /etc/bacula/bwxconsole.conf
+Exec=/usr/sbin/wxconsole -c /etc/bacula/bwxconsole.conf
Icon=wxwin16x16
Terminal=false
Type=Application
Index: bacula.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bacula/devel/bacula.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- bacula.spec 30 Apr 2009 19:20:04 -0000 1.26
+++ bacula.spec 23 Jul 2009 15:33:17 -0000 1.27
@@ -7,8 +7,8 @@
Summary: Cross platform network backup for Linux, Unix, Mac and Windows
Name: bacula
-Version: 3.0.1
-Release: 1%{?dist}
+Version: 3.0.2
+Release: 0%{?dist}
# See LICENSE for details
License: GPLv2 with exceptions
Group: System Environment/Daemons
@@ -238,7 +238,7 @@ different computers. It is based on a cl
%package console
Summary: Bacula management console
Group: System Environment/Daemons
-Requires: bacula-sysconfdir = %{version}-%{release}
+Requires: bacula-common = %{version}-%{release}
%description console
Bacula is a set of programs that allow you to manage the backup,
@@ -252,7 +252,7 @@ backup system.
%package console-gnome
Summary: Bacula console for the Gnome desktop environment
Group: System Environment/Daemons
-Requires: bacula-sysconfdir = %{version}-%{release}
+Requires: bacula-common = %{version}-%{release}
Requires: usermode
%description console-gnome
@@ -265,7 +265,7 @@ This package contains the gnome version
%package console-bat
Summary: Bacula bat console
Group: System Environment/Daemons
-Requires: bacula-sysconfdir = %{version}-%{release}
+Requires: bacula-common = %{version}-%{release}
Requires: usermode
%description console-bat
@@ -279,7 +279,7 @@ This package contains the bat version of
%package console-wxwidgets
Summary: Bacula console using the wx widgets toolkit
Group: System Environment/Daemons
-Requires: bacula-sysconfdir = %{version}-%{release}
+Requires: bacula-common = %{version}-%{release}
Requires: usermode
%description console-wxwidgets
@@ -997,6 +997,11 @@ fi
%changelog
+* Tue Jul 21 2009 Jon Ciesla <limb at jcomserv.net - 3.0.2-0
+- Update to new upstream, 3.0.2.
+- Put full paths in desktop files. BZ 426790.
+- Moved console requires from sysconfdir to common BZ 505755.
+
* Thu Apr 30 2009 Jon Ciesla <limb at jcomserv.net - 3.0.1-1
- Update to new upstream, 3.0.1.
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bacula/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources 30 Apr 2009 19:20:04 -0000 1.8
+++ sources 23 Jul 2009 15:33:17 -0000 1.9
@@ -1,2 +1,2 @@
-173ef4d07ff10dfdbcc1142d8be21f17 bacula-3.0.1.tar.gz
-5c8d0710eaaf439f4b78913915d45523 bacula-docs-3.0.1.tar.bz2
+52f4bc25d8988dffcff429bb5e1ee81b bacula-3.0.2.tar.gz
+456ec1f95a4fad967fdb32609f9d2490 bacula-docs-3.0.2.tar.bz2
More information about the fedora-extras-commits
mailing list