rpms/bacula
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Update to new upstream, 3.0.2. Put full paths in desktop files. BZ 426790.

Browse Source 
Moved console requires from sysconfdir to common BZ 505755.
This commit is contained in:
Jon Ciesla 2009-07-23 15:33:17 +00:00
parent ffb14ee2b2
commit 0036e0f595
9 changed files with 45 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.cvsignore
View File

@ -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

2
bacula-bat.desktop
View File

@ -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

2
bacula-bwxconsole.desktop
View File

@ -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

44
bacula-config.patch
View File

@ -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@-dir
- Name = @basename@-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@-dir
- Name = @basename@-dir
+ Name = bacula-dir
@@ -30 +30 @@
- Client = @hostname@-fd
- Client = @basename@-fd
+ Client = bacula-fd
@@ -51 +51 @@
-# Client = @hostname@2-fd
-# Client = @basename@2-fd
+# Client = bacula2-fd
@@ -82 +82 @@
- Client=@hostname@-fd
- Client=@basename@-fd
+ Client=bacula-fd
@@ -157,2 +157,2 @@
- Name = @hostname@-fd
- Name = @basename@-fd
- Address = @hostname@
+ Name = bacula-fd
+ Address = client.example.com
@@ -172,2 +172,2 @@
-# Name = @hostname@2-fd
-# Name = @basename@2-fd
-# Address = @hostname@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@-mon
- Name = @basename@-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@-dir
- Name = @basename@-dir
+ Name = bacula-dir
@@ -23 +23 @@
- Name = @hostname@-mon
- Name = @basename@-mon
+ Name = bacula-mon
@@ -32 +32 @@
- Name = @hostname@-fd
- Name = @basename@-fd
+ Name = bacula-fd
@@ -42 +42 @@
- director = @hostname@-dir = all, !skipped, !restored
- director = @basename@-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@-sd
- Name = @basename@-sd
+ Name = bacula-sd
@@ -25 +25 @@
- Name = @hostname@-dir
- Name = @basename@-dir
+ Name = bacula-dir
@@ -34 +34 @@
- Name = @hostname@-mon
- Name = @basename@-mon
+ Name = bacula-mon
@@ -228 +228 @@
- director = @hostname@-dir = all
- director = @basename@-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@-dir
- Name = @basename@-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@-mon
- Name = @basename@-mon
+ Name = bacula-mon
@@ -12,2 +12,2 @@
- Name = @hostname@-fd
- Name = @basename@-fd
- Address = @hostname@
+ Name = bacula-fd
+ Address = client.example.com
@@ -19,2 +19,2 @@
- Name = @hostname@-sd
- Name = @basename@-sd
- Address = @hostname@
+ Name = bacula-sd
+ Address = storage.example.com
@@ -26 +26 @@
- Name = @hostname@-dir
- Name = @basename@-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@-dir
- Name = @basename@-dir
+ Name = bacula-dir
@@ -8 +8 @@
- address = @hostname@

6
bacula-gconsole.desktop
View File

@ -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

4
bacula-traymonitor.desktop
View File

@ -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

2
bacula-wxconsole.desktop
View File

@ -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

17
bacula.spec
View File

@ -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 client/server architecture.
%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 of the bacula management console
%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 the bacula management console
%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@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@jcomserv.net - 3.0.1-1
- Update to new upstream, 3.0.1.

4
sources
View File

@ -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